Skip to content

Instantly share code, notes, and snippets.

@gsathya

gsathya/0001-Add-name_nice-and-name_nice_plural.patch

Created March 23, 2012 18:03
Show Gist options
  • Save gsathya/2173281 to your computer and use it in GitHub Desktop.
Save gsathya/2173281 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
0001-Add-name_nice-and-name_nice_plural.patch
From 3abd7fff210f2382f493517dc52aa2843277a230 Mon Sep 17 00:00:00 2001
From: Sathyanarayanan Gunasekaran <[email protected]>
Date: Fri, 23 Mar 2012 23:29:18 +0530
Subject: [PATCH] Add name_nice and name_nice_plural
All DB tables now have a "nice name" CRUD string setting to
simplify the construction of headers and other text elements.
This CRUD string supports both singular and plurals.
---
models/00_tables.py | 4 +++-
models/07_cr.py | 25 +++++++++++++++++++------
models/08_assess.py | 28 +++++++++++++++++++++-------
models/impact.py | 4 +++-
models/supply.py | 4 +++-
5 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/models/00_tables.py b/models/00_tables.py
index cd79208..f107c0a 100644
--- a/models/00_tables.py
+++ b/models/00_tables.py
@@ -577,6 +577,8 @@ s3.crud_strings = Storage(
msg_record_deleted = T("Record deleted"),
msg_list_empty = T("No Records currently available"),
msg_match = T("Matching Records"),
- msg_no_match = T("No Matching Records"))
+ msg_no_match = T("No Matching Records"),
+ name_nice = T("Record"),
+ name_nice_plural = T("Records"))
# END =========================================================================
diff --git a/models/07_cr.py b/models/07_cr.py
index 1942433..9bad8f0 100644
--- a/models/07_cr.py
+++ b/models/07_cr.py
@@ -51,7 +51,9 @@ if deployment_settings.has_module("cr"):
msg_record_created = T("Camp Type added"),
msg_record_modified = T("Camp Type updated"),
msg_record_deleted = T("Camp Type deleted"),
- msg_list_empty = T("No Camp Types currently registered"))
+ msg_list_empty = T("No Camp Types currently registered"),
+ name_nice = T("Camp"),
+ name_nice_plural = T("Camps"))
else:
ADD_SHELTER_TYPE = T("Add Shelter Type")
LIST_SHELTER_TYPES = T("List Shelter Types")
@@ -69,7 +71,9 @@ if deployment_settings.has_module("cr"):
msg_record_created = T("Shelter Type added"),
msg_record_modified = T("Shelter Type updated"),
msg_record_deleted = T("Shelter Type deleted"),
- msg_list_empty = T("No Shelter Types currently registered"))
+ msg_list_empty = T("No Shelter Types currently registered").
+ name_nice = T("Shelter"),
+ name_nice_plural = T("Shelters"))
shelter_type_id = S3ReusableField("shelter_type_id", db.cr_shelter_type,
requires = IS_NULL_OR(IS_ONE_OF(db,
@@ -124,7 +128,9 @@ if deployment_settings.has_module("cr"):
msg_record_created = T("Camp Service added"),
msg_record_modified = T("Camp Service updated"),
msg_record_deleted = T("Camp Service deleted"),
- msg_list_empty = T("No Camp Services currently registered"))
+ msg_list_empty = T("No Camp Services currently registered"),
+ name_nice = T("Camp Service"),
+ name_nice_plural = T("Camp Services"))
else:
ADD_SHELTER_SERVICE = T("Add Shelter Service")
LIST_SHELTER_SERVICES = T("List Shelter Services")
@@ -142,7 +148,9 @@ if deployment_settings.has_module("cr"):
msg_record_created = T("Shelter Service added"),
msg_record_modified = T("Shelter Service updated"),
msg_record_deleted = T("Shelter Service deleted"),
- msg_list_empty = T("No Shelter Services currently registered"))
+ msg_list_empty = T("No Shelter Services currently registered"),
+ name_nice = T("Shelter Service"),
+ name_nice_plural = T("Shelter Services"))
def cr_shelter_service_represent(shelter_service_ids):
table = db.cr_shelter_service
@@ -228,7 +236,10 @@ if deployment_settings.has_module("cr"):
msg_record_created = T("Camp added"),
msg_record_modified = T("Camp updated"),
msg_record_deleted = T("Camp deleted"),
- msg_list_empty = T("No Camps currently registered"))
+ msg_list_empty = T("No Camps currently registered")
+ name_nice = T("Camp Service"),
+ name_nice_plural = T("Camp Services"))
+
else:
ADD_SHELTER = T("Add Shelter")
LIST_SHELTERS = T("List Shelters")
@@ -247,7 +258,9 @@ if deployment_settings.has_module("cr"):
msg_record_created = T("Shelter added"),
msg_record_modified = T("Shelter updated"),
msg_record_deleted = T("Shelter deleted"),
- msg_list_empty = T("No Shelters currently registered"))
+ msg_list_empty = T("No Shelters currently registered")
+ name_nice = T("Shelter"),
+ name_nice_plural = T("Shelters"))
# Reusable field
shelter_id = S3ReusableField("shelter_id", db.cr_shelter,
diff --git a/models/08_assess.py b/models/08_assess.py
index 633365a..7cb88ec 100644
--- a/models/08_assess.py
+++ b/models/08_assess.py
@@ -106,7 +106,9 @@ if deployment_settings.has_module(module):
msg_record_created = T("Assessment added"),
msg_record_modified = T("Assessment updated"),
msg_record_deleted = T("Assessment deleted"),
- msg_list_empty = T("No Assessments currently registered"))
+ msg_list_empty = T("No Assessments currently registered"),
+ name_nice = T("Assessment"),
+ name_nice_plural = T("Assessments"))
# assess_assess as component of org_organisation
s3mgr.model.add_component(table, org_organisation="organisation_id")
@@ -142,7 +144,9 @@ if deployment_settings.has_module(module):
msg_record_created = T("Baseline Type added"),
msg_record_modified = T("Baseline Type updated"),
msg_record_deleted = T("Baseline Type deleted"),
- msg_list_empty = T("No Baseline Types currently registered"))
+ msg_list_empty = T("No Baseline Types currently registered"),
+ name_nice = T("Baseline Type"),
+ name_nice_plural = T("Baseline Types"))
def baseline_type_comment():
if auth.has_membership(auth.id_group("'Administrator'")):
@@ -201,7 +205,9 @@ if deployment_settings.has_module(module):
msg_record_created = T("Baseline added"),
msg_record_modified = T("Baseline updated"),
msg_record_deleted = T("Baseline deleted"),
- msg_list_empty = T("No Baselines currently registered"))
+ msg_list_empty = T("No Baselines currently registered"),
+ name_nice = T("Baseline"),
+ name_nice_plural = T("Baselines"))
# Baseline as component of assessments
s3mgr.model.add_component(table, assess_assess="assess_id")
@@ -243,7 +249,9 @@ if deployment_settings.has_module(module):
msg_record_created = T("Assessment Summary added"),
msg_record_modified = T("Assessment Summary updated"),
msg_record_deleted = T("Assessment Summary deleted"),
- msg_list_empty = T("No Assessment Summaries currently registered"))
+ msg_list_empty = T("No Assessment Summaries currently registered"),
+ name_nice = T("Assessment"),
+ name_nice_plural = T("Assessments"))
# Summary as component of assessments
s3mgr.model.add_component(table, assess_assess="assess_id")
@@ -292,7 +300,9 @@ if deployment_settings.has_module(module):
msg_record_created = T("Section updated"),
msg_record_modified = T("Section updated"),
msg_record_deleted = T("Section deleted"),
- msg_list_empty = T("No Sections currently registered"))
+ msg_list_empty = T("No Sections currently registered"),
+ name_nice = T("Search"),
+ name_nice_plural = T("Searches"))
# -------------------------------------------------------------------------
# Common options
@@ -458,7 +468,9 @@ if deployment_settings.has_module(module):
msg_record_created = T("Rapid Assessment added"),
msg_record_modified = T("Rapid Assessment updated"),
msg_record_deleted = T("Rapid Assessment deleted"),
- msg_list_empty = T("No Rapid Assessments currently registered"))
+ msg_list_empty = T("No Rapid Assessments currently registered"),
+ name_nice = T("Rapid Assessment"),
+ name_nice_plural = T("Rapid Assessments"))
# -------------------------------------------------------------------------
def rat_assessment_onaccept(form):
@@ -1853,7 +1865,9 @@ if deployment_settings.has_module(module):
msg_record_created = T("Population Statistic added"),
msg_record_modified = T("Population Statistic updated"),
msg_record_deleted = T("Population Statistic deleted"),
- msg_list_empty = T("No Population Statistics currently registered"))
+ msg_list_empty = T("No Population Statistics currently registered"),
+ name_nice = T("Population Statistic"),
+ name_nice_plural = T("Population Statistics"))
else:
def assess_id(**arguments):
diff --git a/models/impact.py b/models/impact.py
index 4b60244..8efbb4b 100644
--- a/models/impact.py
+++ b/models/impact.py
@@ -51,7 +51,9 @@ if deployment_settings.has_module("assess"):
msg_record_created = T("Impact Type added"),
msg_record_modified = T("Impact Type updated"),
msg_record_deleted = T("Impact Type deleted"),
- msg_list_empty = T("No Impact Types currently registered"))
+ msg_list_empty = T("No Impact Types currently registered"),
+ name_nice = T("Impact"),
+ name_nice_plural = T("Impacts"))
def impact_type_comment():
if auth.has_membership(auth.id_group("'Administrator'")):
diff --git a/models/supply.py b/models/supply.py
index 595011b..4d7f0da 100644
--- a/models/supply.py
+++ b/models/supply.py
@@ -57,7 +57,9 @@ def item_entity_controller():
msg_record_created = T("Item added"),
msg_record_modified = T("Item updated"),
msg_record_deleted = T("Item deleted"),
- msg_list_empty = T("No Items currently registered"))
+ msg_list_empty = T("No Items currently registered"),
+ name_nice = T("Item"),
+ name_nice_plural = T("Items"))
# -------------------------------------------------------------------------
# Virtual Fields for category, country, organisation & status
--
1.7.6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment