[Mpuls-commits] r2630 - in wasko/branches/2.0: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/model mpulsweb/templates/settings

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Wed May 5 08:50:23 CEST 2010


Author: torsten
Date: 2010-05-05 08:50:21 +0200 (Wed, 05 May 2010)
New Revision: 2630

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
   wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot
   wasko/branches/2.0/mpulsweb/model/agencysettings.py
   wasko/branches/2.0/mpulsweb/model/statement.py
   wasko/branches/2.0/mpulsweb/templates/settings/edit.mako
   wasko/branches/2.0/mpulsweb/templates/settings/show.mako
Log:
Show, Edit and save adress of agency. Further substitute adress in statement.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-05-04 15:45:08 UTC (rev 2629)
+++ wasko/branches/2.0/ChangeLog	2010-05-05 06:50:21 UTC (rev 2630)
@@ -1,3 +1,14 @@
+2010-05-05  Torsten Irländer <torsten.irlaender at intevation.de>
+
+	* mpulsweb/model/agencysettings.py,
+	  mpulsweb/templates/settings/show.mako,
+	  mpulsweb/templates/settings/edit.mako: Edit and show adress of ka in
+	  agency settings.
+	* mpulsweb/model/statement.py: Substitute adress of ka in statement
+	* mpulsweb/i18n/mpulsweb.pot,
+	  mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po: New translation for
+	  fieldlabel for adress of ka.
+
 2010-05-04  Frank Koormann <frank.koormann at intevation.de>
 
 	* jmdweb/templates/privacy/default/privacy_statement.html: JMD-specific 

Modified: wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2010-05-04 15:45:08 UTC (rev 2629)
+++ wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2010-05-05 06:50:21 UTC (rev 2630)
@@ -8,8 +8,8 @@
 "Project-Id-Version: mpulsweb 0.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
 "POT-Creation-Date: 2009-10-08 09:54+0200\n"
-"PO-Revision-Date: 2010-05-04 17:44+0100\n"
-"Last-Translator: Roland Geider <roland.geider at intevation.de>\n"
+"PO-Revision-Date: 2010-05-04 17:51+0100\n"
+"Last-Translator: Torsten Irländer <torsten.irlaender at intevation.de>\n"
 "Language-Team: de <LL at li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
@@ -220,16 +220,13 @@
 msgstr[0] "Es wurde %s Akte gelöscht."
 msgstr[1] "Es wurden %s Akten gelöscht."
 
-#: mpulsweb/controllers/case_bundle.py:348
-#, python-format
-#| msgid "%s case was sucessfully cleared for deletion."
-#| msgid_plural "%s cases were sucessfully cleared for deletion."
+#: mpulsweb/controllers/case_bundle.py:346
 msgid "Case successfully cleared for anonymisation!"
 msgid_plural "Cases successfully cleared for anonymisation!"
 msgstr[0] "Fallakte wurde zur Anonymisierung freigegeben!"
 msgstr[1] "Fallakten wurden zur Anonymisierung freigegeben!"
 
-#: mpulsweb/controllers/case_bundle.py:353
+#: mpulsweb/controllers/case_bundle.py:349
 #, python-format
 msgid ""
 "%s case was cleared for anonymisation. It will be presented to the administrators\n"
@@ -240,13 +237,13 @@
 msgstr[0] "Es wurde %s Fallakte zur Anonymisierung freigegeben. Sie liegt der Administration zur endgültigen Anonymisierung vor."
 msgstr[1] "Es wurden %s Fallakten zur Anonymisierung freigegeben. Sie liegen der Administration zur endgültigen Anonymisierung vor."
 
-#: mpulsweb/controllers/case_bundle.py:365
+#: mpulsweb/controllers/case_bundle.py:362
 msgid "Clear case for anonymisation?"
 msgid_plural "Clear cases for anonymisation?"
 msgstr[0] "Fallakte zur Anonymisierung freigeben?"
 msgstr[1] "Fallakten zur Anonymisierung freigeben?"
 
-#: mpulsweb/controllers/case_bundle.py:374
+#: mpulsweb/controllers/case_bundle.py:371
 #, python-format
 msgid ""
 "Do you\n"
@@ -260,26 +257,26 @@
 msgstr[0] "Wollen Sie wirklich die folgende Fallakte zum Anonymisieren freigeben? Die Fallakte steht Ihnen danach nicht mehr zur Bearbeitung zur Verfügung und wird der Administration zur Anonymisierung vorgelegt.%s"
 msgstr[1] "Wollen Sie wirklich die folgenden Fallakten zum Anonymisieren freigeben? Die Fallakten stehen Ihnen danach nicht mehr zur Bearbeitung zur Verfügung und werden der Administration zur Anonymisierung vorgelegt.%s"
 
-#: mpulsweb/controllers/case_bundle.py:390
+#: mpulsweb/controllers/case_bundle.py:387
 msgid "Case anonymised!"
 msgid_plural "Cases anonymised!"
 msgstr[0] "Fallakte anonymisiert!"
 msgstr[1] "Fallakten anonymisiert!"
 
-#: mpulsweb/controllers/case_bundle.py:394
+#: mpulsweb/controllers/case_bundle.py:391
 #, python-format
 msgid "%s case was sucessfully anonymised."
 msgid_plural "%s cases were sucessfully anonymised."
 msgstr[0] "Es wurde %s Akte anonymisiert."
 msgstr[1] "Es wurden %s Akten anonymisiert."
 
-#: mpulsweb/controllers/case_bundle.py:406
+#: mpulsweb/controllers/case_bundle.py:403
 msgid "Anonymise case?"
 msgid_plural "Anonymise cases?"
 msgstr[0] "Fallakte anonymisieren?"
 msgstr[1] "Fallakten anonymisieren?"
 
-#: mpulsweb/controllers/case_bundle.py:413
+#: mpulsweb/controllers/case_bundle.py:410
 #, python-format
 msgid ""
 "Do you really want to anonymise the case\n"
@@ -292,47 +289,47 @@
 msgstr[0] "Wollen Sie wirklich die Fallakte anonymisierenund die personenbezogenen Daten unwiederbringlich verlieren? Die Fallakte steht danach nicht mehr zur Bearbeitung zur Verfügung. Die anonymisierte Fallakte wird weiterhin in der Auswertung berücksichtigt werden.%s"
 msgstr[1] "Wollen Sie wirklich die Fallakten anonymisierenund die personenbezogenen Daten unwiederbringlich verlieren? Die Fallakten stehen danach nicht mehr zur Bearbeitung zur Verfügung. Die anonymisierten Fallakten werden weiterhin in der Auswertung berücksichtigt werden.%s"
 
-#: mpulsweb/controllers/case_bundle.py:430
+#: mpulsweb/controllers/case_bundle.py:427
 msgid "Case restored!"
 msgid_plural "Cases restored!"
 msgstr[0] "Fallakte wiederhergestellt!"
 msgstr[1] "Fallakten wiederhergestellt!"
 
-#: mpulsweb/controllers/case_bundle.py:433
+#: mpulsweb/controllers/case_bundle.py:430
 #, python-format
 msgid "%s was successfully restored."
 msgid_plural "%s were successfully restored."
 msgstr[0] "Es wurde %s Fallakte erfolgreich wiederhergestellt."
 msgstr[1] "Es wurden %s Fallakten erfolgreich wiederhergestellt."
 
-#: mpulsweb/controllers/case_bundle.py:444
+#: mpulsweb/controllers/case_bundle.py:441
 msgid "Restore case?"
 msgid_plural "Restore cases?"
 msgstr[0] "Fallakte wiederherstellen?"
 msgstr[1] "Fallakten wiederherstellen?"
 
-#: mpulsweb/controllers/case_bundle.py:447
+#: mpulsweb/controllers/case_bundle.py:444
 #, python-format
 msgid "Do you really want to restore the following case? It will be available  again to editing.%s"
 msgid_plural "Do you really want to restore the following cases? They will be available  again to editing.%s"
 msgstr[0] "Wollen Sie wirklich die folgende Fallakten wiederherstellen? Die Fallakte steht danach wieder zur Bearbeitung zur Verfügung. %s"
 msgstr[1] "Wollen Sie wirklich die folgenden Fallakten wiederherstellen? Die Fallakten stehen danach wieder zur Bearbeitung zur Verfügung. %s"
 
-#: mpulsweb/controllers/case_bundle.py:467
+#: mpulsweb/controllers/case_bundle.py:464
 #, python-format
 msgid "%s case was successfully transferred to %s %s"
 msgid_plural "%s cases were successfully transferred to %s %s"
 msgstr[0] "Es wurde %s Fallakte erfolgreich an %s %s übertragen."
 msgstr[1] "Es wurden %s Fallakten erfolgreich an %s %s übertragen."
 
-#: mpulsweb/controllers/case_bundle.py:489
+#: mpulsweb/controllers/case_bundle.py:486
 #, python-format
 msgid "%s case was sucessfully assigend to a substitute."
 msgid_plural "%s cases were sucessfully assigend to a substitute."
 msgstr[0] "Es wurde für %s Fallakte erfolgreich die Vertretung zugewiesen."
 msgstr[1] "Es wurden für %s Fallakten erfolgreich die Vertretung zugewiesen."
 
-#: mpulsweb/controllers/case_bundle.py:510
+#: mpulsweb/controllers/case_bundle.py:507
 msgid "Export case?"
 msgid_plural "Export cases?"
 msgstr[0] "Fallakte exportieren?"
@@ -459,42 +456,42 @@
 msgid "Delete"
 msgstr "Löschen"
 
-#: mpulsweb/lib/renderer.py:984
+#: mpulsweb/lib/renderer.py:990
 #: mpulsweb/templates/evaluation/evaluate.mako:24
 #: mpulsweb/templates/evaluation/evaluate_adele.mako:24
 msgid "Description"
 msgstr "Beschreibung"
 
-#: mpulsweb/lib/renderer.py:985
+#: mpulsweb/lib/renderer.py:991
 #: mpulsweb/templates/phase/phase.mako:27
 msgid "Actions"
 msgstr "Aktionen"
 
-#: mpulsweb/lib/renderer.py:1017
+#: mpulsweb/lib/renderer.py:1023
 msgid "view"
 msgstr "Ansehen"
 
-#: mpulsweb/lib/renderer.py:1023
+#: mpulsweb/lib/renderer.py:1029
 msgid "delete"
 msgstr "löschen"
 
-#: mpulsweb/lib/renderer.py:1030
+#: mpulsweb/lib/renderer.py:1036
 msgid "Items found"
 msgstr "Einträge gefunden"
 
-#: mpulsweb/lib/renderer.py:1037
+#: mpulsweb/lib/renderer.py:1043
 msgid "Create new item"
 msgstr "Erstelle neuen Eintrag"
 
-#: mpulsweb/lib/renderer.py:1054
+#: mpulsweb/lib/renderer.py:1060
 msgid "Formular errors"
 msgstr "Fehlerhafte Formulareingabe"
 
-#: mpulsweb/lib/renderer.py:1058
+#: mpulsweb/lib/renderer.py:1064
 msgid "Formular warnings"
 msgstr "Formular Warnungen"
 
-#: mpulsweb/lib/renderer.py:1090
+#: mpulsweb/lib/renderer.py:1096
 msgid "Restore last valid value"
 msgstr "Stelle letzten gültigen Wert wieder her"
 
@@ -513,8 +510,8 @@
 
 #: mpulsweb/model/case.py:1107
 #: mpulsweb/model/case.py:1108
-#: mpulsweb/templates/casemanagement/caselist.mako:168
-#: mpulsweb/templates/casemanagement/caselist.mako:169
+#: mpulsweb/templates/casemanagement/caselist.mako:160
+#: mpulsweb/templates/casemanagement/caselist.mako:161
 msgid "case_state_label_open"
 msgstr "Bearbeitbar"
 
@@ -973,8 +970,8 @@
 #: mpulsweb/templates/appointments/appointmentlist.mako:3
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:6
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:7
-#: mpulsweb/templates/casemanagement/caselist.mako:197
-#: mpulsweb/templates/casemanagement/caselist.mako:198
+#: mpulsweb/templates/casemanagement/caselist.mako:189
+#: mpulsweb/templates/casemanagement/caselist.mako:190
 #: mpulsweb/templates/casemanagement/reminderlist.mako:4
 #: mpulsweb/templates/documents/case_overview.mako:57
 #: mpulsweb/templates/documents/global_overview.mako:43
@@ -994,8 +991,8 @@
 #: mpulsweb/templates/appointments/appointmentlist.mako:5
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:13
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:14
-#: mpulsweb/templates/casemanagement/caselist.mako:236
-#: mpulsweb/templates/casemanagement/caselist.mako:237
+#: mpulsweb/templates/casemanagement/caselist.mako:228
+#: mpulsweb/templates/casemanagement/caselist.mako:229
 #: mpulsweb/templates/casemanagement/reminderlist.mako:7
 #: mpulsweb/templates/documents/case_overview.mako:61
 #: mpulsweb/templates/documents/case_overview.mako:62
@@ -1017,7 +1014,7 @@
 msgstr "Benutzergruppenname"
 
 #: mpulsweb/templates/administration/overview_usergroups.mako:49
-#: mpulsweb/templates/casemanagement/caselist.mako:255
+#: mpulsweb/templates/casemanagement/caselist.mako:247
 msgid "cm_overview_tbl_no_data_found"
 msgstr "Es wurden keine Datensätze gefunden."
 
@@ -1427,10 +1424,12 @@
 msgstr ", um sich erneut anzumelden."
 
 #: mpulsweb/templates/auth/main.mako:13
+#: mpulsweb/templates/error/main.mako:13
 msgid "main_login_bmf_phrase"
 msgstr "Das Programm %s wird vom Bundesministerium für Familie, Senioren, Frauen und Jugend aus Mitteln des Europäischen Sozialfonds gefördert."
 
 #: mpulsweb/templates/auth/main.mako:35
+#: mpulsweb/templates/error/main.mako:35
 msgid "main_login_formular_input_error"
 msgstr "Fehlerhafte Formulareingabe"
 
@@ -1566,93 +1565,93 @@
 msgid "cm_np_select"
 msgstr "Ausgewählte Fallakte"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:41
+#: mpulsweb/templates/casemanagement/caselist.mako:33
 msgid "cm_overview_tbl_header_editor"
 msgstr "Bearbeiter"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:46
+#: mpulsweb/templates/casemanagement/caselist.mako:38
 msgid "cm_overview_tbl_header_accesstime"
 msgstr "Aktualisiert"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:62
-#: mpulsweb/templates/casemanagement/caselist.mako:63
+#: mpulsweb/templates/casemanagement/caselist.mako:54
+#: mpulsweb/templates/casemanagement/caselist.mako:55
 #, python-format
 msgid "Sorted by %s in ascending order"
 msgstr "Sortiert nach %s in aufsteigender Reihenfolge"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:66
-#: mpulsweb/templates/casemanagement/caselist.mako:67
+#: mpulsweb/templates/casemanagement/caselist.mako:58
+#: mpulsweb/templates/casemanagement/caselist.mako:59
 msgid "Sort in ascending order"
 msgstr "In aufsteigender Reihenfolge sortieren"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:76
-#: mpulsweb/templates/casemanagement/caselist.mako:77
+#: mpulsweb/templates/casemanagement/caselist.mako:68
+#: mpulsweb/templates/casemanagement/caselist.mako:69
 #, python-format
 msgid "Sorted by %s in descending order"
 msgstr "Sortiert nach %s in absteigender Reihenfolge"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:80
-#: mpulsweb/templates/casemanagement/caselist.mako:81
+#: mpulsweb/templates/casemanagement/caselist.mako:72
+#: mpulsweb/templates/casemanagement/caselist.mako:73
 msgid "Sort in descending order"
 msgstr "In absteigender Reihenfolge sortieren"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:89
+#: mpulsweb/templates/casemanagement/caselist.mako:81
 #: mpulsweb/templates/casemanagement/search.mako:60
 #: mpulsweb/templates/phase/phase.mako:97
 msgid "Phase"
 msgstr "Phase"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:92
+#: mpulsweb/templates/casemanagement/caselist.mako:84
 msgid "cm_overview_tbl_header_status"
 msgstr "Status"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:95
+#: mpulsweb/templates/casemanagement/caselist.mako:87
 msgid "cm_overview_tbl_header_actions"
 msgstr "Aktionen"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:140
+#: mpulsweb/templates/casemanagement/caselist.mako:132
 msgid "Legend"
 msgstr "Legende"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:154
-#: mpulsweb/templates/casemanagement/caselist.mako:155
+#: mpulsweb/templates/casemanagement/caselist.mako:146
+#: mpulsweb/templates/casemanagement/caselist.mako:147
 msgid "cm_overview_img_editor"
 msgstr "Bearbeiter"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:160
-#: mpulsweb/templates/casemanagement/caselist.mako:161
+#: mpulsweb/templates/casemanagement/caselist.mako:152
+#: mpulsweb/templates/casemanagement/caselist.mako:153
 msgid "cm_overview_img_standin"
 msgstr "Vertreter"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:174
-#: mpulsweb/templates/casemanagement/caselist.mako:175
+#: mpulsweb/templates/casemanagement/caselist.mako:166
+#: mpulsweb/templates/casemanagement/caselist.mako:167
 msgid "case_state_label_markdelete"
 msgstr "Schwebend gelöscht"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:180
-#: mpulsweb/templates/casemanagement/caselist.mako:181
+#: mpulsweb/templates/casemanagement/caselist.mako:172
+#: mpulsweb/templates/casemanagement/caselist.mako:173
 msgid "case_state_label_markanonym"
 msgstr "Schwebend anonymisiert"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:186
-#: mpulsweb/templates/casemanagement/caselist.mako:187
+#: mpulsweb/templates/casemanagement/caselist.mako:178
+#: mpulsweb/templates/casemanagement/caselist.mako:179
 msgid "case_state_label_anonym"
 msgstr "Anonymisiert"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:206
-#: mpulsweb/templates/casemanagement/caselist.mako:207
+#: mpulsweb/templates/casemanagement/caselist.mako:198
+#: mpulsweb/templates/casemanagement/caselist.mako:199
 msgid "Delete case"
 msgstr "Fallakte löschen"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:214
-#: mpulsweb/templates/casemanagement/caselist.mako:215
-#: mpulsweb/templates/casemanagement/caselist.mako:230
-#: mpulsweb/templates/casemanagement/caselist.mako:231
+#: mpulsweb/templates/casemanagement/caselist.mako:206
+#: mpulsweb/templates/casemanagement/caselist.mako:207
+#: mpulsweb/templates/casemanagement/caselist.mako:222
+#: mpulsweb/templates/casemanagement/caselist.mako:223
 msgid "cm_overview_a_anonymize"
 msgstr "Fallakte anonymisieren"
 
-#: mpulsweb/templates/casemanagement/caselist.mako:222
-#: mpulsweb/templates/casemanagement/caselist.mako:223
+#: mpulsweb/templates/casemanagement/caselist.mako:214
+#: mpulsweb/templates/casemanagement/caselist.mako:215
 msgid "cm_overview_a_restore"
 msgstr "Fallakte wiederherstellen"
 
@@ -1912,10 +1911,12 @@
 msgstr "Wiederherstellen erfolgreich!"
 
 #: mpulsweb/templates/dialogs/confirm.mako:6
+#: mpulsweb/templates/dialogs/confirm_main.mako:7
 msgid "dialog_header_confirm_option_yes"
 msgstr "Ja"
 
 #: mpulsweb/templates/dialogs/confirm.mako:7
+#: mpulsweb/templates/dialogs/confirm_main.mako:8
 msgid "dialog_header_confirm_option_no"
 msgstr "Nein"
 
@@ -2224,14 +2225,14 @@
 msgstr "Name der Einrichtung"
 
 #: mpulsweb/templates/settings/edit.mako:5
-#: mpulsweb/templates/settings/edit.mako:60
-#: mpulsweb/templates/settings/show.mako:41
+#: mpulsweb/templates/settings/edit.mako:72
+#: mpulsweb/templates/settings/show.mako:48
 msgid "adm_form_settings_fkz"
 msgstr "Antragsnummer der Einrichtung"
 
 #: mpulsweb/templates/settings/edit.mako:6
-#: mpulsweb/templates/settings/edit.mako:76
-#: mpulsweb/templates/settings/show.mako:45
+#: mpulsweb/templates/settings/edit.mako:88
+#: mpulsweb/templates/settings/show.mako:52
 msgid "adm_form_settings_max_savetime"
 msgstr "Automatische Wiedervorlage nach Tagen"
 
@@ -2258,12 +2259,18 @@
 msgid "adm_con_es_editsettings"
 msgstr "Hier können Sie die einrichtungsweiten Einstellungen bearbeiten."
 
-#: mpulsweb/templates/settings/edit.mako:107
-#: mpulsweb/templates/settings/show.mako:53
+#: mpulsweb/templates/settings/edit.mako:60
+#: mpulsweb/templates/settings/show.mako:42
+#| msgid "adm_form_settings_kaname"
+msgid "adm_form_settings_kaadress"
+msgstr "Adresse der Einrichtung"
+
+#: mpulsweb/templates/settings/edit.mako:119
+#: mpulsweb/templates/settings/show.mako:60
 msgid "adm_form_settings_anontransfer"
 msgstr "Fallakten übermitteln"
 
-#: mpulsweb/templates/settings/edit.mako:118
+#: mpulsweb/templates/settings/edit.mako:130
 msgid "adm_form_settings_save"
 msgstr "Einstellungen speichern"
 
@@ -2279,15 +2286,15 @@
 msgid "adm_con_ss_view_agency"
 msgstr "Hier können Sie die einrichtungsweiten Einstellungen sehen."
 
-#: mpulsweb/templates/settings/show.mako:49
+#: mpulsweb/templates/settings/show.mako:56
 msgid "additional conditions for reminders"
 msgstr "Weitere Bedingungen für automatische Wiedervorlagen"
 
-#: mpulsweb/templates/settings/show.mako:56
+#: mpulsweb/templates/settings/show.mako:63
 msgid "adm_form_settings_anontransfer_yes"
 msgstr "Ja"
 
-#: mpulsweb/templates/settings/show.mako:58
+#: mpulsweb/templates/settings/show.mako:65
 msgid "adm_form_settings_anontransfer_no"
 msgstr "Nein"
 

Modified: wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot	2010-05-04 15:45:08 UTC (rev 2629)
+++ wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot	2010-05-05 06:50:21 UTC (rev 2630)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: mpulsweb 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2010-05-04 16:20+0200\n"
+"POT-Creation-Date: 2010-05-04 17:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -221,13 +221,13 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:348
+#: mpulsweb/controllers/case_bundle.py:346
 msgid "Case successfully cleared for anonymisation!"
 msgid_plural "Cases successfully cleared for anonymisation!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:353
+#: mpulsweb/controllers/case_bundle.py:349
 #, python-format
 msgid ""
 "%s case was cleared for anonymisation. It will be presented to the "
@@ -240,13 +240,13 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:365
+#: mpulsweb/controllers/case_bundle.py:362
 msgid "Clear case for anonymisation?"
 msgid_plural "Clear cases for anonymisation?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:374
+#: mpulsweb/controllers/case_bundle.py:371
 #, python-format
 msgid ""
 "Do you\n"
@@ -264,26 +264,26 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:390
+#: mpulsweb/controllers/case_bundle.py:387
 msgid "Case anonymised!"
 msgid_plural "Cases anonymised!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:394
+#: mpulsweb/controllers/case_bundle.py:391
 #, python-format
 msgid "%s case was sucessfully anonymised."
 msgid_plural "%s cases were sucessfully anonymised."
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:406
+#: mpulsweb/controllers/case_bundle.py:403
 msgid "Anonymise case?"
 msgid_plural "Anonymise cases?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:413
+#: mpulsweb/controllers/case_bundle.py:410
 #, python-format
 msgid ""
 "Do you really want to anonymise the case\n"
@@ -298,26 +298,26 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:430
+#: mpulsweb/controllers/case_bundle.py:427
 msgid "Case restored!"
 msgid_plural "Cases restored!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:433
+#: mpulsweb/controllers/case_bundle.py:430
 #, python-format
 msgid "%s was successfully restored."
 msgid_plural "%s were successfully restored."
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:444
+#: mpulsweb/controllers/case_bundle.py:441
 msgid "Restore case?"
 msgid_plural "Restore cases?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:447
+#: mpulsweb/controllers/case_bundle.py:444
 #, python-format
 msgid ""
 "Do you really want to restore the following case? It will be available  again"
@@ -328,21 +328,21 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:467
+#: mpulsweb/controllers/case_bundle.py:464
 #, python-format
 msgid "%s case was successfully transferred to %s %s"
 msgid_plural "%s cases were successfully transferred to %s %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:489
+#: mpulsweb/controllers/case_bundle.py:486
 #, python-format
 msgid "%s case was sucessfully assigend to a substitute."
 msgid_plural "%s cases were sucessfully assigend to a substitute."
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case_bundle.py:510
+#: mpulsweb/controllers/case_bundle.py:507
 msgid "Export case?"
 msgid_plural "Export cases?"
 msgstr[0] ""
@@ -465,40 +465,40 @@
 msgid "Delete"
 msgstr ""
 
-#: mpulsweb/lib/renderer.py:984 mpulsweb/templates/evaluation/evaluate.mako:24
+#: mpulsweb/lib/renderer.py:990 mpulsweb/templates/evaluation/evaluate.mako:24
 #: mpulsweb/templates/evaluation/evaluate_adele.mako:24
 msgid "Description"
 msgstr ""
 
-#: mpulsweb/lib/renderer.py:985 mpulsweb/templates/phase/phase.mako:27
+#: mpulsweb/lib/renderer.py:991 mpulsweb/templates/phase/phase.mako:27
 msgid "Actions"
 msgstr ""
 
-#: mpulsweb/lib/renderer.py:1017
+#: mpulsweb/lib/renderer.py:1023
 msgid "view"
 msgstr ""
 
-#: mpulsweb/lib/renderer.py:1023
+#: mpulsweb/lib/renderer.py:1029
 msgid "delete"
 msgstr ""
 
-#: mpulsweb/lib/renderer.py:1030
+#: mpulsweb/lib/renderer.py:1036
 msgid "Items found"
 msgstr ""
 
-#: mpulsweb/lib/renderer.py:1037
+#: mpulsweb/lib/renderer.py:1043
 msgid "Create new item"
 msgstr ""
 
-#: mpulsweb/lib/renderer.py:1054
+#: mpulsweb/lib/renderer.py:1060
 msgid "Formular errors"
 msgstr ""
 
-#: mpulsweb/lib/renderer.py:1058
+#: mpulsweb/lib/renderer.py:1064
 msgid "Formular warnings"
 msgstr ""
 
-#: mpulsweb/lib/renderer.py:1090
+#: mpulsweb/lib/renderer.py:1096
 msgid "Restore last valid value"
 msgstr ""
 
@@ -515,8 +515,8 @@
 msgstr ""
 
 #: mpulsweb/model/case.py:1107 mpulsweb/model/case.py:1108
-#: mpulsweb/templates/casemanagement/caselist.mako:168
-#: mpulsweb/templates/casemanagement/caselist.mako:169
+#: mpulsweb/templates/casemanagement/caselist.mako:160
+#: mpulsweb/templates/casemanagement/caselist.mako:161
 msgid "case_state_label_open"
 msgstr ""
 
@@ -966,8 +966,8 @@
 #: mpulsweb/templates/appointments/appointmentlist.mako:3
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:6
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:7
-#: mpulsweb/templates/casemanagement/caselist.mako:197
-#: mpulsweb/templates/casemanagement/caselist.mako:198
+#: mpulsweb/templates/casemanagement/caselist.mako:189
+#: mpulsweb/templates/casemanagement/caselist.mako:190
 #: mpulsweb/templates/casemanagement/reminderlist.mako:4
 #: mpulsweb/templates/documents/case_overview.mako:57
 #: mpulsweb/templates/documents/global_overview.mako:43
@@ -987,8 +987,8 @@
 #: mpulsweb/templates/appointments/appointmentlist.mako:5
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:13
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:14
-#: mpulsweb/templates/casemanagement/caselist.mako:236
-#: mpulsweb/templates/casemanagement/caselist.mako:237
+#: mpulsweb/templates/casemanagement/caselist.mako:228
+#: mpulsweb/templates/casemanagement/caselist.mako:229
 #: mpulsweb/templates/casemanagement/reminderlist.mako:7
 #: mpulsweb/templates/documents/case_overview.mako:61
 #: mpulsweb/templates/documents/case_overview.mako:62
@@ -1010,7 +1010,7 @@
 msgstr ""
 
 #: mpulsweb/templates/administration/overview_usergroups.mako:49
-#: mpulsweb/templates/casemanagement/caselist.mako:255
+#: mpulsweb/templates/casemanagement/caselist.mako:247
 msgid "cm_overview_tbl_no_data_found"
 msgstr ""
 
@@ -1419,11 +1419,11 @@
 msgid "logout_p_login_again"
 msgstr ""
 
-#: mpulsweb/templates/auth/main.mako:13
+#: mpulsweb/templates/auth/main.mako:13 mpulsweb/templates/error/main.mako:13
 msgid "main_login_bmf_phrase"
 msgstr ""
 
-#: mpulsweb/templates/auth/main.mako:35
+#: mpulsweb/templates/auth/main.mako:35 mpulsweb/templates/error/main.mako:35
 msgid "main_login_formular_input_error"
 msgstr ""
 
@@ -1558,93 +1558,93 @@
 msgid "cm_np_select"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:41
+#: mpulsweb/templates/casemanagement/caselist.mako:33
 msgid "cm_overview_tbl_header_editor"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:46
+#: mpulsweb/templates/casemanagement/caselist.mako:38
 msgid "cm_overview_tbl_header_accesstime"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:62
-#: mpulsweb/templates/casemanagement/caselist.mako:63
+#: mpulsweb/templates/casemanagement/caselist.mako:54
+#: mpulsweb/templates/casemanagement/caselist.mako:55
 #, python-format
 msgid "Sorted by %s in ascending order"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:66
-#: mpulsweb/templates/casemanagement/caselist.mako:67
+#: mpulsweb/templates/casemanagement/caselist.mako:58
+#: mpulsweb/templates/casemanagement/caselist.mako:59
 msgid "Sort in ascending order"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:76
-#: mpulsweb/templates/casemanagement/caselist.mako:77
+#: mpulsweb/templates/casemanagement/caselist.mako:68
+#: mpulsweb/templates/casemanagement/caselist.mako:69
 #, python-format
 msgid "Sorted by %s in descending order"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:80
-#: mpulsweb/templates/casemanagement/caselist.mako:81
+#: mpulsweb/templates/casemanagement/caselist.mako:72
+#: mpulsweb/templates/casemanagement/caselist.mako:73
 msgid "Sort in descending order"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:89
+#: mpulsweb/templates/casemanagement/caselist.mako:81
 #: mpulsweb/templates/casemanagement/search.mako:60
 #: mpulsweb/templates/phase/phase.mako:97
 msgid "Phase"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:92
+#: mpulsweb/templates/casemanagement/caselist.mako:84
 msgid "cm_overview_tbl_header_status"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:95
+#: mpulsweb/templates/casemanagement/caselist.mako:87
 msgid "cm_overview_tbl_header_actions"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:140
+#: mpulsweb/templates/casemanagement/caselist.mako:132
 msgid "Legend"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:154
-#: mpulsweb/templates/casemanagement/caselist.mako:155
+#: mpulsweb/templates/casemanagement/caselist.mako:146
+#: mpulsweb/templates/casemanagement/caselist.mako:147
 msgid "cm_overview_img_editor"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:160
-#: mpulsweb/templates/casemanagement/caselist.mako:161
+#: mpulsweb/templates/casemanagement/caselist.mako:152
+#: mpulsweb/templates/casemanagement/caselist.mako:153
 msgid "cm_overview_img_standin"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:174
-#: mpulsweb/templates/casemanagement/caselist.mako:175
+#: mpulsweb/templates/casemanagement/caselist.mako:166
+#: mpulsweb/templates/casemanagement/caselist.mako:167
 msgid "case_state_label_markdelete"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:180
-#: mpulsweb/templates/casemanagement/caselist.mako:181
+#: mpulsweb/templates/casemanagement/caselist.mako:172
+#: mpulsweb/templates/casemanagement/caselist.mako:173
 msgid "case_state_label_markanonym"
 msgstr ""
 
-#: mpulsweb/templates/casemanagement/caselist.mako:186
-#: mpulsweb/templates/casemanagement/caselist.mako:187
+#: mpulsweb/templates/casemanagement/caselist.mako:178
+#: mpulsweb/templates/casemanagement/caselist.mako:179
 msgid "case_state_label_anonym"
 msgstr ""
 
+#: mpulsweb/templates/casemanagement/caselist.mako:198
+#: mpulsweb/templates/casemanagement/caselist.mako:199
+msgid "Delete case"
+msgstr ""
+
 #: mpulsweb/templates/casemanagement/caselist.mako:206
 #: mpulsweb/templates/casemanagement/caselist.mako:207
-msgid "Delete case"
+#: mpulsweb/templates/casemanagement/caselist.mako:222
+#: mpulsweb/templates/casemanagement/caselist.mako:223
+msgid "cm_overview_a_anonymize"
 msgstr ""
 
 #: mpulsweb/templates/casemanagement/caselist.mako:214
 #: mpulsweb/templates/casemanagement/caselist.mako:215
-#: mpulsweb/templates/casemanagement/caselist.mako:230
-#: mpulsweb/templates/casemanagement/caselist.mako:231
-msgid "cm_overview_a_anonymize"
-msgstr ""
-
-#: mpulsweb/templates/casemanagement/caselist.mako:222
-#: mpulsweb/templates/casemanagement/caselist.mako:223
 msgid "cm_overview_a_restore"
 msgstr ""
 
@@ -1903,10 +1903,12 @@
 msgstr ""
 
 #: mpulsweb/templates/dialogs/confirm.mako:6
+#: mpulsweb/templates/dialogs/confirm_main.mako:7
 msgid "dialog_header_confirm_option_yes"
 msgstr ""
 
 #: mpulsweb/templates/dialogs/confirm.mako:7
+#: mpulsweb/templates/dialogs/confirm_main.mako:8
 msgid "dialog_header_confirm_option_no"
 msgstr ""
 
@@ -2211,13 +2213,13 @@
 msgid "adm_form_settings_kaname"
 msgstr ""
 
-#: mpulsweb/templates/settings/edit.mako:5 mpulsweb/templates/settings/edit.mako:60
-#: mpulsweb/templates/settings/show.mako:41
+#: mpulsweb/templates/settings/edit.mako:5 mpulsweb/templates/settings/edit.mako:72
+#: mpulsweb/templates/settings/show.mako:48
 msgid "adm_form_settings_fkz"
 msgstr ""
 
-#: mpulsweb/templates/settings/edit.mako:6 mpulsweb/templates/settings/edit.mako:76
-#: mpulsweb/templates/settings/show.mako:45
+#: mpulsweb/templates/settings/edit.mako:6 mpulsweb/templates/settings/edit.mako:88
+#: mpulsweb/templates/settings/show.mako:52
 msgid "adm_form_settings_max_savetime"
 msgstr ""
 
@@ -2244,12 +2246,17 @@
 msgid "adm_con_es_editsettings"
 msgstr ""
 
-#: mpulsweb/templates/settings/edit.mako:107
-#: mpulsweb/templates/settings/show.mako:53
+#: mpulsweb/templates/settings/edit.mako:60
+#: mpulsweb/templates/settings/show.mako:42
+msgid "adm_form_settings_kaadress"
+msgstr ""
+
+#: mpulsweb/templates/settings/edit.mako:119
+#: mpulsweb/templates/settings/show.mako:60
 msgid "adm_form_settings_anontransfer"
 msgstr ""
 
-#: mpulsweb/templates/settings/edit.mako:118
+#: mpulsweb/templates/settings/edit.mako:130
 msgid "adm_form_settings_save"
 msgstr ""
 
@@ -2265,15 +2272,15 @@
 msgid "adm_con_ss_view_agency"
 msgstr ""
 
-#: mpulsweb/templates/settings/show.mako:49
+#: mpulsweb/templates/settings/show.mako:56
 msgid "additional conditions for reminders"
 msgstr ""
 
-#: mpulsweb/templates/settings/show.mako:56
+#: mpulsweb/templates/settings/show.mako:63
 msgid "adm_form_settings_anontransfer_yes"
 msgstr ""
 
-#: mpulsweb/templates/settings/show.mako:58
+#: mpulsweb/templates/settings/show.mako:65
 msgid "adm_form_settings_anontransfer_no"
 msgstr ""
 

Modified: wasko/branches/2.0/mpulsweb/model/agencysettings.py
===================================================================
--- wasko/branches/2.0/mpulsweb/model/agencysettings.py	2010-05-04 15:45:08 UTC (rev 2629)
+++ wasko/branches/2.0/mpulsweb/model/agencysettings.py	2010-05-05 06:50:21 UTC (rev 2630)
@@ -98,6 +98,9 @@
     def getName(self):
         return self.conf.get('ka_name', u'')
 
+    def getAdress(self):
+        return self.conf.get('ka_adresse', u'')
+
     def getMaxSavetime(self):
         return self.conf.get('max_speicherdauer', u'')
 

Modified: wasko/branches/2.0/mpulsweb/model/statement.py
===================================================================
--- wasko/branches/2.0/mpulsweb/model/statement.py	2010-05-04 15:45:08 UTC (rev 2629)
+++ wasko/branches/2.0/mpulsweb/model/statement.py	2010-05-05 06:50:21 UTC (rev 2630)
@@ -73,6 +73,7 @@
             'STRASSENR': escape(F.NA(self.case.streetnr)),
             'ORT': escape(F.NA(self.case.city)),
             'KA_NAME': escape(F.NA(self.agency.getName())),
+            'KA_ADRESSE': escape(F.NA(self.agency.getAdress())),
             'KA_SPEICHERDAUER': escape(F.NA(self.agency.getMaxSavetime()))
             }
         return Template(self.agency.getPrivacyStatement()).safe_substitute(s)

Modified: wasko/branches/2.0/mpulsweb/templates/settings/edit.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/settings/edit.mako	2010-05-04 15:45:08 UTC (rev 2629)
+++ wasko/branches/2.0/mpulsweb/templates/settings/edit.mako	2010-05-05 06:50:21 UTC (rev 2630)
@@ -57,6 +57,18 @@
           % endif
         </div>
         <div class="waska_form_element w30">
+          <label for="ka_adresse">${_('adm_form_settings_kaadress')}</label>
+          % if c.form_errors.get('ka_adresse'):
+            <input type="text" class="field error_box" id="ka_adresse"
+                   value="${c.form_result.get('ka_adresse', c.agency.getAdress())|h}"
+                   name="ka_adresse" maxlength="120">
+          % else:
+            <input type="text" class="field" id="ka_adresse" name="ka_adresse"
+                   value="${c.form_result.get('ka_adresse', c.agency.getAdress())|h}"
+                   maxlength="120">
+          % endif
+        </div>
+        <div class="waska_form_element w30">
           <label for="fkz">${_('adm_form_settings_fkz')}</label>
           % if c.form_errors.get('fkz'):
             <input type="text" class="error_box" id="fkz" name="fkz"

Modified: wasko/branches/2.0/mpulsweb/templates/settings/show.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/settings/show.mako	2010-05-04 15:45:08 UTC (rev 2629)
+++ wasko/branches/2.0/mpulsweb/templates/settings/show.mako	2010-05-05 06:50:21 UTC (rev 2630)
@@ -38,14 +38,21 @@
     </td>
   </tr>
   <tr>
-    <td class="label">${_('adm_form_settings_fkz')}</td>
-    <td class="table_row_v_2">${c.agency.getFKZ()| F.NA}</td>
+    <td class="label table_width_name">
+      ${_('adm_form_settings_kaadress')}
+    </td>
+    <td class="table_description">${c.agency.getAdress()| F.NA}
+    </td>
   </tr>
   <tr>
-    <td class="label table_header_v">${_('adm_form_settings_max_savetime')}</td>
-    <td class="table_row_v">${c.agency.getMaxSavetime()| F.NA}</td>
+    <td class="label table_header_v">${_('adm_form_settings_fkz')}</td>
+    <td class="table_row_v_2 table_header_v">${c.agency.getFKZ()| F.NA}</td>
   </tr>
   <tr>
+    <td class="label">${_('adm_form_settings_max_savetime')}</td>
+    <td class="">${c.agency.getMaxSavetime()| F.NA}</td>
+  </tr>
+  <tr>
     <td class="label table_header_v">${_('additional conditions for reminders')}</td>
     <td class="table_row_v">${g.mpuls_config.get('case', 'reminderconditiondesc')}</td>
   </tr>



More information about the Mpuls-commits mailing list