[Mpuls-commits] r5228 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/templates/administration
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Aug 10 15:37:12 CEST 2011
Author: ludwig
Date: 2011-08-10 15:37:09 +0200 (Wed, 10 Aug 2011)
New Revision: 5228
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/templates/administration/edit_user.mako
base/trunk/mpulsweb/templates/administration/new_user.mako
Log:
Issue2275: Set label of the branchoffice uniformly to institution
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2011-08-10 13:02:33 UTC (rev 5227)
+++ base/trunk/ChangeLog 2011-08-10 13:37:09 UTC (rev 5228)
@@ -1,3 +1,12 @@
+2011-08-10 Ludwig Reiter <ludwig.reiter at intevation.de>
+
+ * mpulsweb/i18n/mpulsweb.pot,
+ mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po,
+ mpulsweb/templates/administration/edit_user.mako,
+ mpulsweb/templates/administration/new_user.mako:
+ Issue2275: Set label of the branchoffice uniformly to "Institution".
+ So show and edit and new no longer differ in this label.
+
2011-08-10 Roland Geider <roland.geider at intevation.de>
* mpulsweb/public/styles/screen.css: issue2309: added top-padding to
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-08-10 13:02:33 UTC (rev 5227)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-08-10 13:37:09 UTC (rev 5228)
@@ -8,7 +8,7 @@
"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: 2011-07-20 09:12+0200\n"
+"PO-Revision-Date: 2011-08-10 15:08+0200\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"
@@ -343,15 +343,15 @@
"möglich:</p><p><i>%s</i></p><p>Bitte klicken Sie auf \"OK\", um zur "
"Fallaktenübersicht fortzufahren.</p>"
-#: mpulsweb/controllers/case.py:175 mpulsweb/model/case.py:1365
-#: mpulsweb/model/phase.py:304
+#: mpulsweb/controllers/case.py:175 mpulsweb/model/case.py:1371
+#: mpulsweb/model/phase.py:302
#: mpulsweb/templates/casemanagement/caselist.mako:152
#: mpulsweb/templates/phase/phase.mako:51
msgid "Running"
msgstr "laufend"
-#: mpulsweb/controllers/case.py:177 mpulsweb/model/case.py:1367
-#: mpulsweb/model/phase.py:306
+#: mpulsweb/controllers/case.py:177 mpulsweb/model/case.py:1373
+#: mpulsweb/model/phase.py:304
#: mpulsweb/templates/casemanagement/caselist.mako:155
#: mpulsweb/templates/phase/phase.mako:53
#: mpulsweb/templates/phase/phase.mako:55
@@ -797,7 +797,7 @@
"Wollen Sie wirklich das Dokument löschen und die Daten unwiederbringlich "
"verlieren?"
-#: mpulsweb/controllers/evaluate.py:280
+#: mpulsweb/controllers/evaluate.py:282
msgid "Error: Evaluation failed"
msgstr "Fehler: Auswertung fehlgeschlagen"
@@ -1161,7 +1161,7 @@
msgid "Inactive case document? Please check, if the case will still be edited."
msgstr "Inaktive Fallakte? Bitte prüfen Sie, ob der Fall noch bearbeitet wird."
-#: mpulsweb/model/case.py:752
+#: mpulsweb/model/case.py:758
#, python-format
msgid ""
"<p>An anonymisation of the case is not possible in phase %s.</p><p>Please"
@@ -1170,7 +1170,7 @@
"<p>Eine Anonymisierung ist für Fälle in der Phase \"%s\" nicht "
"vorgesehen.</p><p>Bitte löschen Sie diesen Fall.</p>"
-#: mpulsweb/model/case.py:777
+#: mpulsweb/model/case.py:783
#, python-format
msgid ""
"<p>An anonymisation of this case is not possible: It is only possible to "
@@ -1182,42 +1182,42 @@
"Phase \"%s\" ist derzeit noch nicht beendet. Bitte beenden Sie die Phase "
"und versuchen Sie erneut eine Anonymisierung.</p>"
-#: mpulsweb/model/case.py:1053
+#: mpulsweb/model/case.py:1059
msgid "Error on fetching data for formletter"
msgstr "Fehler beim Laden der Daten für Serienbrieffunktion"
-#: mpulsweb/model/case.py:1317 mpulsweb/model/case.py:1318
+#: mpulsweb/model/case.py:1323 mpulsweb/model/case.py:1324
#: mpulsweb/templates/casemanagement/caselist.mako:181
#: mpulsweb/templates/casemanagement/caselist.mako:182
#: mpulsweb/templates/search/search.mako:75
msgid "Editable"
msgstr "Bearbeitbar"
-#: mpulsweb/model/case.py:1319
+#: mpulsweb/model/case.py:1325
msgid "Outstanding deleted"
msgstr "Schwebend gelöscht"
-#: mpulsweb/model/case.py:1320
+#: mpulsweb/model/case.py:1326
msgid "Outstanding made anonymous"
msgstr "Schwebend anonymisiert"
-#: mpulsweb/model/case.py:1321
+#: mpulsweb/model/case.py:1327
msgid "Make anonymous"
msgstr "Anonymisiert"
-#: mpulsweb/model/case.py:1469
+#: mpulsweb/model/case.py:1475
#, python-format
msgid "The case with UUID '%s' could not be imported due to rule violations"
msgstr ""
"Der Fall mit der UUID '%s' konnte wegen Regelverletzungen nicht "
"importiert werden."
-#: mpulsweb/model/case.py:1499
+#: mpulsweb/model/case.py:1505
#, python-format
msgid "The case with UUID '%s' was anonymized already."
msgstr "Der Fall mit der UUID '%s' wurde bereits anonymisiert."
-#: mpulsweb/model/case.py:1502
+#: mpulsweb/model/case.py:1508
#, python-format
msgid ""
"The case with UUID '%s' is either marked for anonymization or marked for "
@@ -1226,7 +1226,7 @@
"Der Fall mit der UUID '%s' ist entweder schwebend anonymisiert oder "
"schwebend gelöscht."
-#: mpulsweb/model/case.py:1534
+#: mpulsweb/model/case.py:1540
#, python-format
msgid "The XML file has the version '%s', but supported is only version '%s'"
msgstr ""
@@ -1258,11 +1258,11 @@
"Die Phase '%s' ist nicht in einem konsistenten Zustand und hat nicht "
"ausgefüllte Pflichtfelder: %s"
-#: mpulsweb/model/phase.py:470
+#: mpulsweb/model/phase.py:468
msgid "Field is OK and requires no further editing"
msgstr "Dieses Feld ist OK und benötigt keine weitere Bearbeitung"
-#: mpulsweb/model/phase.py:473
+#: mpulsweb/model/phase.py:471
msgid "Field is not OK and requires further editing"
msgstr "Dieses Feld ist fehlerhaft und benötigt einer weiteren Bearbeitung"
@@ -1640,8 +1640,10 @@
#: mpulsweb/templates/administration/edit_user.mako:82
#: mpulsweb/templates/administration/new_user.mako:79
-msgid "Branchoffice"
-msgstr "Filiale"
+#: mpulsweb/templates/administration/new_user_result.mako:42
+#: mpulsweb/templates/administration/show_user_body.mako:21
+msgid "Institution"
+msgstr "Einrichtung"
#: mpulsweb/templates/administration/edit_user.mako:91
#: mpulsweb/templates/administration/new_user.mako:85
@@ -1743,11 +1745,6 @@
msgid "Name"
msgstr "Name"
-#: mpulsweb/templates/administration/new_user_result.mako:42
-#: mpulsweb/templates/administration/show_user_body.mako:21
-msgid "Institution"
-msgstr "Einrichtung"
-
#: mpulsweb/templates/administration/new_user_result.mako:53
msgid "Password"
msgstr "Passwort"
@@ -3351,11 +3348,12 @@
"Form dem jungen Menschen ausgehändigt werden sollte. Weitere "
"Informationen dazu finden Sie in der "
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:22
+#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:23
+#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:25
msgid "Continue editing"
msgstr "Mit der Bearbeitung fortfahren"
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:24
+#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:28
msgid "Back to phase overview"
msgstr "Phasenübersicht aufrufen"
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-08-10 13:02:33 UTC (rev 5227)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-08-10 13:37:09 UTC (rev 5228)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: mpulsweb 2.0.0-pre\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2011-07-19 11:06+0200\n"
+"POT-Creation-Date: 2011-08-10 15:07+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"
@@ -289,14 +289,14 @@
"</p>"
msgstr ""
-#: mpulsweb/controllers/case.py:175 mpulsweb/model/case.py:1365
-#: mpulsweb/model/phase.py:304 mpulsweb/templates/casemanagement/caselist.mako:152
+#: mpulsweb/controllers/case.py:175 mpulsweb/model/case.py:1371
+#: mpulsweb/model/phase.py:302 mpulsweb/templates/casemanagement/caselist.mako:152
#: mpulsweb/templates/phase/phase.mako:51
msgid "Running"
msgstr ""
-#: mpulsweb/controllers/case.py:177 mpulsweb/model/case.py:1367
-#: mpulsweb/model/phase.py:306 mpulsweb/templates/casemanagement/caselist.mako:155
+#: mpulsweb/controllers/case.py:177 mpulsweb/model/case.py:1373
+#: mpulsweb/model/phase.py:304 mpulsweb/templates/casemanagement/caselist.mako:155
#: mpulsweb/templates/phase/phase.mako:53 mpulsweb/templates/phase/phase.mako:55
msgid "Finished"
msgstr ""
@@ -657,7 +657,7 @@
msgid "Do you want to delete the document and irrevocably lose the data?"
msgstr ""
-#: mpulsweb/controllers/evaluate.py:280
+#: mpulsweb/controllers/evaluate.py:282
msgid "Error: Evaluation failed"
msgstr ""
@@ -963,14 +963,14 @@
msgid "Inactive case document? Please check, if the case will still be edited."
msgstr ""
-#: mpulsweb/model/case.py:752
+#: mpulsweb/model/case.py:758
#, python-format
msgid ""
"<p>An anonymisation of the case is not possible in phase %s.</p><p>Please "
"remove this case.</p>"
msgstr ""
-#: mpulsweb/model/case.py:777
+#: mpulsweb/model/case.py:783
#, python-format
msgid ""
"<p>An anonymisation of this case is not possible: It is only possible to end "
@@ -978,47 +978,47 @@
"finish the phase and try to anonymise again.</p>"
msgstr ""
-#: mpulsweb/model/case.py:1053
+#: mpulsweb/model/case.py:1059
msgid "Error on fetching data for formletter"
msgstr ""
-#: mpulsweb/model/case.py:1317 mpulsweb/model/case.py:1318
+#: mpulsweb/model/case.py:1323 mpulsweb/model/case.py:1324
#: mpulsweb/templates/casemanagement/caselist.mako:181
#: mpulsweb/templates/casemanagement/caselist.mako:182
#: mpulsweb/templates/search/search.mako:75
msgid "Editable"
msgstr ""
-#: mpulsweb/model/case.py:1319
+#: mpulsweb/model/case.py:1325
msgid "Outstanding deleted"
msgstr ""
-#: mpulsweb/model/case.py:1320
+#: mpulsweb/model/case.py:1326
msgid "Outstanding made anonymous"
msgstr ""
-#: mpulsweb/model/case.py:1321
+#: mpulsweb/model/case.py:1327
msgid "Make anonymous"
msgstr ""
-#: mpulsweb/model/case.py:1469
+#: mpulsweb/model/case.py:1475
#, python-format
msgid "The case with UUID '%s' could not be imported due to rule violations"
msgstr ""
-#: mpulsweb/model/case.py:1499
+#: mpulsweb/model/case.py:1505
#, python-format
msgid "The case with UUID '%s' was anonymized already."
msgstr ""
-#: mpulsweb/model/case.py:1502
+#: mpulsweb/model/case.py:1508
#, python-format
msgid ""
"The case with UUID '%s' is either marked for anonymization or marked for "
"deletion."
msgstr ""
-#: mpulsweb/model/case.py:1534
+#: mpulsweb/model/case.py:1540
#, python-format
msgid "The XML file has the version '%s', but supported is only version '%s'"
msgstr ""
@@ -1046,11 +1046,11 @@
"and has missing required fields: %s"
msgstr ""
-#: mpulsweb/model/phase.py:470
+#: mpulsweb/model/phase.py:468
msgid "Field is OK and requires no further editing"
msgstr ""
-#: mpulsweb/model/phase.py:473
+#: mpulsweb/model/phase.py:471
msgid "Field is not OK and requires further editing"
msgstr ""
@@ -1415,7 +1415,9 @@
#: mpulsweb/templates/administration/edit_user.mako:82
#: mpulsweb/templates/administration/new_user.mako:79
-msgid "Branchoffice"
+#: mpulsweb/templates/administration/new_user_result.mako:42
+#: mpulsweb/templates/administration/show_user_body.mako:21
+msgid "Institution"
msgstr ""
#: mpulsweb/templates/administration/edit_user.mako:91
@@ -1518,11 +1520,6 @@
msgid "Name"
msgstr ""
-#: mpulsweb/templates/administration/new_user_result.mako:42
-#: mpulsweb/templates/administration/show_user_body.mako:21
-msgid "Institution"
-msgstr ""
-
#: mpulsweb/templates/administration/new_user_result.mako:53
msgid "Password"
msgstr ""
@@ -3072,11 +3069,12 @@
" to the young person. Further information you will find in"
msgstr ""
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:22
+#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:23
+#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:25
msgid "Continue editing"
msgstr ""
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:24
+#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:28
msgid "Back to phase overview"
msgstr ""
Modified: base/trunk/mpulsweb/templates/administration/edit_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/edit_user.mako 2011-08-10 13:02:33 UTC (rev 5227)
+++ base/trunk/mpulsweb/templates/administration/edit_user.mako 2011-08-10 13:37:09 UTC (rev 5228)
@@ -79,7 +79,7 @@
</tr>
<tr>
<td>
- <label for="branchoffice">${_('Branchoffice')}</label><br>
+ <label for="branchoffice">${_('Institution')}</label><br>
<input type="text" class="field" id="branchoffice" name="branchoffice" value="${c.form_result.get('branchoffice', c.uo.branchoffice)}" maxlength="64">
</td>
<td></td>
Modified: base/trunk/mpulsweb/templates/administration/new_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user.mako 2011-08-10 13:02:33 UTC (rev 5227)
+++ base/trunk/mpulsweb/templates/administration/new_user.mako 2011-08-10 13:37:09 UTC (rev 5228)
@@ -76,7 +76,7 @@
<input type="text" class="field" id="room" name="room" maxlength="16">
</div>
<div class="w100">
- <label for="branchoffice">${_('Branchoffice')}</label>
+ <label for="branchoffice">${_('Institution')}</label>
<br>
<input type="text" class="field" id="branchoffice" name="branchoffice"
maxlength="64">
More information about the Mpuls-commits
mailing list