Merge lp:~tim-clicks/sahana-eden/rels into lp:sahana-eden

[Tim McNamara]

fixes #594

http://eden.sahanafoundation.org/ticket/594

Unmerged revisions

1219. By Tim McNamara on 2010-09-10

Religion list as deployment setting. Fixes #594

Changes:
  - created "Unknown" religion category
  - moved current list of religions to 000_settings.py
  - pr_religion_opts is now a reference to
    deployment_settings.religions

This patch moves the list of religions in the people registry
into a list in settings model. This makes things more
flexible for deployers.

=== modified file 'models/000_config.py'
--- models/000_config.py	2010-09-09 07:45:10 +0000
+++ models/000_config.py	2010-09-10 08:59:40 +0000
@@ -69,6 +69,24 @@
 # Address to which mails get sent to approve new users
 deployment_settings.mail.approver = "[e-mail]"
 
+# Available languages for selection
+# Feel free to change the available options here to suit
+# the needs of the deployment.
+
+deployment_settings.religion = {
+    # WARNING
+    # do not change the keys that have
+    # already been set
+    0:T("Unknown"),
+    1:T("None"),
+    2:T("Christian"),
+    3:T("Muslim"),
+    4:T("Jew"),
+    5:T("Buddhist"),
+    6:T("Hindu"),
+    99:T("Other")
+}
+
 # L10n settings
 # Uncomment this if the deployment is just in a few countries
 # (used in the GIS Location Selector & maybe in future: Messaging)
@@ -319,4 +337,4 @@
     #        description = Tstr("An intake system, a warehouse management system, commodity tracking, supply chain management, procurement and other asset and resource management capabilities."),
     #        module_type = 10
     #    ),
-)
\ No newline at end of file
+)

=== modified file 'models/02_pr.py'
--- models/02_pr.py	2010-09-06 08:48:05 +0000
+++ models/02_pr.py	2010-09-10 08:59:40 +0000
@@ -239,15 +239,7 @@
 
 
 # -----------------------------------------------------------------------------
-pr_religion_opts = {
-    1:T("none"),
-    2:T("Christian"),
-    3:T("Muslim"),
-    4:T("Jew"),
-    5:T("Buddhist"),
-    6:T("Hindu"),
-    99:T("other")
-}
+pr_religion_opts = deployment_settings.religion
 
 pr_religion = db.Table(None, "religion",
                        Field("religion", "integer",