[Mpuls-commits] r4801 - in base/trunk: . mpulsweb/controllers mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Mar 18 11:06:19 CET 2011
Author: ludwig
Date: 2011-03-18 11:06:16 +0100 (Fri, 18 Mar 2011)
New Revision: 4801
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/controllers/case.py
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
Log:
L10n of untranslated parts (case.py part 2)
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2011-03-18 09:34:40 UTC (rev 4800)
+++ base/trunk/ChangeLog 2011-03-18 10:06:16 UTC (rev 4801)
@@ -1,4 +1,11 @@
2011-03-18 Ludwig Reiter <ludwig.reiter at intevation.de>
+
+ * mpulsweb/i18n/mpulsweb.pot
+ mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
+ mpulsweb/controllers/case.py:
+ L10n of untranslated parts (case.py part 2)
+
+2011-03-18 Ludwig Reiter <ludwig.reiter at intevation.de>
* mpulsweb/controllers/case.py:
Fix of broken umlauts thru last commit.
Modified: base/trunk/mpulsweb/controllers/case.py
===================================================================
--- base/trunk/mpulsweb/controllers/case.py 2011-03-18 09:34:40 UTC (rev 4800)
+++ base/trunk/mpulsweb/controllers/case.py 2011-03-18 10:06:16 UTC (rev 4801)
@@ -64,6 +64,10 @@
The case will not be editable afterwards, and submited to the administration
for deletion.""")
+DELETE_SUCCESS = _("""Case document deleted!""")
+DELETE_SUCCESS_TEXT = _("""The case document is given to the administrator for deletion.""")
+CLICK_OK_CONTINUE = _("""Click on OK to continue.""")
+
# Use ungettext here because in the po file this translation is ready for
# ungettext. As the case controller only handles single cases provide constant
# 1
@@ -120,9 +124,8 @@
if confirmed == 1:
case = self._loadCase(id)
case.setState(3)
- c.dialog_title = u'Fallakte gelöscht!'
- c.dialog_text = (u"Die Fallakte wurde zum Löschen an die"
- u" Administration weitergeleitet.")
+ c.dialog_title = DELETE_SUCCESS
+ c.dialog_text = DELETE_SUCCESS_TEXT
c.url_ok = h.url_for(controller="/case_overview")
session['render_mode'] = 'ro'
session.save()
@@ -143,8 +146,8 @@
if confirmed == 1:
case = self._loadCase(id)
case.delete()
- c.dialog_title = u'Fallakte gelöscht!'
- c.dialog_text = u'Bitte klicken Sie "OK", um fortzufahren.'
+ c.dialog_title = DELETE_SUCCESS
+ c.dialog_text = CLICK_OK_CONTINUE
c.url_ok = h.url_for(controller="/case_overview")
return render('/casemanagement/dialogs/success_delete.mako')
else:
@@ -514,10 +517,8 @@
form_defaults['date'] = entry.getDate()
form_defaults['time'] = entry.getTime()
form_defaults['kind'] = entry.getKindAsInt()
- form_defaults['short_notice'] = u"Aufbewahrung verlängert"
- form_defaults['notice'] = (u"Bitte geben Sie hier den Grund für"
- u" die Verlängerung der Aufbewahrungsfrist"
- u" ein.")
+ form_defaults['short_notice'] = _('Case storage extended')
+ form_defaults['notice'] = _('Please enter the reason for the case storage extension.')
id = self._checkInt(id)
case = self.init_case(id)
c.entry = entry
@@ -537,7 +538,7 @@
case.getState().setState(2)
case.getState().setState(state)
c.dialog_title = _('Case storage extended')
- c.dialog_text = _('Please click on "OK" to continue')
+ c.dialog_text = _('The max case storage has been extended. Please click on OK to continue')
c.url_ok = h.url_for(controller="/")
return render('/casemanagement/dialogs/success_keepactive.mako')
except:
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-03-18 09:34:40 UTC (rev 4800)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-03-18 10:06:16 UTC (rev 4801)
@@ -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-03-17 14:22+0100\n"
+"PO-Revision-Date: 2011-03-18 10:55+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"
@@ -372,14 +372,30 @@
"steht Ihnen danach nicht mehr zur Bearbeitung zur Verfügung und wird der "
"Administration zum Löschen vorgelegt."
-#: mpulsweb/controllers/case.py:70 mpulsweb/controllers/case_bundle.py:434
+#: mpulsweb/controllers/case.py:67
+#: mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako:6
+#: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:6
+#: mpulsweb/templates/casemanagement/dialogs/success_delete.mako:6
+#: mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako:6
+msgid "Case document deleted!"
+msgstr "Fallakte gelöscht!"
+
+#: mpulsweb/controllers/case.py:68
+msgid "The case document is given to the administrator for deletion."
+msgstr "Die Fallakte wurde zum Löschen an die Administration weitergeleitet."
+
+#: mpulsweb/controllers/case.py:69
+msgid "Click on OK to continue."
+msgstr "Bitte klicken Sie \"OK\", um fortzufahren."
+
+#: mpulsweb/controllers/case.py:74 mpulsweb/controllers/case_bundle.py:434
#: mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako:6
msgid "Restore case?"
msgid_plural "Restore cases?"
msgstr[0] "Fallakte wiederherstellen?"
msgstr[1] "Fallakten wiederherstellen?"
-#: mpulsweb/controllers/case.py:71
+#: mpulsweb/controllers/case.py:75
msgid ""
"Do you really want to restore the case? The case\n"
"will be editable afterwards again for the users."
@@ -387,11 +403,11 @@
"Wollen Sie wirklich die Fallakte wiederherstellen? Die Fallakte ist "
"danach wieder für die Nutzer bearbeitbar."
-#: mpulsweb/controllers/case.py:74
+#: mpulsweb/controllers/case.py:78
msgid "Case(s) imported!"
msgstr "Fallakte(n) importiert!"
-#: mpulsweb/controllers/case.py:75
+#: mpulsweb/controllers/case.py:79
msgid ""
"The file was imported successfully.\n"
"Click on \"OK\" to open the case overview."
@@ -399,11 +415,11 @@
"Die Datei wurde erfolgreich importiert. Klicken Sie auf \"OK\", um die "
"Fallaktenübersicht zu öffnen."
-#: mpulsweb/controllers/case.py:78
+#: mpulsweb/controllers/case.py:82
msgid "Case(s) not imported!"
msgstr "Fallakte(n) nicht importiert!"
-#: mpulsweb/controllers/case.py:79
+#: mpulsweb/controllers/case.py:83
msgid ""
"An error occurred during the import.\n"
"Click 'OK' to return to the import dialog."
@@ -411,14 +427,14 @@
"Bei dem Import ist ein Fehler aufgetreten. Klicken Sie auf \"OK\", um zu "
"dem Importdialog zurückzukehren."
-#: mpulsweb/controllers/case.py:216 mpulsweb/model/case.py:1357
+#: mpulsweb/controllers/case.py:219 mpulsweb/model/case.py:1357
#: mpulsweb/model/phase.py:299
#: mpulsweb/templates/casemanagement/caselist.mako:151
#: mpulsweb/templates/phase/phase.mako:51
msgid "Running"
msgstr "laufend"
-#: mpulsweb/controllers/case.py:218 mpulsweb/model/case.py:1359
+#: mpulsweb/controllers/case.py:221 mpulsweb/model/case.py:1359
#: mpulsweb/model/phase.py:301
#: mpulsweb/templates/casemanagement/caselist.mako:154
#: mpulsweb/templates/phase/phase.mako:53
@@ -426,11 +442,11 @@
msgid "Finished"
msgstr "beendet"
-#: mpulsweb/controllers/case.py:393
+#: mpulsweb/controllers/case.py:396
msgid "Case copied!"
msgstr "Fallakte kopiert"
-#: mpulsweb/controllers/case.py:394
+#: mpulsweb/controllers/case.py:397
msgid ""
"The case was succussfully copied and is now available in the case "
"overview. Click on \"OK\" to open the case overview."
@@ -439,11 +455,11 @@
"Fallaktenübersicht zur Verfügung. Klicken Sie auf \"OK\", um die "
"Fallaktenübersicht zu öffnen."
-#: mpulsweb/controllers/case.py:400
+#: mpulsweb/controllers/case.py:403
msgid "Copy case?"
msgstr "Fallakte kopieren?"
-#: mpulsweb/controllers/case.py:401
+#: mpulsweb/controllers/case.py:404
msgid ""
"Do you really want to copy this case? All data will be copied in the new "
"case."
@@ -451,16 +467,22 @@
"Wollen Sie wirklich die Fallakten kopieren? Sämtliche Daten der Fallakte "
"werden dann in einer neuen Fallakte übernommen."
-#: mpulsweb/controllers/case.py:539
+#: mpulsweb/controllers/case.py:520 mpulsweb/controllers/case.py:540
msgid "Case storage extended"
msgstr "Aufbewahrung verlängert"
-#: mpulsweb/controllers/case.py:540
-msgid "Please click on \"OK\" to continue"
+#: mpulsweb/controllers/case.py:521
+msgid "Please enter the reason for the case storage extension."
msgstr ""
-"Die maximale Aufbewahrungsdauer wurde erfolgreich verlängert. Bitte "
-"klicken Sie auf \"OK\", um fortzufahren."
+"Bitte geben Sie hier den Grund für die Verlängerung der "
+"Aufbewahrungsfrist ein."
+#: mpulsweb/controllers/case.py:541
+msgid "The max case storage has been extended. Please click on OK to continue"
+msgstr ""
+"Die maximale Aufbewahrungsfirst wurde verlängert. Bitte klicken Sie auf "
+"\"OK\", um fortzufahren."
+
#: mpulsweb/controllers/case_bundle.py:30
#: mpulsweb/controllers/evaluation_overview.py:21
msgid "No action specified for the selection"
@@ -2171,13 +2193,6 @@
msgid "Do action for more cases"
msgstr "Aktion für mehrere Fallakten durchführen"
-#: mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako:6
-#: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:6
-#: mpulsweb/templates/casemanagement/dialogs/success_delete.mako:6
-#: mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako:6
-msgid "Case document deleted!"
-msgstr "Fallakte gelöscht!"
-
#: mpulsweb/templates/casebundle/dialogs/success_markevaluate.mako:6
msgid "Mark cases for evaluation"
msgstr "Fallakten für die Auswertung markieren"
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-03-18 09:34:40 UTC (rev 4800)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-03-18 10:06:16 UTC (rev 4801)
@@ -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-03-17 14:22+0100\n"
+"POT-Creation-Date: 2011-03-18 10:54+0100\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"
@@ -302,77 +302,97 @@
"for deletion."
msgstr ""
-#: mpulsweb/controllers/case.py:70 mpulsweb/controllers/case_bundle.py:434
+#: mpulsweb/controllers/case.py:67
+#: mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako:6
+#: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:6
+#: mpulsweb/templates/casemanagement/dialogs/success_delete.mako:6
+#: mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako:6
+msgid "Case document deleted!"
+msgstr ""
+
+#: mpulsweb/controllers/case.py:68
+msgid "The case document is given to the administrator for deletion."
+msgstr ""
+
+#: mpulsweb/controllers/case.py:69
+msgid "Click on OK to continue."
+msgstr ""
+
+#: mpulsweb/controllers/case.py:74 mpulsweb/controllers/case_bundle.py:434
#: mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako:6
msgid "Restore case?"
msgid_plural "Restore cases?"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case.py:71
+#: mpulsweb/controllers/case.py:75
msgid ""
"Do you really want to restore the case? The case\n"
"will be editable afterwards again for the users."
msgstr ""
-#: mpulsweb/controllers/case.py:74
+#: mpulsweb/controllers/case.py:78
msgid "Case(s) imported!"
msgstr ""
-#: mpulsweb/controllers/case.py:75
+#: mpulsweb/controllers/case.py:79
msgid ""
"The file was imported successfully.\n"
"Click on \"OK\" to open the case overview."
msgstr ""
-#: mpulsweb/controllers/case.py:78
+#: mpulsweb/controllers/case.py:82
msgid "Case(s) not imported!"
msgstr ""
-#: mpulsweb/controllers/case.py:79
+#: mpulsweb/controllers/case.py:83
msgid ""
"An error occurred during the import.\n"
"Click 'OK' to return to the import dialog."
msgstr ""
-#: mpulsweb/controllers/case.py:216 mpulsweb/model/case.py:1357
+#: mpulsweb/controllers/case.py:219 mpulsweb/model/case.py:1357
#: mpulsweb/model/phase.py:299 mpulsweb/templates/casemanagement/caselist.mako:151
#: mpulsweb/templates/phase/phase.mako:51
msgid "Running"
msgstr ""
-#: mpulsweb/controllers/case.py:218 mpulsweb/model/case.py:1359
+#: mpulsweb/controllers/case.py:221 mpulsweb/model/case.py:1359
#: mpulsweb/model/phase.py:301 mpulsweb/templates/casemanagement/caselist.mako:154
#: mpulsweb/templates/phase/phase.mako:53 mpulsweb/templates/phase/phase.mako:55
msgid "Finished"
msgstr ""
-#: mpulsweb/controllers/case.py:393
+#: mpulsweb/controllers/case.py:396
msgid "Case copied!"
msgstr ""
-#: mpulsweb/controllers/case.py:394
+#: mpulsweb/controllers/case.py:397
msgid ""
"The case was succussfully copied and is now available in the case overview. "
"Click on \"OK\" to open the case overview."
msgstr ""
-#: mpulsweb/controllers/case.py:400
+#: mpulsweb/controllers/case.py:403
msgid "Copy case?"
msgstr ""
-#: mpulsweb/controllers/case.py:401
+#: mpulsweb/controllers/case.py:404
msgid "Do you really want to copy this case? All data will be copied in the new case."
msgstr ""
-#: mpulsweb/controllers/case.py:539
+#: mpulsweb/controllers/case.py:520 mpulsweb/controllers/case.py:540
msgid "Case storage extended"
msgstr ""
-#: mpulsweb/controllers/case.py:540
-msgid "Please click on \"OK\" to continue"
+#: mpulsweb/controllers/case.py:521
+msgid "Please enter the reason for the case storage extension."
msgstr ""
+#: mpulsweb/controllers/case.py:541
+msgid "The max case storage has been extended. Please click on OK to continue"
+msgstr ""
+
#: mpulsweb/controllers/case_bundle.py:30
#: mpulsweb/controllers/evaluation_overview.py:21
msgid "No action specified for the selection"
@@ -1956,13 +1976,6 @@
msgid "Do action for more cases"
msgstr ""
-#: mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako:6
-#: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:6
-#: mpulsweb/templates/casemanagement/dialogs/success_delete.mako:6
-#: mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako:6
-msgid "Case document deleted!"
-msgstr ""
-
#: mpulsweb/templates/casebundle/dialogs/success_markevaluate.mako:6
msgid "Mark cases for evaluation"
msgstr ""
More information about the Mpuls-commits
mailing list