Permalink
Browse files

ACTION REQUIRED: 000_config needs updating from templates

  • Loading branch information...
1 parent 2f6c5ff commit ed6dcdb02c6da99945897220049cbf53915039c5 @flavour flavour committed Jun 14, 2012
Showing with 2,812 additions and 2,305 deletions.
  1. +1 −1 VERSION
  2. +169 −0 languages/en-gb.py
  3. +18 −13 models/000_1st_run.py
  4. +0 −1 models/00_db.py
  5. +1 −2 models/zzz_1st_roles.py
  6. +16 −21 models/zzz_1st_run.py
  7. +1 −0 modules/eden/hrm.py
  8. +4 −4 modules/eden/menus.py
  9. +2 −1 modules/eden/org.py
  10. +193 −20 modules/s3/s3gis.py
  11. +13 −14 modules/s3/s3widgets.py
  12. +44 −31 modules/s3_update_check.py
  13. +41 −22 modules/s3cfg.py
  14. +17 −7 modules/tests/suite.py
  15. +177 −0 private/templates/000_config.py
  16. 0 private/templates/{demo → }/ADAT/24B.xls.Layout.csv
  17. 0 private/templates/{demo → }/ADAT/24B.xls.Question.csv
  18. 0 private/templates/{demo → }/ADAT/72B.xls.Layout.csv
  19. 0 private/templates/{demo → }/ADAT/72B.xls.Question.csv
  20. 0 private/templates/{demo → }/ADAT/Cyclone Guba (Oro Province) single spreadsheet import.xls
  21. 0 private/templates/{demo → }/ADAT/DANA Template 1.xls.Layout.csv
  22. 0 private/templates/{demo → }/ADAT/DANA Template 1.xls.Question.csv
  23. 0 private/templates/{demo → }/ADAT/DANA Template 2.xls.Layout.csv
  24. 0 private/templates/{demo → }/ADAT/DANA Template 2.xls.Question.csv
  25. 0 private/templates/{demo → }/ADAT/DANA Template 3.xls.Layout.csv
  26. 0 private/templates/{demo → }/ADAT/DANA Template 3.xls.Question.csv
  27. 0 private/templates/{demo → }/ADAT/DANA Template 4.xls.Layout.csv
  28. 0 private/templates/{demo → }/ADAT/DANA Template 4.xls.Question.csv
  29. 0 private/templates/{demo → }/ADAT/DANA Template 5.xls.Layout.csv
  30. 0 private/templates/{demo → }/ADAT/DANA Template 5.xls.Question.csv
  31. 0 private/templates/{demo → }/ADAT/Emergency Damage and Needs.xls.Layout.csv
  32. 0 private/templates/{demo → }/ADAT/Emergency Damage and Needs.xls.Question.csv
  33. 0 private/templates/{demo → }/ADAT/MCRS-Annex1.xls.Layout.csv
  34. 0 private/templates/{demo → }/ADAT/MCRS-Annex1.xls.Question.csv
  35. 0 private/templates/{demo → }/ADAT/PHT.xls.Layout.csv
  36. 0 private/templates/{demo → }/ADAT/PHT.xls.Question.csv
  37. 0 private/templates/{demo → }/ADAT/PMI.xls.Layout.csv
  38. 0 private/templates/{demo → }/ADAT/PMI.xls.Question.csv
  39. 0 private/templates/{demo → }/ADAT/Padang Earthquake 2011 (24H B).csv
  40. 0 private/templates/{demo → }/ADAT/Padang Earthquake 2011 (72H B).csv
  41. 0 private/templates/{demo → }/ADAT/Padang Earthquake 2011 (PMI).csv
  42. 0 private/templates/{demo → }/ADAT/Tropical Storm Bulegila 2012(24H B)-Data.csv
  43. 0 private/templates/{demo → }/ADAT/questionnaireMRCS.csv
  44. 0 private/templates/{demo → }/ADAT/survey_roles.csv
  45. 0 private/templates/{demo → }/ADAT/survey_users.csv
  46. +1 −1 private/templates/{demo → }/ADAT/tasks.cfg
  47. 0 private/templates/{demo → }/CERT/certificate.csv
  48. 0 private/templates/{demo → }/CERT/certificate_skill.csv
  49. 0 private/templates/{demo → }/CERT/course.csv
  50. 0 private/templates/{demo → }/CERT/organisation.csv
  51. 0 private/templates/{demo → }/CERT/people.csv
  52. +3 −3 private/templates/{demo → }/CERT/tasks.cfg
  53. 0 private/templates/{demo → }/CERT/training.csv
  54. 0 private/templates/{demo/IFRC_Train → Crisis}/asset.csv
  55. +291 −0 private/templates/Crisis/config.py
  56. 0 private/templates/{demo → }/Crisis/gis_config.csv
  57. 0 private/templates/{demo → }/Crisis/gis_layer_feature.csv
  58. 0 private/templates/{demo/IFRC_Train → Crisis}/ireport.csv
  59. 0 private/templates/{demo/IFRC_Train → Crisis}/office.csv
  60. 0 private/templates/{demo → }/Crisis/org_facility_type.csv
  61. 0 private/templates/{demo/IFRC_Train → Crisis}/organisation.csv
  62. 0 private/templates/{demo → }/Crisis/security_staff_type.csv
  63. 0 private/templates/{demo → }/Crisis/security_zone_type.csv
  64. +149 −0 private/templates/Crisis/tasks.cfg
  65. 0 private/templates/{demo → }/Crisis/users.csv
  66. 0 private/templates/{demo → }/Delphi/delphi_roles.csv
  67. 0 private/templates/{demo → }/Delphi/delphi_user.xsl
  68. 0 private/templates/{demo → }/Delphi/group.csv
  69. 0 private/templates/{demo → }/Delphi/problem.csv
  70. 0 private/templates/{demo → }/Delphi/solution.csv
  71. 0 private/templates/{demo → }/Delphi/tasks.cfg
  72. 0 private/templates/{demo → }/Delphi/users.csv
  73. +307 −0 private/templates/Georgia/config.py
  74. 0 private/templates/{demo → }/Georgia/cr_shelter.csv
  75. 0 private/templates/{demo → }/Georgia/flood_gauge.csv
  76. 0 private/templates/{demo → }/Georgia/gis_config.csv
  77. 0 private/templates/{demo → }/Georgia/gis_layer_feature.csv
  78. 0 private/templates/{demo → }/Georgia/gis_layer_theme.csv
  79. 0 private/templates/{demo → }/Georgia/gis_theme_data.csv
  80. +16 −16 private/templates/{demo → }/Georgia/tasks.cfg
  81. 0 private/templates/{demo → }/IFRC/SkillCompetency.csv
  82. 0 private/templates/{demo → }/IFRC/SkillList.csv
  83. 0 private/templates/{demo → }/IFRC/TL_L0.csv
  84. 0 private/templates/{demo → }/IFRC/TL_L1.csv
  85. 0 private/templates/{demo → }/IFRC/TL_L2.csv
  86. 0 private/templates/{demo → }/IFRC/TL_L3.csv
  87. 0 private/templates/{demo → }/IFRC/TL_L4.csv
  88. 0 private/templates/{demo → }/IFRC/asset.csv
  89. 0 private/templates/{demo → }/IFRC/auth_roles.csv
  90. 0 private/templates/{demo → }/IFRC/beneficiary_type.csv
  91. +241 −0 private/templates/IFRC/config.py
  92. 0 private/templates/{demo → }/IFRC/course.csv
  93. 0 private/templates/{demo → }/IFRC/gis_config.csv
  94. 0 private/templates/{demo → }/IFRC/gis_hierarchy.csv
  95. 0 private/templates/{demo → }/IFRC/gis_layer_empty.csv
  96. +2 −2 private/templates/{demo → }/IFRC/gis_layer_feature.csv
  97. 0 private/templates/{demo → }/IFRC/gis_layer_georss.csv
  98. 0 private/templates/{demo → }/IFRC/gis_layer_google.csv
  99. 0 private/templates/{demo → }/IFRC/gis_layer_kml.csv
  100. 0 private/templates/{demo → }/IFRC/gis_layer_openstreetmap.csv
  101. 0 private/templates/{demo → }/IFRC/gis_layer_wms.csv
  102. 0 private/templates/{demo → }/IFRC/gis_marker.csv
  103. 0 private/templates/{demo → }/IFRC/gis_symbology.csv
  104. 0 private/templates/{demo → }/IFRC/hrm_programme.csv
  105. 0 private/templates/{demo → }/IFRC/job_role.csv
  106. 0 private/templates/{demo → }/IFRC/office.csv
  107. 0 private/templates/{demo/NYC → IFRC}/org_sector.csv
  108. 0 private/templates/{demo → }/IFRC/organisation.csv
  109. 0 private/templates/{demo → }/IFRC/project_activity_type.csv
  110. 0 private/templates/{demo → }/IFRC/project_beneficiary_type.csv
  111. 0 private/templates/{demo → }/IFRC/project_hazard.csv
  112. 0 private/templates/{demo → }/IFRC/project_theme.csv
  113. +22 −22 private/templates/{demo → }/IFRC/tasks.cfg
  114. 0 private/templates/{demo → }/IFRC_Demo/24H-TL-Data.csv
  115. 0 private/templates/{demo → }/IFRC_Demo/gis_layer_theme.csv
  116. 0 private/templates/{demo → }/IFRC_Demo/gis_theme_data.csv
  117. 0 private/templates/{demo → }/IFRC_Demo/people.csv
  118. 0 private/templates/{demo → }/IFRC_Demo/project_community.csv
  119. +3 −3 private/templates/{demo → }/IFRC_Demo/tasks.cfg
  120. 0 private/templates/{demo → }/IFRC_Demo/training.csv
  121. 0 private/templates/{demo → }/IFRC_Train/24H-TL-Data.csv
  122. 0 private/templates/{demo → }/IFRC_Train/BRCS-education-test.csv
  123. 0 private/templates/{demo → }/IFRC_Train/BRCS-people-test.csv
  124. 0 private/templates/{demo/Crisis → IFRC_Train}/asset.csv
  125. 0 private/templates/{demo → }/IFRC_Train/facility.csv
  126. 0 private/templates/{demo → }/IFRC_Train/gis_layer_wms.csv
  127. 0 private/templates/{demo → }/IFRC_Train/hrm_programme_hours.csv
  128. 0 private/templates/{demo → }/IFRC_Train/inv_item.csv
  129. 0 private/templates/{demo/Crisis → IFRC_Train}/ireport.csv
  130. 0 private/templates/{demo → }/IFRC_Train/members.csv
  131. 0 private/templates/{demo/Crisis → IFRC_Train}/office.csv
  132. 0 private/templates/{demo → }/IFRC_Train/org_sector.csv
  133. 0 private/templates/{demo/Crisis → IFRC_Train}/organisation.csv
  134. 0 private/templates/{demo → }/IFRC_Train/people.csv
  135. 0 private/templates/{demo → }/IFRC_Train/project_community.csv
  136. 0 private/templates/{demo → }/IFRC_Train/project_organisation.csv
  137. 0 private/templates/{demo → }/IFRC_Train/project_project.csv
  138. 0 private/templates/{demo → }/IFRC_Train/send_item.csv
  139. +146 −0 private/templates/IFRC_Train/tasks.cfg
  140. 0 private/templates/{demo → }/IFRC_Train/training.csv
  141. 0 private/templates/{demo → }/IFRC_Train/users.csv
  142. 0 private/templates/{demo → }/NYC/24H-TL-Data.csv
  143. 0 private/templates/{demo → }/NYC/auth_roles.csv
  144. +307 −0 private/templates/NYC/config.py
  145. 0 private/templates/{demo → }/NYC/gis_config.csv
  146. 0 private/templates/{demo → }/NYC/gis_hierarchy.csv
  147. 0 private/templates/{demo → }/NYC/inv_item.csv
  148. 0 private/templates/{demo → }/NYC/ireport.csv
  149. 0 private/templates/{demo → }/NYC/office.csv
  150. 0 private/templates/{demo/IFRC → NYC}/org_sector.csv
  151. 0 private/templates/{demo → }/NYC/organisation.csv
  152. 0 private/templates/{demo → }/NYC/people.csv
  153. 0 private/templates/{demo → }/NYC/shelter.csv
  154. 0 private/templates/{demo → }/NYC/shelter_service.csv
  155. +38 −38 private/templates/{demo → }/NYC/tasks.cfg
  156. 0 private/templates/{demo → }/NYC/training.csv
  157. 0 private/templates/{demo → }/NYC/users.csv
  158. +122 −0 private/templates/Oxfam/config.py
  159. 0 private/templates/{demo → }/Oxfam/gis_layer_feature.csv
  160. +7 −7 private/templates/{demo → }/Oxfam/tasks.cfg
  161. 0 private/templates/{demo → }/RGIMS/PH_L1.csv
  162. 0 private/templates/{demo → }/RGIMS/PH_L2.csv
  163. 0 private/templates/{demo → }/RGIMS/PH_L3.csv
  164. 0 private/templates/{demo → }/RGIMS/auth_roles.csv
  165. +220 −0 private/templates/RGIMS/config.py
  166. 0 private/templates/{demo → }/RGIMS/gis_config.csv
  167. 0 private/templates/{demo → }/RGIMS/gis_hierarchy.csv
  168. 0 private/templates/{demo → }/RGIMS/gis_layer_feature.csv
  169. 0 private/templates/{demo → }/RGIMS/organisation.csv
  170. +17 −17 private/templates/{demo → }/RGIMS/tasks.cfg
  171. 0 private/templates/{demo → }/RGIMS/warehouse.csv
  172. 0 private/templates/{demo → }/RGIMS/warehouse_stock.csv
  173. 0 private/templates/{demo → }/Request/SkillList.csv
  174. 0 private/templates/{demo → }/Request/req_item.csv
  175. 0 private/templates/{demo → }/Request/req_req.csv
  176. 0 private/templates/{demo → }/Request/tasks.cfg
  177. 0 private/templates/{demo → }/SSF/auth_roles.csv
  178. 0 private/templates/{demo → }/SSF/job_role.csv
  179. 0 private/templates/{demo → }/SSF/organisation.csv
  180. 0 private/templates/{demo → }/SSF/pr_group.csv
  181. 0 private/templates/{demo → }/SSF/project_activity_type.csv
  182. 0 private/templates/{demo → }/SSF/tasks.cfg
  183. +23 −23 private/templates/{demo → }/Shipment/tasks.cfg
  184. 0 private/templates/{demo → }/Shipment/track_item.csv
  185. 0 private/templates/{demo → }/Standard/California_L2.csv
  186. 0 private/templates/{demo → }/Standard/USA_L0.csv
  187. 0 private/templates/{demo → }/Standard/USA_L1.csv
  188. 0 private/templates/{demo → }/Standard/assets.csv
  189. 0 private/templates/{demo → }/Standard/gis_config.csv
  190. 0 private/templates/{demo → }/Standard/gis_hierarchy.csv
  191. 0 private/templates/{demo → }/Standard/gis_layer_wms.csv
  192. 0 private/templates/{demo → }/Standard/ireport.csv
  193. 0 private/templates/{demo → }/Standard/office.csv
  194. 0 private/templates/{demo → }/Standard/organisation.csv
  195. 0 private/templates/{demo → }/Standard/sector.csv
  196. 0 private/templates/{demo → }/Standard/supply_item_category_ifrc_standard.csv
  197. 0 private/templates/{demo → }/Standard/supply_item_eic.csv
  198. 0 private/templates/{demo → }/Standard/supply_item_ifrc_standard.csv
  199. 0 private/templates/{demo → }/Standard/supply_item_ifrc_standard_sample.csv
  200. 0 private/templates/{demo → }/Standard/tasks.cfg
  201. 0 private/templates/{demo → }/Standard/training.csv
  202. 0 private/templates/{demo → }/Standard/users.csv
  203. 0 private/templates/{demo → }/Standard/warehouse.csv
  204. 0 private/templates/{demo → }/Standard/warehouse_stock.csv
  205. +192 −318 private/templates/default/{000_config.py → config.py}
  206. +2 −6 private/templates/default/gis_layer_feature.csv
  207. +0 −149 private/templates/demo/Crisis/tasks.cfg
  208. +0 −708 private/templates/demo/IFRC/000_config.py
  209. +0 −146 private/templates/demo/IFRC_Train/tasks.cfg
  210. +0 −705 private/templates/demo/RGIMS/000_config.py
  211. 0 private/templates/{demo/demo_folders.cfg → folders.cfg}
  212. +6 −4 requirements.txt
View
2 VERSION
@@ -1 +1 @@
-vita-0.5.5-devel-1126-g4b5e7dc (2012-06-13 22:06:23)
+2f6c5ff (2012-06-14 15:53:11)
View
169 languages/en-gb.py
@@ -5,16 +5,22 @@
'# of International Staff': '# of International Staff',
'# of National Staff': '# of National Staff',
'# of Vehicles': '# of Vehicles',
+'%(GRN)s Number': '%(GRN)s Number',
+'%(GRN)s Status': '%(GRN)s Status',
+'%(REQ)s Number': '%(REQ)s Number',
'%(module)s not installed': '%(module)s not installed',
'%(system_name)s - Verify Email': '%(system_name)s - Verify Email',
'%.1f km': '%.1f km',
'%Y-%m-%d': '%Y-%m-%d',
'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'%d-%b-%Y': '%d-%b-%Y',
+'%d-%b-%Y %H:%M:%S': '%d-%b-%Y %H:%M:%S',
'%s rows deleted': '%s rows deleted',
'%s rows updated': '%s rows updated',
'& then click on the map below to adjust the Lat/Lon fields': '& then click on the map below to adjust the Lat/Lon fields',
"'Cancel' will indicate an asset log entry did not occur": "'Cancel' will indicate an asset log entry did not occur",
'* Required Fields': '* Required Fields',
+'-': '-',
'0-15 minutes': '0-15 minutes',
'1 Assessment': '1 Assessment',
'1 location, shorter time, can contain multiple Tasks': '1 location, shorter time, can contain multiple Tasks',
@@ -40,6 +46,7 @@
'A task is a piece of work that an individual or team can do in 1-2 days': 'A task is a piece of work that an individual or team can do in 1-2 days',
'ABOUT THIS MODULE': 'ABOUT THIS MODULE',
'ACCESS DATA': 'ACCESS DATA',
+'ACTION REQUIRED': 'ACTION REQUIRED',
'ANY': 'ANY',
'API Key': 'API Key',
'API is documented here': 'API is documented here',
@@ -51,6 +58,7 @@
'About': 'About',
'Accept Push': 'Accept Push',
'Accept Pushes': 'Accept Pushes',
+'Accept unsolicited data transmissions from the repository.': 'Accept unsolicited data transmissions from the repository.',
'Access denied': 'Access denied',
'Access to Shelter': 'Access to Shelter',
'Access to education services': 'Access to education services',
@@ -62,6 +70,7 @@
'Actionable by all targeted recipients': 'Actionable by all targeted recipients',
'Actionable only by designated exercise participants; exercise identifier SHOULD appear in <note>': 'Actionable only by designated exercise participants; exercise identifier SHOULD appear in <note>',
'Actioned?': 'Actioned?',
+'Actioning officer': 'Actioning officer',
'Actions': 'Actions',
'Actions taken as a result of this request.': 'Actions taken as a result of this request.',
'Activate Events from Scenario templates for allocation of appropriate Resources (Human, Assets & Facilities).': 'Activate Events from Scenario templates for allocation of appropriate Resources (Human, Assets & Facilities).',
@@ -369,6 +378,7 @@
'Address Type': 'Address Type',
'Address added': 'Address added',
'Address deleted': 'Address deleted',
+"Address of an image to use for this Layer in the Legend. This allows use of a controlled static image rather than querying the server automatically for what it provides (which won't work through GeoWebCache anyway).": "Address of an image to use for this Layer in the Legend. This allows use of a controlled static image rather than querying the server automatically for what it provides (which won't work through GeoWebCache anyway).",
'Address updated': 'Address updated',
'Addresses': 'Addresses',
'Adequate': 'Adequate',
@@ -498,6 +508,7 @@
'Assigned': 'Assigned',
'Assigned By': 'Assigned By',
'Assigned To': 'Assigned To',
+'Assigned to': 'Assigned to',
'Assigned to Organization': 'Assigned to Organisation',
'Assigned to Person': 'Assigned to Person',
'Assigned to Site': 'Assigned to Site',
@@ -532,6 +543,7 @@
'Base Layers': 'Base Layers',
'Base Location': 'Base Location',
'Base Site Set': 'Base Site Set',
+'Base URL of the remote Sahana Eden instance including application path, e.g. http://www.example.org/eden': 'Base URL of the remote Sahana Eden instance including application path, e.g. http://www.example.org/eden',
'Base URL of the remote Sahana-Eden site': 'Base URL of the remote Sahana-Eden site',
'Baseline Data': 'Baseline Data',
'Baseline Number of Beds': 'Baseline Number of Beds',
@@ -578,6 +590,7 @@
'Bomb Explosion': 'Bomb Explosion',
'Bomb Threat': 'Bomb Threat',
'Border Color for Text blocks': 'Border Colour for Text blocks',
+'Branch': 'Branch',
'Brand': 'Brand',
'Brand Details': 'Brand Details',
'Brand added': 'Brand added',
@@ -619,11 +632,14 @@
'Burned/charred': 'Burned/charred',
'By Facility': 'By Facility',
'By Inventory': 'By Inventory',
+'By selecting this you agree that we may contact you.': 'By selecting this you agree that we may contact you.',
'CBA Women': 'CBA Women',
'CLOSED': 'CLOSED',
'CN': 'CN',
'CSS file %s not writable - unable to apply theme!': 'CSS file %s not writable - unable to apply theme!',
+'CTN': 'CTN',
'Calculate': 'Calculate',
+'Calendar': 'Calendar',
'Camp': 'Camp',
'Camp Coordination/Management': 'Camp Coordination/Management',
'Camp Details': 'Camp Details',
@@ -752,6 +768,7 @@
'Clinical Status': 'Clinical Status',
'Close map': 'Close map',
'Closed': 'Closed',
+'Closed?': 'Closed?',
'Clothing': 'Clothing',
'Cluster': 'Cluster',
'Cluster Details': 'Cluster Details',
@@ -783,7 +800,9 @@
'Combined Method': 'Combined Method',
'Come back later.': 'Come back later.',
'Come back later. Everyone visiting this site is probably experiencing the same problem as you.': 'Come back later. Everyone visiting this site is probably experiencing the same problem as you.',
+'Comment': 'Comment',
'Comments': 'Comments',
+'Comments permitted?': 'Comments permitted?',
'Commercial/Offices': 'Commercial/Offices',
'Commit': 'Commit',
'Commit Date': 'Commit Date',
@@ -811,10 +830,12 @@
'Committing Organization': 'Committing Organisation',
'Committing Person': 'Committing Person',
'Communication problems': 'Communication problems',
+'Community': 'Community',
'Community Centre': 'Community Centre',
'Community Health Center': 'Community Health Center',
'Community Member': 'Community Member',
'Competency': 'Competency',
+'Competency Rating': 'Competency Rating',
'Competency Rating Catalog': 'Competency Rating Catalogue',
'Competency Rating Details': 'Competency Rating Details',
'Competency Rating added': 'Competency Rating added',
@@ -871,16 +892,19 @@
'Contacts': 'Contacts',
'Contents': 'Contents',
'Contributor': 'Contributor',
+'Controller': 'Controller',
'Conversion Tool': 'Conversion Tool',
'Cooking NFIs': 'Cooking NFIs',
'Cooking Oil': 'Cooking Oil',
'Coordinate Conversion': 'Coordinate Conversion',
'Coping Activities': 'Coping Activities',
'Copy': 'Copy',
'Corn': 'Corn',
+'Corporate Entity': 'Corporate Entity',
'Cost Type': 'Cost Type',
'Cost per Megabyte': 'Cost per Megabyte',
'Cost per Minute': 'Cost per Minute',
+'Countries': 'Countries',
'Country': 'Country',
'Country is required!': 'Country is required!',
'Country of Residence': 'Country of Residence',
@@ -981,20 +1005,30 @@
'Date & Time': 'Date & Time',
'Date Available': 'Date Available',
'Date Delivered': 'Date Delivered',
+'Date Due': 'Date Due',
'Date Expected': 'Date Expected',
+'Date Joined': 'Date Joined',
+'Date Needed BY': 'Date Needed BY',
+'Date Published': 'Date Published',
'Date Received': 'Date Received',
+'Date Repacked': 'Date Repacked',
'Date Requested': 'Date Requested',
'Date Required': 'Date Required',
'Date Required Until': 'Date Required Until',
'Date Sent': 'Date Sent',
+'Date Taken': 'Date Taken',
'Date Until': 'Date Until',
'Date and Time': 'Date and Time',
'Date and time this report relates to.': 'Date and time this report relates to.',
'Date of Birth': 'Date of Birth',
'Date of Latest Information on Beneficiaries Reached': 'Date of Latest Information on Beneficiaries Reached',
'Date of Report': 'Date of Report',
'Date of Treatment': 'Date of Treatment',
+'Date of adjustment': 'Date of adjustment',
+'Date resigned': 'Date resigned',
'Date/Time': 'Date/Time',
+'Date/Time of Alert': 'Date/Time of Alert',
+'Date/Time of Dispatch': 'Date/Time of Dispatch',
'Date/Time of Find': 'Date/Time of Find',
'Date/Time when found': 'Date/Time when found',
'Date/Time when last seen': 'Date/Time when last seen',
@@ -1009,12 +1043,15 @@
'Deaths in the past 24h': 'Deaths in the past 24h',
'Deaths/24hrs': 'Deaths/24hrs',
'Decimal Degrees': 'Decimal Degrees',
+'Decision': 'Decision',
'Decomposed': 'Decomposed',
+'Default Base layer?': 'Default Base layer?',
'Default Height of the map window.': 'Default Height of the map window.',
'Default Location': 'Default Location',
'Default Map': 'Default Map',
'Default Marker': 'Default Marker',
'Default Width of the map window.': 'Default Width of the map window.',
+'Default map question': 'Default map question',
'Defecation area for animals': 'Defecation area for animals',
'Define Scenarios for allocation of appropriate Resources (Human, Assets & Facilities).': 'Define Scenarios for allocation of appropriate Resources (Human, Assets & Facilities).',
'Defines the icon used for display of features on handheld GPS.': 'Defines the icon used for display of features on handheld GPS.',
@@ -1133,6 +1170,7 @@
'Demonstrations': 'Demonstrations',
'Dental Examination': 'Dental Examination',
'Dental Profile': 'Dental Profile',
+'Department / Unit': 'Department / Unit',
'Deployment Location': 'Deployment Location',
'Describe the condition of the roads to your hospital.': 'Describe the condition of the roads to your hospital.',
'Describe the procedure which this record relates to (e.g. "medical examination")': 'Describe the procedure which this record relates to (e.g. "medical examination")',
@@ -1146,6 +1184,7 @@
'Desire to remain with family': 'Desire to remain with family',
'Destination': 'Destination',
'Destroyed': 'Destroyed',
+'Detailed Description/URL': 'Detailed Description/URL',
'Details': 'Details',
'Details field is required!': 'Details field is required!',
'Dialysis': 'Dialysis',
@@ -1438,9 +1477,12 @@
'Enter a new support request.': 'Enter a new support request.',
'Enter a unique label!': 'Enter a unique label!',
'Enter a valid date before': 'Enter a valid date before',
+'Enter a valid date before %(max)s!': 'Enter a valid date before %(max)s!',
'Enter a valid email': 'Enter a valid email',
'Enter a valid future date': 'Enter a valid future date',
'Enter a valid past date': 'Enter a valid past date',
+'Enter a valid past date %(max)s!': 'Enter a valid past date %(max)s!',
+'Enter a valid past date %(min)s!': 'Enter a valid past date %(min)s!',
'Enter some characters to bring up a list of possible matches': 'Enter some characters to bring up a list of possible matches',
'Enter some characters to bring up a list of possible matches.': 'Enter some characters to bring up a list of possible matches.',
'Enter tags separated by commas.': 'Enter tags separated by commas.',
@@ -1450,15 +1492,18 @@
'Enter your organization': 'Enter your organisation',
'Entered': 'Entered',
'Entering a phone number is optional, but doing so allows you to subscribe to receive SMS messages.': 'Entering a phone number is optional, but doing so allows you to subscribe to receive SMS messages.',
+'Entity': 'Entity',
'Environment': 'Environment',
'Equipment': 'Equipment',
'Error encountered while applying the theme.': 'Error encountered while applying the theme.',
'Error in message': 'Error in message',
'Error logs for "%(app)s"': 'Error logs for "%(app)s"',
+'Essential Staff?': 'Essential Staff?',
'Est. Delivery Date': 'Est. Delivery Date',
'Estimated # of households who are affected by the emergency': 'Estimated # of households who are affected by the emergency',
'Estimated # of people who are affected by the emergency': 'Estimated # of people who are affected by the emergency',
'Estimated Overall Building Damage': 'Estimated Overall Building Damage',
+'Estimated Value per Pack': 'Estimated Value per Pack',
'Estimated total number of people in institutions': 'Estimated total number of people in institutions',
'Euros': 'Euros',
'Evacuating': 'Evacuating',
@@ -1486,7 +1531,9 @@
'Exits': 'Exits',
'Expected Return Home': 'Expected Return Home',
'Experience': 'Experience',
+'Expiry (months)': 'Expiry (months)',
'Expiry Date': 'Expiry Date',
+'Expiry Date/Time': 'Expiry Date/Time',
'Explosive Hazard': 'Explosive Hazard',
'Export': 'Export',
'Export Data': 'Export Data',
@@ -1505,6 +1552,7 @@
'Facial hear, length': 'Facial hear, length',
'Facilities': 'Facilities',
'Facility': 'Facility',
+'Facility Contact': 'Facility Contact',
'Facility Details': 'Facility Details',
'Facility Operations': 'Facility Operations',
'Facility Status': 'Facility Status',
@@ -1513,6 +1561,7 @@
'Facility or Location': 'Facility or Location',
'Facility removed': 'Facility removed',
'Facility updated': 'Facility updated',
+'Facility/Site': 'Facility/Site',
'Fail': 'Fail',
'Failed!': 'Failed!',
'Fair': 'Fair',
@@ -1583,6 +1632,7 @@
'Flood Reports': 'Flood Reports',
'Flow Status': 'Flow Status',
'Fog': 'Fog',
+'Folder': 'Folder',
'Food': 'Food',
'Food Supply': 'Food Supply',
'Food assistance': 'Food assistance',
@@ -1591,8 +1641,11 @@
'For': 'For',
'For POP-3 this is usually 110 (995 for SSL), for IMAP this is usually 143 (993 for IMAP).': 'For POP-3 this is usually 110 (995 for SSL), for IMAP this is usually 143 (993 for IMAP).',
'For a country this would be the ISO2 code, for a Town, it would be the Airport Locode.': 'For a country this would be the ISO2 code, for a Town, it would be the Airport Locode.',
+'For live help from the Sahana community on using this application, go to': 'For live help from the Sahana community on using this application, go to',
'For messages that support alert network internal functions': 'For messages that support alert network internal functions',
+'For more details on the Sahana Eden system, see the': 'For more details on the Sahana Eden system, see the',
'Forest Fire': 'Forest Fire',
+'Form Settings': 'Form Settings',
'Formal camp': 'Formal camp',
'Format': 'Format',
"Format the list of attribute values & the RGB value to use for these as a JSON object, e.g.: {Red: '#FF0000', Green: '#00FF00', Yellow: '#FFFF00'}": "Format the list of attribute values & the RGB value to use for these as a JSON object, e.g.: {Red: '#FF0000', Green: '#00FF00', Yellow: '#FFFF00'}",
@@ -1615,6 +1668,7 @@
'Full': 'Full',
'Full beard': 'Full beard',
'Fullscreen Map': 'Fullscreen Map',
+'Function': 'Function',
'Functions available': 'Functions available',
'Funding Organization': 'Funding Organisation',
'Funds Contributed by this Organization': 'Funds Contributed by this Organisation',
@@ -1675,6 +1729,7 @@
'Group': 'Group',
'Group Description': 'Group Description',
'Group Details': 'Group Details',
+'Group Head': 'Group Head',
'Group ID': 'Group ID',
'Group Member added': 'Group Member added',
'Group Members': 'Group Members',
@@ -1695,6 +1750,7 @@
'Hair Length': 'Hair Length',
'Hair Style': 'Hair Style',
'Has data from this Reference Document been entered into Sahana?': 'Has data from this Reference Document been entered into Sahana?',
+'Has the %(GRN)s (%(GRN_name)s) form been completed?': 'Has the %(GRN)s (%(GRN_name)s) form been completed?',
'Has the Certificate for receipt of the shipment been given to the sender?': 'Has the Certificate for receipt of the shipment been given to the sender?',
'Has the GRN (Goods Received Note) been completed?': 'Has the GRN (Goods Received Note) been completed?',
'Hazard Pay': 'Hazard Pay',
@@ -1825,6 +1881,7 @@
'If not found, you can have a new location created.': 'If not found, you can have a new location created.',
"If selected, then this Asset's Location will be updated whenever the Person's Location is updated.": "If selected, then this Asset's Location will be updated whenever the Person's Location is updated.",
'If the location is a geographic area, then state at what level here.': 'If the location is a geographic area, then state at what level here.',
+'If the person counts as essential staff when evacuating all non-essential staff.': 'If the person counts as essential staff when evacuating all non-essential staff.',
'If the request is for %s, please enter the details on the next screen.': 'If the request is for %s, please enter the details on the next screen.',
'If the request type is "Other", please enter request details here.': 'If the request type is "Other", please enter request details here.',
"If this configuration represents a region for the Regions menu, give it a name to use in the menu. The name for a personal map configuration will be set to the user's name.": "If this configuration represents a region for the Regions menu, give it a name to use in the menu. The name for a personal map configuration will be set to the user's name.",
@@ -1840,12 +1897,14 @@
"If you don't see the Office in the list, you can add a new one by clicking link 'Add Office'.": "If you don't see the Office in the list, you can add a new one by clicking link 'Add Office'.",
"If you don't see the Organization in the list, you can add a new one by clicking link 'Add Organization'.": "If you don't see the Organisation in the list, you can add a new one by clicking link 'Add Organisation'.",
"If you don't see the site in the list, you can add a new one by clicking link 'Add Project Site'.": "If you don't see the site in the list, you can add a new one by clicking link 'Add Project Site'.",
+"If you enter a foldername then the layer will appear in this folder in the Map's layer switcher.": "If you enter a foldername then the layer will appear in this folder in the Map's layer switcher.",
'If you have any questions or need support, please see': 'If you have any questions or need support, please see',
'If you know what the Geonames ID of this location is then you can enter it here.': 'If you know what the Geonames ID of this location is then you can enter it here.',
'If you know what the OSM ID of this location is then you can enter it here.': 'If you know what the OSM ID of this location is then you can enter it here.',
'If you need to add a new document then you can click here to attach one.': 'If you need to add a new document then you can click here to attach one.',
'If you want several values, then separate with': 'If you want several values, then separate with',
'If you would like to help, then please': 'If you would like to help, then please',
+'If you would like to help, then please %(sign_up_now)s': 'If you would like to help, then please %(sign_up_now)s',
'Illegal Immigrant': 'Illegal Immigrant',
'Image': 'Image',
'Image Details': 'Image Details',
@@ -1902,6 +1961,7 @@
'Inbound Mail Settings': 'Inbound Mail Settings',
'Incident': 'Incident',
'Incident Categories': 'Incident Categories',
+'Incident Commander': 'Incident Commander',
'Incident Details': 'Incident Details',
'Incident Report': 'Incident Report',
'Incident Report Details': 'Incident Report Details',
@@ -1937,13 +1997,15 @@
'Infusion catheters needed per 24h': 'Infusion catheters needed per 24h',
'Infusions available': 'Infusions available',
'Infusions needed per 24h': 'Infusions needed per 24h',
+'Initials': 'Initials',
'Inspected': 'Inspected',
'Inspection Date': 'Inspection Date',
'Inspection date and time': 'Inspection date and time',
'Inspection time': 'Inspection time',
'Inspector ID': 'Inspector ID',
'Instant Porridge': 'Instant Porridge',
'Institution': 'Institution',
+'Instructor': 'Instructor',
'Insufficient': 'Insufficient',
'Insufficient privileges': 'Insufficient privileges',
'Insufficient vars: Need module, resource, jresource, instance': 'Insufficient vars: Need module, resource, jresource, instance',
@@ -1963,6 +2025,8 @@
'Invalid ticket': 'Invalid ticket',
'Inventories': 'Inventories',
'Inventory': 'Inventory',
+'Inventory Adjustment': 'Inventory Adjustment',
+'Inventory Adjustment Item': 'Inventory Adjustment Item',
'Inventory Item': 'Inventory Item',
'Inventory Item Details': 'Inventory Item Details',
'Inventory Item updated': 'Inventory Item updated',
@@ -2007,6 +2071,7 @@
'Item removed from shipment': 'Item removed from shipment',
'Item updated': 'Item updated',
'Items': 'Items',
+'Items in Category are Vehicles': 'Items in Category are Vehicles',
'Items in Category can be Assets': 'Items in Category can be Assets',
'Japanese': 'Japanese',
'Jerry can': 'Jerry can',
@@ -2030,10 +2095,12 @@
'Kit': 'Kit',
'Kit Contents': 'Kit Contents',
'Kit Details': 'Kit Details',
+'Kit Item': 'Kit Item',
'Kit Updated': 'Kit Updated',
'Kit added': 'Kit added',
'Kit deleted': 'Kit deleted',
'Kit updated': 'Kit updated',
+'Kit?': 'Kit?',
'Kits': 'Kits',
'Known Identities': 'Known Identities',
'Known incidents of violence against women/girls': 'Known incidents of violence against women/girls',
@@ -2049,6 +2116,7 @@
'Lahar': 'Lahar',
'Landslide': 'Landslide',
'Language': 'Language',
+'Language Code': 'Language Code',
'Last Name': 'Last Name',
'Last Synchronization': 'Last Synchronisation',
'Last known location': 'Last known location',
@@ -2068,6 +2136,7 @@
'Latitude should be between': 'Latitude should be between',
'Latrines': 'Latrines',
'Law enforcement, military, homeland and local/private security': 'Law enforcement, military, homeland and local/private security',
+'Layer': 'Layer',
'Layer Details': 'Layer Details',
'Layer ID': 'Layer ID',
'Layer Name': 'Layer Name',
@@ -2081,7 +2150,9 @@
'Layers updated': 'Layers updated',
'Leader': 'Leader',
'Leave blank to request an unskilled person': 'Leave blank to request an unskilled person',
+'Left-side is fully transparent (0), right-side is opaque (1.0).': 'Left-side is fully transparent (0), right-side is opaque (1.0).',
'Legend Format': 'Legend Format',
+'Legend URL': 'Legend URL',
'Length (m)': 'Length (m)',
'Level': 'Level',
'Level 1': 'Level 1',
@@ -2098,6 +2169,8 @@
'Level 2 Assessments': 'Level 2 Assessments',
'Level 2 or detailed engineering evaluation recommended': 'Level 2 or detailed engineering evaluation recommended',
"Level is higher than parent's": "Level is higher than parent's",
+'Level of Award': 'Level of Award',
+'Level of competency this person has with this skill.': 'Level of competency this person has with this skill.',
'Library support not available for OpenID': 'Library support not available for OpenID',
'License Number': 'License Number',
'License Plate': 'License Plate',
@@ -2301,6 +2374,7 @@
'Load Raw File into Grid': 'Load Raw File into Grid',
'Load Search': 'Load Search',
'Loading': 'Loading',
+'Loading Bin': 'Loading Bin',
'Local Name': 'Local Name',
'Local Names': 'Local Names',
'Location': 'Location',
@@ -2335,6 +2409,7 @@
'Logistics': 'Logistics',
'Logo': 'Logo',
'Logo file %s missing!': 'Logo file %s missing!',
+'Logo of the organization. This should be a png or jpeg file and it should be no larger than 400x400': 'Logo of the organization. This should be a png or jpeg file and it should be no larger than 400x400',
'Logout': 'Logout',
'Longitude': 'Longitude',
'Longitude is West - East (sideways).': 'Longitude is West - East (sideways).',
@@ -2350,6 +2425,7 @@
'Lost Password': 'Lost Password',
'Low': 'Low',
'Magnetic Storm': 'Magnetic Storm',
+'Mailing list': 'Mailing list',
'Major Damage': 'Major Damage',
'Major expenses': 'Major expenses',
'Major outward damage': 'Major outward damage',
@@ -2418,6 +2494,8 @@
'Members': 'Members',
'Membership': 'Membership',
'Membership Details': 'Membership Details',
+'Membership Fee': 'Membership Fee',
+'Membership Paid': 'Membership Paid',
'Membership added': 'Membership added',
'Membership deleted': 'Membership deleted',
'Membership updated': 'Membership updated',
@@ -2437,6 +2515,7 @@
'Middle Name': 'Middle Name',
'Migrants or ethnic minorities': 'Migrants or ethnic minorities',
'Mileage': 'Mileage',
+'Milestone': 'Milestone',
'Military': 'Military',
'Minimum Location Latitude': 'Minimum Location Latitude',
'Minimum Location Longitude': 'Minimum Location Longitude',
@@ -2503,6 +2582,11 @@
'Name': 'Name',
'Name and/or ID': 'Name and/or ID',
'Name field is required!': 'Name field is required!',
+'Name of Award': 'Name of Award',
+'Name of Driver': 'Name of Driver',
+'Name of Father': 'Name of Father',
+'Name of Institute': 'Name of Institute',
+'Name of Mother': 'Name of Mother',
'Name of the file (& optional sub-path) located in static which should be used for the background of the header.': 'Name of the file (& optional sub-path) located in static which should be used for the background of the header.',
'Name of the file (& optional sub-path) located in static which should be used for the top-left image.': 'Name of the file (& optional sub-path) located in static which should be used for the top-left image.',
'Name of the file (& optional sub-path) located in views which should be used for footer.': 'Name of the file (& optional sub-path) located in views which should be used for footer.',
@@ -2576,6 +2660,7 @@
'New Training Course': 'New Training Course',
'New Volunteer': 'New Volunteer',
'New cases in the past 24h': 'New cases in the past 24h',
+'News': 'News',
'Next': 'Next',
'Next View': 'Next View',
'No': 'No',
@@ -2765,9 +2850,15 @@
'Not authorised!': 'Not authorised!',
'Not installed or incorrectly configured.': 'Not installed or incorrectly configured.',
'Note that this list only shows active volunteers. To see all people registered in the system, search from this screen instead': 'Note that this list only shows active volunteers. To see all people registered in the system, search from this screen instead',
+'Note that when using geowebcache, this can be set in the GWC config.': 'Note that when using geowebcache, this can be set in the GWC config.',
'Notes': 'Notes',
'Notice to Airmen': 'Notice to Airmen',
+'Number': 'Number',
+'Number of Families': 'Number of Families',
'Number of Patients': 'Number of Patients',
+'Number of People Affected': 'Number of People Affected',
+'Number of People Dead': 'Number of People Dead',
+'Number of People Injured': 'Number of People Injured',
'Number of People Required': 'Number of People Required',
'Number of additional beds of that type expected to become available in this unit within the next 24 hours.': 'Number of additional beds of that type expected to become available in this unit within the next 24 hours.',
'Number of alternative places for studying': 'Number of alternative places for studying',
@@ -2834,6 +2925,7 @@
'One-time costs': 'One-time costs',
'Oops! Something went wrong...': 'Oops! Something went wrong...',
'Oops! something went wrong on our side.': 'Oops! something went wrong on our side.',
+'Opacity': 'Opacity',
'Opacity (1 for opaque, 0 for fully-transparent)': 'Opacity (1 for opaque, 0 for fully-transparent)',
'Open': 'Open',
'Open area': 'Open area',
@@ -2844,15 +2936,19 @@
'Optional': 'Optional',
'Optional Subject to put into Email - can be used as a Security Password by the service provider': 'Optional Subject to put into Email - can be used as a Security Password by the service provider',
'Optional link to an Incident which this Assessment was triggered by.': 'Optional link to an Incident which this Assessment was triggered by.',
+'Optional password for HTTP Basic Authentication.': 'Optional password for HTTP Basic Authentication.',
'Optional selection of a MapServer map.': 'Optional selection of a MapServer map.',
'Optional selection of a background color.': 'Optional selection of a background colour.',
'Optional selection of an alternate style.': 'Optional selection of an alternate style.',
+'Optional username for HTTP Basic Authentication.': 'Optional username for HTTP Basic Authentication.',
'Optional. If you wish to style the features based on values of an attribute, select the attribute to use here.': 'Optional. If you wish to style the features based on values of an attribute, select the attribute to use here.',
'Optional. In GeoServer, this is the Workspace Namespace URI (not the name!). Within the WFS getCapabilities, this is the FeatureType Name part before the colon(:).': 'Optional. In GeoServer, this is the Workspace Namespace URI (not the name!). Within the WFS getCapabilities, this is the FeatureType Name part before the colon(:).',
'Optional. The name of an element whose contents should be a URL of an Image file put into Popups.': 'Optional. The name of an element whose contents should be a URL of an Image file put into Popups.',
'Optional. The name of an element whose contents should be put into Popups.': 'Optional. The name of an element whose contents should be put into Popups.',
"Optional. The name of the geometry column. In PostGIS this defaults to 'the_geom'.": "Optional. The name of the geometry column. In PostGIS this defaults to 'the_geom'.",
'Optional. The name of the schema. In Geoserver this has the form http://host_name/geoserver/wfs/DescribeFeatureType?version=1.1.0&;typename=workspace_name:layer_name.': 'Optional. The name of the schema. In Geoserver this has the form http://host_name/geoserver/wfs/DescribeFeatureType?version=1.1.0&;typename=workspace_name:layer_name.',
+'Optional: The URL to call to access the Features, if different to the Module.': 'Optional: The URL to call to access the Features, if different to the Module.',
+'Optional: The URL to call to access the Features, if different to the Resource.': 'Optional: The URL to call to access the Features, if different to the Resource.',
'Options': 'Options',
'Order': 'Order',
'Order Created': 'Order Created',
@@ -2880,6 +2976,7 @@
'Organizations': 'Organisations',
'Origin': 'Origin',
'Origin of the separated children': 'Origin of the separated children',
+'Original Quantity': 'Original Quantity',
'Other': 'Other',
'Other (describe)': 'Other (describe)',
'Other (specify)': 'Other (specify)',
@@ -2916,6 +3013,7 @@
'Other ways to obtain food': 'Other ways to obtain food',
'Outbound Mail settings are configured in models/000_config.py.': 'Outbound Mail settings are configured in models/000_config.py.',
'Outbox': 'Outbox',
+'Outcomes, Impact, Challenges': 'Outcomes, Impact, Challenges',
'Outgoing SMS Handler': 'Outgoing SMS Handler',
'Outgoing SMS handler': 'Outgoing SMS handler',
'Overall Hazards': 'Overall Hazards',
@@ -2936,13 +3034,15 @@
'Parameters': 'Parameters',
'Parapets, ornamentation': 'Parapets, ornamentation',
'Parent': 'Parent',
+'Parent Item': 'Parent Item',
'Parent Office': 'Parent Office',
"Parent level should be higher than this record's level. Parent level is": "Parent level should be higher than this record's level. Parent level is",
'Parent needs to be of the correct level': 'Parent needs to be of the correct level',
'Parent needs to be set': 'Parent needs to be set',
'Parent needs to be set for locations of level': 'Parent needs to be set for locations of level',
'Parents/Caregivers missing children': 'Parents/Caregivers missing children',
'Parking Area': 'Parking Area',
+'Parsing Status': 'Parsing Status',
'Partial': 'Partial',
'Participant': 'Participant',
'Partner National Society': 'Partner National Society',
@@ -2951,6 +3051,7 @@
'Password': 'Password',
"Password fields don't match": "Password fields don't match",
'Password to use for authentication at the remote site': 'Password to use for authentication at the remote site',
+'Password to use for authentication at the remote site.': 'Password to use for authentication at the remote site.',
'Path': 'Path',
'Pathology': 'Pathology',
'Patient': 'Patient',
@@ -2969,6 +3070,7 @@
'People Needing Shelter': 'People Needing Shelter',
'People Needing Water': 'People Needing Water',
'People Trapped': 'People Trapped',
+'Percentage': 'Percentage',
'Performance Rating': 'Performance Rating',
'Person': 'Person',
'Person 1': 'Person 1',
@@ -3032,6 +3134,7 @@
'Please enter the recipient': 'Please enter the recipient',
'Please fill this!': 'Please fill this!',
'Please give an estimated figure about how many bodies have been found.': 'Please give an estimated figure about how many bodies have been found.',
+"Please provide as much detail as you can, including the URL(s) where the bug occurs or you'd like the new feature to go.": "Please provide as much detail as you can, including the URL(s) where the bug occurs or you'd like the new feature to go.",
'Please provide the URL of the page you are referring to, a description of what you expected to happen & what actually happened.': 'Please provide the URL of the page you are referring to, a description of what you expected to happen & what actually happened.',
'Please report here where you are:': 'Please report here where you are:',
'Please select': 'Please select',
@@ -3072,6 +3175,7 @@
'Position deleted': 'Position deleted',
'Position updated': 'Position updated',
'Positions': 'Positions',
+'Post': 'Post',
'Postcode': 'Postcode',
'Poultry': 'Poultry',
'Poultry restocking, Rank': 'Poultry restocking, Rank',
@@ -3103,7 +3207,10 @@
'Procedure': 'Procedure',
'Process Received Shipment': 'Process Received Shipment',
'Process Shipment to Send': 'Process Shipment to Send',
+'Profession': 'Profession',
'Profile': 'Profile',
+'Profile Picture?': 'Profile Picture?',
+'Programme': 'Programme',
'Project': 'Project',
'Project Details': 'Project Details',
'Project Details including organizations': 'Project Details including organisations',
@@ -3139,6 +3246,7 @@
'Public assembly': 'Public assembly',
'Pull tickets from external feed': 'Pull tickets from external feed',
'Purchase Date': 'Purchase Date',
+'Purchase Order Number': 'Purchase Order Number',
'Purpose': 'Purpose',
'Push tickets to external system': 'Push tickets to external system',
'Pyroclastic Flow': 'Pyroclastic Flow',
@@ -3147,6 +3255,9 @@
'Quantity': 'Quantity',
'Quantity Committed': 'Quantity Committed',
'Quantity Fulfilled': 'Quantity Fulfilled',
+'Quantity Received': 'Quantity Received',
+'Quantity Returned': 'Quantity Returned',
+'Quantity Sent': 'Quantity Sent',
"Quantity in %s's Inventory": "Quantity in %s's Inventory",
'Quantity in Transit': 'Quantity in Transit',
'Quarantine': 'Quarantine',
@@ -3164,6 +3275,7 @@
'RC frame with masonry infill': 'RC frame with masonry infill',
'RECORD A': 'RECORD A',
'RECORD B': 'RECORD B',
+'REST Filter': 'REST Filter',
'RMS': 'RMS',
'RMS Team': 'RMS Team',
'Race': 'Race',
@@ -3188,6 +3300,7 @@
'Receive New Shipment': 'Receive New Shipment',
'Receive Shipment': 'Receive Shipment',
'Receive this shipment?': 'Receive this shipment?',
+'Receive updates': 'Receive updates',
'Received': 'Received',
'Received By': 'Received By',
'Received By Person': 'Received By Person',
@@ -3237,6 +3350,7 @@
'Register them as a volunteer': 'Register them as a volunteer',
'Registered People': 'Registered People',
'Registered users can': 'Registered users can',
+'Registered users can <b>login</b> to access the system': 'Registered users can <b>login</b> to access the system',
'Registration': 'Registration',
'Registration Details': 'Registration Details',
'Registration added': 'Registration added',
@@ -3247,6 +3361,7 @@
'Rehabilitation/Long Term Care': 'Rehabilitation/Long Term Care',
'Reinforced masonry': 'Reinforced masonry',
'Rejected': 'Rejected',
+'Relationship': 'Relationship',
'Relative Details': 'Relative Details',
'Relative added': 'Relative added',
'Relative deleted': 'Relative deleted',
@@ -3258,6 +3373,7 @@
'Religious': 'Religious',
'Religious Leader': 'Religious Leader',
'Relocate as instructed in the <instruction>': 'Relocate as instructed in the <instruction>',
+'Remember me (for 30 days)': 'Remember me (for 30 days)',
'Remote Error': 'Remote Error',
'Remove': 'Remove',
'Remove Activity from this event': 'Remove Activity from this event',
@@ -3288,9 +3404,11 @@
'Remove this human resource from this scenario': 'Remove this human resource from this scenario',
'Remove this task from this event': 'Remove this task from this event',
'Remove this task from this scenario': 'Remove this task from this scenario',
+'Repacked By': 'Repacked By',
'Repair': 'Repair',
'Repaired': 'Repaired',
'Repeat your password': 'Repeat your password',
+'Reply': 'Reply',
'Report': 'Report',
'Report Another Assessment...': 'Report Another Assessment...',
'Report Details': 'Report Details',
@@ -3306,6 +3424,8 @@
'Report them missing': 'Report them missing',
'Report updated': 'Report updated',
'ReportLab module not available within the running Python - this needs installing for PDF output!': 'ReportLab module not available within the running Python - this needs installing for PDF output!',
+'Reported By (Not Staff)': 'Reported By (Not Staff)',
+'Reported By (Staff)': 'Reported By (Staff)',
'Reported To': 'Reported To',
'Reporter': 'Reporter',
'Reporter Name': 'Reporter Name',
@@ -3377,6 +3497,7 @@
'Resource': 'Resource',
'Resource Configuration': 'Resource Configuration',
'Resource Details': 'Resource Details',
+'Resource Management System': 'Resource Management System',
'Resource Mapping System': 'Resource Mapping System',
'Resource Mapping System account has been activated': 'Resource Mapping System account has been activated',
'Resource Name': 'Resource Name',
@@ -3399,6 +3520,7 @@
'Returned': 'Returned',
'Returned From': 'Returned From',
'Review Incoming Shipment to Receive': 'Review Incoming Shipment to Receive',
+'Revised Quantity': 'Revised Quantity',
'Rice': 'Rice',
'Riot': 'Riot',
'River': 'River',
@@ -3444,8 +3566,10 @@
'Safe environment for vulnerable groups': 'Safe environment for vulnerable groups',
'Safety Assessment Form': 'Safety Assessment Form',
'Safety of children and women affected by disaster?': 'Safety of children and women affected by disaster?',
+'Sahana Community Chat': 'Sahana Community Chat',
'Sahana Eden': 'Sahana Eden',
'Sahana Eden Humanitarian Management Platform': 'Sahana Eden Humanitarian Management Platform',
+'Sahana Eden Website': 'Sahana Eden Website',
'Sahana Eden portable application generator': 'Sahana Eden portable application generator',
'Salted Fish': 'Salted Fish',
'Sanitation problems': 'Sanitation problems',
@@ -3691,6 +3815,7 @@
'Select Existing Location': 'Select Existing Location',
'Select Items from the Request': 'Select Items from the Request',
'Select Items from this Inventory': 'Select Items from this Inventory',
+'Select Stock from this Warehouse': 'Select Stock from this Warehouse',
'Select This Location': 'Select This Location',
"Select a Room from the list or click 'Add Room'": "Select a Room from the list or click 'Add Room'",
'Select a location': 'Select a location',
@@ -3789,11 +3914,13 @@
'Shipment to Send': 'Shipment to Send',
'Shipments': 'Shipments',
'Shipments To': 'Shipments To',
+'Shipping Organization': 'Shipping Organization',
'Shooting': 'Shooting',
'Short Assessment': 'Short Assessment',
'Short Description': 'Short Description',
'Show Checklist': 'Show Checklist',
'Show Map': 'Show Map',
+'Show author picture?': 'Show author picture?',
'Show in Menu?': 'Show in Menu?',
'Show on Map': 'Show on Map',
'Show on map': 'Show on map',
@@ -3804,6 +3931,7 @@
'Site': 'Site',
'Site Administration': 'Site Administration',
'Sites': 'Sites',
+'Situation': 'Situation',
'Situation Awareness & Geospatial Analysis': 'Situation Awareness & Geospatial Analysis',
'Sketch': 'Sketch',
'Skill': 'Skill',
@@ -3856,6 +3984,7 @@
'Solutions': 'Solutions',
'Some': 'Some',
'Sorry - the server has a problem, please try again later.': 'Sorry - the server has a problem, please try again later.',
+'Sorry location %(location)s appears to be outside the area supported by this deployment.': 'Sorry location %(location)s appears to be outside the area supported by this deployment.',
'Sorry that location appears to be outside the area of the Parent.': 'Sorry that location appears to be outside the area of the Parent.',
'Sorry that location appears to be outside the area supported by this deployment.': 'Sorry that location appears to be outside the area supported by this deployment.',
'Sorry, I could not understand your request': 'Sorry, I could not understand your request',
@@ -3887,6 +4016,7 @@
'Specify the number of units (adult doses) needed per 24h': 'Specify the number of units (adult doses) needed per 24h',
'Specify the number of units (litres) of Ringer-Lactate or equivalent solutions needed per 24h': 'Specify the number of units (litres) of Ringer-Lactate or equivalent solutions needed per 24h',
'Speed': 'Speed',
+'Spherical Mercator (900913) is needed to use OpenStreetMap/Google/Bing base layers.': 'Spherical Mercator (900913) is needed to use OpenStreetMap/Google/Bing base layers.',
'Spherical Mercator?': 'Spherical Mercator?',
'Spreadsheet Importer': 'Spreadsheet Importer',
'Spreadsheet uploaded': 'Spreadsheet uploaded',
@@ -3907,19 +4037,22 @@
'Staff and volunteers': 'Staff and volunteers',
'Staff member added': 'Staff member added',
'Staff present and caring for residents': 'Staff present and caring for residents',
+'Staff/Volunteer': 'Staff/Volunteer',
'Staff2': 'Staff2',
'Staffing': 'Staffing',
'Stairs': 'Stairs',
'Start Date': 'Start Date',
'Start date': 'Start date',
'Start date and end date should have valid date values': 'Start date and end date should have valid date values',
+"Start typing the Participant's name.": "Start typing the Participant's name.",
'State': 'State',
'Stationery': 'Stationery',
'Status': 'Status',
'Status Report': 'Status Report',
'Status Updated': 'Status Updated',
'Status added': 'Status added',
'Status deleted': 'Status deleted',
+'Status of adjustment': 'Status of adjustment',
'Status of clinical operation of the facility.': 'Status of clinical operation of the facility.',
'Status of general operation of the facility.': 'Status of general operation of the facility.',
'Status of morgue capacity.': 'Status of morgue capacity.',
@@ -3973,6 +4106,7 @@
'Summary by Question Type': 'Summary by Question Type',
'Summary of Responses within Series': 'Summary of Responses within Series',
'Sunday': 'Sunday',
+'Supplier': 'Supplier',
'Supply Chain Management': 'Supply Chain Management',
'Supply Item Categories': 'Supply Item Categories',
'Support Request': 'Support Request',
@@ -4116,6 +4250,7 @@
'The staff responsibile for Facilities can make Requests for assistance. Commitments can be made against these Requests however the requests remain open until the requestor confirms that the request is complete.': 'The staff responsibile for Facilities can make Requests for assistance. Commitments can be made against these Requests however the requests remain open until the requestor confirms that the request is complete.',
'The subject event no longer poses a threat or concern and any follow on action is described in <instruction>': 'The subject event no longer poses a threat or concern and any follow on action is described in <instruction>',
'The synchronization module allows the synchronization of data resources between Sahana Eden instances.': 'The synchronisation module allows the synchronisation of data resources between Sahana Eden instances.',
+'The system supports 2 projections by default:': 'The system supports 2 projections by default:',
'The time at which the Event started.': 'The time at which the Event started.',
'The time difference between UTC and your timezone, specify as +HHMM for eastern or -HHMM for western timezones.': 'The time difference between UTC and your timezone, specify as +HHMM for eastern or -HHMM for western timezones.',
'The token associated with this application on': 'The token associated with this application on',
@@ -4140,6 +4275,9 @@
'This email address is already in use': 'This email address is already in use',
'This file already exists on the server as': 'This file already exists on the server as',
'This is appropriate if this level is under construction. To prevent accidental modification after this level is complete, this can be set to False.': 'This is appropriate if this level is under construction. To prevent accidental modification after this level is complete, this can be set to False.',
+'This is normally edited using the Widget in the Style Tab in the Layer Properties on the Map.': 'This is normally edited using the Widget in the Style Tab in the Layer Properties on the Map.',
+'This is the full name of the language and will be displayed to the user when selecting the template language.': 'This is the full name of the language and will be displayed to the user when selecting the template language.',
+'This is the short code of the language and will be used as the name of the file. This should be the ISO 639 code.': 'This is the short code of the language and will be used as the name of the file. This should be the ISO 639 code.',
'This is the way to transfer data between machines as it maintains referential integrity.': 'This is the way to transfer data between machines as it maintains referential integrity.',
'This is the way to transfer data between machines as it maintains referential integrity...duplicate data should be removed manually 1st!': 'This is the way to transfer data between machines as it maintains referential integrity...duplicate data should be removed manually 1st!',
'This level is not open for editing.': 'This level is not open for editing.',
@@ -4155,6 +4293,7 @@
'This shipment has not been received - it has NOT been canceled because can still be edited.': 'This shipment has not been received - it has NOT been canceled because can still be edited.',
'This shipment has not been sent - it has NOT been canceled because can still be edited.': 'This shipment has not been sent - it has NOT been canceled because can still be edited.',
'This shipment will be confirmed as received.': 'This shipment will be confirmed as received.',
+'This should be an export service URL': 'This should be an export service URL',
'Thunderstorm': 'Thunderstorm',
'Thursday': 'Thursday',
'Ticket': 'Ticket',
@@ -4168,13 +4307,19 @@
'Tiled': 'Tiled',
'Tilt-up concrete': 'Tilt-up concrete',
'Timber frame': 'Timber frame',
+'Time': 'Time',
+'Time Estimate': 'Time Estimate',
+'Time In': 'Time In',
+'Time Out': 'Time Out',
+'Time Taken': 'Time Taken',
'Timeline': 'Timeline',
'Timeline Report': 'Timeline Report',
'Timestamp': 'Timestamp',
'Timestamps can be correlated with the timestamps on the photos to locate them on the map.': 'Timestamps can be correlated with the timestamps on the photos to locate them on the map.',
'Title': 'Title',
'Title to show for the Web Map Service panel in the Tools panel.': 'Title to show for the Web Map Service panel in the Tools panel.',
'To': 'To',
+'To Facility': 'To Facility',
'To Location': 'To Location',
'To Person': 'To Person',
'To create a personal map configuration, click ': 'To create a personal map configuration, click ',
@@ -4219,6 +4364,7 @@
'Town': 'Town',
'Traces internally displaced people (IDPs) and their needs': 'Traces internally displaced people (IDPs) and their needs',
'Track with this Person?': 'Track with this Person?',
+'Trackable': 'Trackable',
'Tracking of Patients': 'Tracking of Patients',
'Tracking of Projects, Activities and Tasks': 'Tracking of Projects, Activities and Tasks',
'Tracking of basic information on the location, facilities and size of the Shelters': 'Tracking of basic information on the location, facilities and size of the Shelters',
@@ -4227,9 +4373,11 @@
'Training': 'Training',
'Training Course Catalog': 'Training Course Catalogue',
'Training Details': 'Training Details',
+'Training Event': 'Training Event',
'Training added': 'Training added',
'Training deleted': 'Training deleted',
'Training updated': 'Training updated',
+'Training?': 'Training?',
'Trainings': 'Trainings',
'Transit': 'Transit',
'Transit Status': 'Transit Status',
@@ -4254,12 +4402,18 @@
'Twitter Settings': 'Twitter Settings',
'Type': 'Type',
'Type of Construction': 'Type of Construction',
+'Type of Transport': 'Type of Transport',
+'Type of adjustment': 'Type of adjustment',
'Type of water source before the disaster': 'Type of water source before the disaster',
"Type the first few characters of one of the Person's names.": "Type the first few characters of one of the Person's names.",
+'Types of Activities': 'Types of Activities',
'UN': 'UN',
'URL': 'URL',
'URL of the default proxy server to connect to remote repositories (if required). If only some of the repositories require the use of a proxy server, you can configure this in the respective repository configuration.': 'URL of the default proxy server to connect to remote repositories (if required). If only some of the repositories require the use of a proxy server, you can configure this in the respective repository configuration.',
+'URL of the default proxy server to connect to remote repositories (if required). If only some of the repositories require the use of a proxy server, you can configure this in the respective repository configurations.': 'URL of the default proxy server to connect to remote repositories (if required). If only some of the repositories require the use of a proxy server, you can configure this in the respective repository configurations.',
+'URL of the proxy server to connect to the repository (leave empty for default proxy)': 'URL of the proxy server to connect to the repository (leave empty for default proxy)',
'URL of the proxy server to connect to this repository (leave empty for default proxy)': 'URL of the proxy server to connect to this repository (leave empty for default proxy)',
+'URL to a Google Calendar to display on the project timeline.': 'URL to a Google Calendar to display on the project timeline.',
'UTC Offset': 'UTC Offset',
'UUID': 'UUID',
'Un-Repairable': 'Un-Repairable',
@@ -4351,6 +4505,7 @@
'User updated': 'User updated',
'Username': 'Username',
'Username to use for authentication at the remote site': 'Username to use for authentication at the remote site',
+'Username to use for authentication at the remote site.': 'Username to use for authentication at the remote site.',
'Users': 'Users',
'Users removed': 'Users removed',
'Uses the REST Query Format defined in': 'Uses the REST Query Format defined in',
@@ -4366,6 +4521,7 @@
'Vehicle Details deleted': 'Vehicle Details deleted',
'Vehicle Details updated': 'Vehicle Details updated',
'Vehicle Management': 'Vehicle Management',
+'Vehicle Plate Number': 'Vehicle Plate Number',
'Vehicle Types': 'Vehicle Types',
'Vehicle added': 'Vehicle added',
'Vehicle deleted': 'Vehicle deleted',
@@ -4423,10 +4579,12 @@
'Votes': 'Votes',
'WARNING': 'WARNING',
'WASH': 'WASH',
+'WGS84 (EPSG 4236) is required for many WMS servers.': 'WGS84 (EPSG 4236) is required for many WMS servers.',
'Walking Only': 'Walking Only',
'Wall or other structural damage': 'Wall or other structural damage',
'Warehouse': 'Warehouse',
'Warehouse Details': 'Warehouse Details',
+'Warehouse Stock': 'Warehouse Stock',
'Warehouse added': 'Warehouse added',
'Warehouse deleted': 'Warehouse deleted',
'Warehouse updated': 'Warehouse updated',
@@ -4438,6 +4596,7 @@
'Water storage containers in households': 'Water storage containers in households',
'Water supply': 'Water supply',
'Waterspout': 'Waterspout',
+'Waybill Number': 'Waybill Number',
'We have tried': 'We have tried',
'Web API settings updated': 'Web API settings updated',
'Web Map Service Browser Name': 'Web Map Service Browser Name',
@@ -4455,13 +4614,16 @@
'Wheat': 'Wheat',
'When reports were entered': 'When reports were entered',
'Where Project is implemented, including activities and beneficiaries': 'Where Project is implemented, including activities and beneficiaries',
+'Whether the resource should be tracked using S3Track rather than just using the Base Location': 'Whether the resource should be tracked using S3Track rather than just using the Base Location',
'Whether to accept unsolicited data transmissions from the repository': 'Whether to accept unsolicited data transmissions from the repository',
'Which methods to apply when importing data to the local repository': 'Which methods to apply when importing data to the local repository',
'Whiskers': 'Whiskers',
'Who is doing what and where': 'Who is doing what and where',
'Who usually collects water for the family?': 'Who usually collects water for the family?',
'Width (m)': 'Width (m)',
'Wild Fire': 'Wild Fire',
+'Will be filled automatically when the Item has been Repacked': 'Will be filled automatically when the Item has been Repacked',
+'Will be filled automatically when the Shipment has been Received': 'Will be filled automatically when the Shipment has been Received',
'Wind Chill': 'Wind Chill',
'Window frame': 'Window frame',
'Winter Storm': 'Winter Storm',
@@ -4566,8 +4728,11 @@
'edit': 'edit',
'eg. gas, electricity, water': 'eg. gas, electricity, water',
'enclosed area': 'enclosed area',
+'enter a number': 'enter a number',
'enter a number between %(min)g and %(max)g': 'enter a number between %(min)g and %(max)g',
+'enter a number greater than or equal to %(min)g': 'enter a number greater than or equal to %(min)g',
'enter an integer between %(min)g and %(max)g': 'enter an integer between %(min)g and %(max)g',
+'expired': 'expired',
'export as csv file': 'export as csv file',
'fat': 'fat',
'feedback': 'feedback',
@@ -4589,6 +4754,7 @@
'in Deg Min Sec format': 'in Deg Min Sec format',
'in GPS format': 'in GPS format',
'in Inv.': 'in Inv.',
+'in Stock': 'in Stock',
'inactive': 'inactive',
'injured': 'injured',
'insert new': 'insert new',
@@ -4634,6 +4800,8 @@
'or import from csv file': 'or import from csv file',
'other': 'other',
'over one hour': 'over one hour',
+'overdue': 'overdue',
+'paid': 'paid',
'people': 'people',
'piece': 'piece',
'pit': 'pit',
@@ -4679,6 +4847,7 @@
'to reset your password': 'to reset your password',
'to verify your email': 'to verify your email',
'tonsure': 'tonsure',
+'too short': 'too short',
'total': 'total',
'tweepy module not available within the running Python - this needs installing for non-Tropo Twitter support!': 'tweepy module not available within the running Python - this needs installing for non-Tropo Twitter support!',
'unable to parse csv file': 'unable to parse csv file',
View
31 models/000_1st_run.py
@@ -11,8 +11,8 @@
# dependencies have been added.
# Increment this when new dependencies are added
-# This will be compared to the version in the 0000_template.py 'canary' file.
-CURRENT_UPDATE_CHECK_ID = 2
+# This will be compared to the version in the 0000_update_check.py 'canary' file.
+CURRENT_UPDATE_CHECK_ID = 3
update_check_needed = False
try:
if CANARY_UPDATE_CHECK_ID != CURRENT_UPDATE_CHECK_ID:
@@ -28,13 +28,9 @@
# Supply the current (Web2py) environment. Pick out only the items that are
# safe for the check functions to combine with their own environments, i.e.
# not anything of the form __x__.
- environment = dict((k, v) for (k, v) in globals().iteritems() if not k.startswith("__"))
- # @ToDo:
- # For now only the default config template is automatically available
- # - we want a single place to select the config template & prepopulate setting
- # - however don't want too many unnecessary interrupts...needs more planning
- TEMPLATE = "default"
- messages = update_check(environment, template=TEMPLATE)
+ #environment = dict((k, v) for (k, v) in globals().iteritems() if not k.startswith("__"))
+ #messages = update_check(environment)
+ messages = update_check()
errors.extend(messages.get("error_messages", []))
warnings.extend(messages.get("warning_messages", []))
@@ -63,14 +59,15 @@
# Create or update the canary file.
from gluon import portalocker
- canary = open("applications/%s/models/0000_template.py" % request.application, "w")
+ canary = open("applications/%s/models/0000_update_check.py" % request.application, "w")
portalocker.lock(canary, portalocker.LOCK_EX)
- statement = "CANARY_UPDATE_CHECK_ID = %s" % CURRENT_UPDATE_CHECK_ID
+ statement = "CANARY_UPDATE_CHECK_ID = %s" % CURRENT_UPDATE_CHECK_ID
canary.write(statement)
canary.close()
# -----------------------------------------------------------------------------
+import os
from gluon import current
from gluon.storage import Storage
from gluon.contrib.simplejson.ordered_dict import OrderedDict
@@ -88,7 +85,15 @@
# Import S3Config
import s3cfg
-deployment_settings = s3cfg.S3Config()
-current.deployment_settings = deployment_settings
+settings = s3cfg.S3Config()
+current.deployment_settings = deployment_settings = settings
+
+def template_path():
+ " Return the path of the Template config.py to load "
+ path = os.path.join(request.folder,
+ "private", "templates",
+ settings.get_template(),
+ "config.py")
+ return path
# END =========================================================================
View
1 models/00_db.py
@@ -19,7 +19,6 @@
track_changes(True)
import datetime
-import os
import re
import time
View
3 models/zzz_1st_roles.py
@@ -28,8 +28,7 @@
create_role = auth.s3_create_role
update_acls = auth.s3_update_acls
- default_uacl = deployment_settings.get_aaa_default_uacl()
- default_oacl = deployment_settings.get_aaa_default_oacl()
+ default_oacl = acl.READ|acl.UPDATE
# Do not remove or change order of these 5 definitions (System Roles):
create_role("Administrator",
View
37 models/zzz_1st_run.py
@@ -197,7 +197,6 @@
path = os.path.join(request.folder,
"private",
"templates",
- "demo",
pop_setting)
if os.path.exists(path):
bi.perform_tasks(path)
@@ -253,26 +252,23 @@
(duration)
elif pop_setting >= 20:
- # Populate data for a deployment default demo
- """
- Read the demo_folders file and extract the folder for the specific demo
- """
+ # Populate data for a template
+ # Read the folders.cfg file and extract the folder for the specific template
file = os.path.join(request.folder,
"private",
"templates",
- "demo",
- "demo_folders.cfg")
+ "folders.cfg")
source = open(file, "r")
values = source.readlines()
source.close()
- demo = ""
- for demos in values:
+ template = ""
+ for templates in values:
# strip out the new line
- demos = demos.strip()
- if demos == "":
+ templates = templates.strip()
+ if templates == "":
continue
# split at the comma
- details = demos.split(",")
+ details = templates.split(",")
if len(details) == 2:
# remove any spaces and enclosing double quote
index = details[0].strip('" ')
@@ -281,29 +277,28 @@
path = os.path.join(request.folder,
"private",
"templates",
- "demo",
directory)
- demo = directory
+ template = directory
if os.path.exists(path):
bi.perform_tasks(path)
else:
- print >> sys.stderr, "Unable to install demo %s no demo directory found" \
+ print >> sys.stderr, "Unable to install template %s no template directory found" \
% index
- if demo == "":
- print >> sys.stderr, "Unable to install a demo with of an id '%s', please check 000_config and demo_folders.cfg" \
+ if template == "":
+ print >> sys.stderr, "Unable to install a template with of an id '%s', please check 000_config and folders.cfg" \
% pop_setting
else:
end = datetime.datetime.now()
duration = end - start
try:
# Python-2.7
duration = '{:.2f}'.format(duration.total_seconds()/60)
- print >> sys.stdout, "Installed demo '%s' completed in %s mins" % \
- (demo, duration)
+ print >> sys.stdout, "Installed template '%s' completed in %s mins" % \
+ (template, duration)
except AttributeError:
# older Python
- print >> sys.stdout, "Installed demo '%s' completed in %s" % \
- (demo, duration)
+ print >> sys.stdout, "Installed template '%s' completed in %s" % \
+ (template, duration)
grandTotalEnd = datetime.datetime.now()
duration = grandTotalEnd - grandTotalStart
try:
View
1 modules/eden/hrm.py
@@ -41,6 +41,7 @@
"hrm_service_record",
"hrm_rheader",
"hrm_training_event_controller",
+ "hrm_training_controller",
]
import datetime
View
8 modules/eden/menus.py
@@ -841,8 +841,8 @@ def hrm(self):
M("Training Events", f="training_event",
check=manager_mode)(
M("New Training Event", m="create"),
- M("List All Training Events"),
- M("Search Training Events", m="search"),
+ M("List All"),
+ M("Search", m="search"),
M("Search Training Participants", f="training",
m="search"),
M("Training Report", f="training", m="report",
@@ -926,8 +926,8 @@ def vol(self):
M("Training Events", f="training_event",
check=manager_mode)(
M("New Training Event", m="create"),
- M("List All Training Events"),
- M("Search Training Events", m="search"),
+ M("List All"),
+ M("Search", m="search"),
M("Search Training Participants", f="training",
m="search"),
M("Training Report", f="training", m="report",
View
3 modules/eden/org.py
@@ -2074,6 +2074,7 @@ def prep(r):
rheader = s3db.inv_warehouse_rheader
else:
rheader = s3db.org_rheader
- return s3_rest_controller("org", "office", rheader=rheader)
+ output = s3_rest_controller("org", "office", rheader=rheader)
+ return output
# END =========================================================================
View
213 modules/s3/s3gis.py
@@ -2390,7 +2390,7 @@ def greatCircleDistance(lat1, lon1, lat2, lon2, quick=True):
# -------------------------------------------------------------------------
def import_admin_areas(self,
- source="gadm",
+ source="gadmv1",
countries=[],
levels=["L0", "L1", "L2"]
):
@@ -2405,32 +2405,49 @@ def import_admin_areas(self,
defaults to all 3 supported levels
"""
- if source != "gadm":
- s3_debug("Only GADM is currently supported")
- return
+ if source == "gadmv1":
+ try:
+ from osgeo import ogr
+ except:
+ s3_debug("Unable to import ogr. Please install python-gdal bindings: GDAL-1.8.1+")
+ return
- try:
- from osgeo import ogr
- except:
- s3_debug("Unable to import ogr. Please install python-gdal bindings: GDAL-1.8.1+")
- return
+ if "L0" in levels:
+ self.import_gadm1_L0(ogr, countries=countries)
+ if "L1" in levels:
+ self.import_gadm1(ogr, "L1", countries=countries)
+ if "L2" in levels:
+ self.import_gadm1(ogr, "L2", countries=countries)
- if "L0" in levels:
- self.import_gadm_L0(ogr, countries=countries)
- if "L1" in levels:
- self.import_gadm(ogr, "L1", countries=countries)
- if "L2" in levels:
- self.import_gadm(ogr, "L2", countries=countries)
+ s3_debug("All done!")
- s3_debug("All done!")
+ elif source == "gadmv1":
+ try:
+ from osgeo import ogr
+ except:
+ s3_debug("Unable to import ogr. Please install python-gdal bindings: GDAL-1.8.1+")
+ return
+
+ if "L0" in levels:
+ self.import_gadm2(ogr, "L0", countries=countries)
+ if "L1" in levels:
+ self.import_gadm2(ogr, "L1", countries=countries)
+ if "L2" in levels:
+ self.import_gadm2(ogr, "L2", countries=countries)
+
+ s3_debug("All done!")
+
+ else:
+ s3_debug("Only GADM is currently supported")
+ return
return
# -------------------------------------------------------------------------
@staticmethod
- def import_gadm_L0(ogr, countries=[]):
+ def import_gadm1_L0(ogr, countries=[]):
"""
- Import L0 Admin Boundaries into the Locations table from GADM
+ Import L0 Admin Boundaries into the Locations table from GADMv1
- designed to be called from import_admin_areas()
- assumes that basic prepop has been done, so that no new records need to be created
@@ -2564,9 +2581,9 @@ def import_gadm_L0(ogr, countries=[]):
return
# -------------------------------------------------------------------------
- def import_gadm(self, ogr, level="L1", countries=[]):
+ def import_gadm1(self, ogr, level="L1", countries=[]):
"""
- Import L1 Admin Boundaries into the Locations table from GADM
+ Import L1 Admin Boundaries into the Locations table from GADMv1
- designed to be called from import_admin_areas()
- assumes a fresh database with just Countries imported
@@ -2928,6 +2945,162 @@ def latin_dict_reader(data, dialect=csv.excel, **kwargs):
return
# -------------------------------------------------------------------------
+ @staticmethod
+ def import_gadm2(ogr, level="L0", countries=[]):
+ """
+ Import Admin Boundaries into the Locations table from GADMv2
+ - designed to be called from import_admin_areas()
+ - assumes that basic prepop has been done, so that no new L0 records need to be created
+