[Mpuls-commits] r4828 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/model
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Mar 29 15:26:19 CEST 2011
Author: ludwig
Date: 2011-03-29 15:26:17 +0200 (Tue, 29 Mar 2011)
New Revision: 4828
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/model/case.py
Log:
L10n of some labels of case.py
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2011-03-29 12:18:09 UTC (rev 4827)
+++ base/trunk/ChangeLog 2011-03-29 13:26:17 UTC (rev 4828)
@@ -2,6 +2,13 @@
* mpulsweb/i18n/mpulsweb.pot
mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
+ mpulsweb/model/case.py:
+ L10n of some labels of case.py
+
+2011-03-29 Ludwig Reiter <ludwig.reiter at intevation.de>
+
+ * mpulsweb/i18n/mpulsweb.pot
+ mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
mpulsweb/templates/main.mako:
L10n of some labels of the main.mako dialog
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-03-29 12:18:09 UTC (rev 4827)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-03-29 13:26:17 UTC (rev 4828)
@@ -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-29 14:16+0200\n"
+"PO-Revision-Date: 2011-03-29 15:21+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"
@@ -427,14 +427,14 @@
"Bei dem Import ist ein Fehler aufgetreten. Klicken Sie auf \"OK\", um zu "
"dem Importdialog zurückzukehren."
-#: mpulsweb/controllers/case.py:219 mpulsweb/model/case.py:1357
+#: mpulsweb/controllers/case.py:219 mpulsweb/model/case.py:1351
#: 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:221 mpulsweb/model/case.py:1359
+#: mpulsweb/controllers/case.py:221 mpulsweb/model/case.py:1353
#: mpulsweb/model/phase.py:301
#: mpulsweb/templates/casemanagement/caselist.mako:154
#: mpulsweb/templates/phase/phase.mako:53
@@ -1132,42 +1132,66 @@
msgid "< 1 week"
msgstr "< 1 Woche"
-#: mpulsweb/model/case.py:1053
+#: mpulsweb/model/case.py:112
+#, python-format
+msgid ""
+"<p>An anonymisation of the case is not possible in phase %s.</p><p>Please"
+" remove this case.</p>"
+msgstr ""
+"<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:115
+#, python-format
+msgid ""
+"<p>An anonymisation of this case is not possible: It is only possible to "
+"end \n"
+"cases, which current phase is finished. The phase %s is not finished. "
+"Please finish the phase and try to \n"
+"anonymise again.</p><p>Click on OK to continue.</p>"
+msgstr ""
+"<p>Eine Anonymisierung ist für diese Fallakte derzeit nicht möglich: Es "
+"können nur Fälle beendet werden, deren aktuelle Phase beendet wurde. Die "
+"Phase \"%s\" is derzeit noch nicht beendet. Bitte beenden Sie die Phase "
+"und versuchen Sie erneut eine Anonymisierung.</p><p>Klicken Sie auf "
+"\"OK\", um fortzufahren.</p>"
+
+#: mpulsweb/model/case.py:1047
msgid "Error on fetching data for formletter"
msgstr "Fehler beim Laden der Daten für Serienbrieffunktion"
-#: mpulsweb/model/case.py:1309 mpulsweb/model/case.py:1310
+#: mpulsweb/model/case.py:1303 mpulsweb/model/case.py:1304
#: mpulsweb/templates/casemanagement/caselist.mako:180
#: mpulsweb/templates/casemanagement/caselist.mako:181
#: mpulsweb/templates/search/search.mako:65
msgid "Editable"
msgstr "Bearbeitbar"
-#: mpulsweb/model/case.py:1311
+#: mpulsweb/model/case.py:1305
msgid "Outstanding deleted"
msgstr "Schwebend gelöscht"
-#: mpulsweb/model/case.py:1312
+#: mpulsweb/model/case.py:1306
msgid "Outstanding made anonymous"
msgstr "Schwebend anonymisiert"
-#: mpulsweb/model/case.py:1313
+#: mpulsweb/model/case.py:1307
msgid "Make anonymous"
msgstr "Anonymisiert"
-#: mpulsweb/model/case.py:1461
+#: mpulsweb/model/case.py:1455
#, 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:1491
+#: mpulsweb/model/case.py:1485
#, 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:1494
+#: mpulsweb/model/case.py:1488
#, python-format
msgid ""
"The case with UUID '%s' is either marked for anonymization or marked for "
@@ -1176,7 +1200,7 @@
"Der Fall mit der UUID '%s' ist entweder schwebend anonymisiert oder "
"schwebend gelöscht."
-#: mpulsweb/model/case.py:1526
+#: mpulsweb/model/case.py:1520
#, python-format
msgid "The XML file has the version '%s', but supported is only version '%s'"
msgstr ""
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-03-29 12:18:09 UTC (rev 4827)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-03-29 13:26:17 UTC (rev 4828)
@@ -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-29 14:16+0200\n"
+"POT-Creation-Date: 2011-03-29 15:20+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"
@@ -351,13 +351,13 @@
"Click 'OK' to return to the import dialog."
msgstr ""
-#: mpulsweb/controllers/case.py:219 mpulsweb/model/case.py:1357
+#: mpulsweb/controllers/case.py:219 mpulsweb/model/case.py:1351
#: mpulsweb/model/phase.py:299 mpulsweb/templates/casemanagement/caselist.mako:151
#: mpulsweb/templates/phase/phase.mako:51
msgid "Running"
msgstr ""
-#: mpulsweb/controllers/case.py:221 mpulsweb/model/case.py:1359
+#: mpulsweb/controllers/case.py:221 mpulsweb/model/case.py:1353
#: 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"
@@ -942,47 +942,64 @@
msgid "< 1 week"
msgstr ""
-#: mpulsweb/model/case.py:1053
+#: mpulsweb/model/case.py:112
+#, 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:115
+#, python-format
+msgid ""
+"<p>An anonymisation of this case is not possible: It is only possible to end"
+" \n"
+"cases, which current phase is finished. The phase %s is not finished. Please "
+"finish the phase and try to \n"
+"anonymise again.</p><p>Click on OK to continue.</p>"
+msgstr ""
+
+#: mpulsweb/model/case.py:1047
msgid "Error on fetching data for formletter"
msgstr ""
-#: mpulsweb/model/case.py:1309 mpulsweb/model/case.py:1310
+#: mpulsweb/model/case.py:1303 mpulsweb/model/case.py:1304
#: mpulsweb/templates/casemanagement/caselist.mako:180
#: mpulsweb/templates/casemanagement/caselist.mako:181
#: mpulsweb/templates/search/search.mako:65
msgid "Editable"
msgstr ""
-#: mpulsweb/model/case.py:1311
+#: mpulsweb/model/case.py:1305
msgid "Outstanding deleted"
msgstr ""
-#: mpulsweb/model/case.py:1312
+#: mpulsweb/model/case.py:1306
msgid "Outstanding made anonymous"
msgstr ""
-#: mpulsweb/model/case.py:1313
+#: mpulsweb/model/case.py:1307
msgid "Make anonymous"
msgstr ""
-#: mpulsweb/model/case.py:1461
+#: mpulsweb/model/case.py:1455
#, python-format
msgid "The case with UUID '%s' could not be imported due to rule violations"
msgstr ""
-#: mpulsweb/model/case.py:1491
+#: mpulsweb/model/case.py:1485
#, python-format
msgid "The case with UUID '%s' was anonymized already."
msgstr ""
-#: mpulsweb/model/case.py:1494
+#: mpulsweb/model/case.py:1488
#, python-format
msgid ""
"The case with UUID '%s' is either marked for anonymization or marked for "
"deletion."
msgstr ""
-#: mpulsweb/model/case.py:1526
+#: mpulsweb/model/case.py:1520
#, python-format
msgid "The XML file has the version '%s', but supported is only version '%s'"
msgstr ""
Modified: base/trunk/mpulsweb/model/case.py
===================================================================
--- base/trunk/mpulsweb/model/case.py 2011-03-29 12:18:09 UTC (rev 4827)
+++ base/trunk/mpulsweb/model/case.py 2011-03-29 13:26:17 UTC (rev 4828)
@@ -109,19 +109,13 @@
SELECT id FROM master_tbl_view WHERE id = %%(id)s AND (%s)"""
#DIALOGS
-MARKANONYMIZE_FAILED_MIN_PHASE = u"""\
-<p>Eine Anonymisierung ist für Fälle in der Phase "%s" nicht
-vorgesehen.</p>
-<p>Bitte löschen Sie diesen Fall.</p>
-"""
+MARKANONYMIZE_FAILED_MIN_PHASE = _(u"""\
+<p>An anonymisation of the case is not possible in phase %s.</p><p>Please remove this case.</p>""")
-MARKANONYMIZE_FAILED_RUNNING_PHASE = u"""\
-<p>Eine Anonymisierung ist für diese Fallakte derzeit nicht möglich:
-Es können nur Fälle beendet werden, deren aktuelle Phase beendet wurde.
-Die Phase "%s" is derzeit noch nicht beendet. Bitte beenden Sie die Phase
-und versuchen Sie erneut eine Anonymisierung.</p>
-<p>Klicken Sie auf "OK", um fortzufahren.</p>
-"""
+MARKANONYMIZE_FAILED_RUNNING_PHASE = _(u"""\
+<p>An anonymisation of this case is not possible: It is only possible to end
+cases, which current phase is finished. The phase %s is not finished. Please finish the phase and try to
+anonymise again.</p><p>Click on OK to continue.</p>""")
def save_getone(params, k, v):
try:
More information about the Mpuls-commits
mailing list