[Mpuls-commits] r4832 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/model
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Mar 30 13:30:33 CEST 2011
Author: ludwig
Date: 2011-03-30 13:30:32 +0200 (Wed, 30 Mar 2011)
New Revision: 4832
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:
Small bugfix: in case py the translation is done in the methods
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2011-03-30 08:57:55 UTC (rev 4831)
+++ base/trunk/ChangeLog 2011-03-30 11:30:32 UTC (rev 4832)
@@ -1,3 +1,11 @@
+2011-03-30 Ludwig Reiter <ludwig.reiter at intevation.de>
+
+ * mpulsweb/i18n/mpulsweb.pot
+ mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
+ mpulsweb/model/case.py:
+ The l10n of the case.py moved into the methods, so that the
+ translation is done with existing request. Small bugfix.
+
2011-03-29 Ludwig Reiter <ludwig.reiter at intevation.de>
* mpulsweb/i18n/mpulsweb.pot
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-03-30 08:57:55 UTC (rev 4831)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-03-30 11:30:32 UTC (rev 4832)
@@ -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 15:21+0200\n"
+"PO-Revision-Date: 2011-03-30 13:27+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:1351
+#: mpulsweb/controllers/case.py:219 mpulsweb/model/case.py:1348
#: 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:1353
+#: mpulsweb/controllers/case.py:221 mpulsweb/model/case.py:1350
#: mpulsweb/model/phase.py:301
#: mpulsweb/templates/casemanagement/caselist.mako:154
#: mpulsweb/templates/phase/phase.mako:53
@@ -1132,7 +1132,7 @@
msgid "< 1 week"
msgstr "< 1 Woche"
-#: mpulsweb/model/case.py:112
+#: mpulsweb/model/case.py:745
#, python-format
msgid ""
"<p>An anonymisation of the case is not possible in phase %s.</p><p>Please"
@@ -1141,14 +1141,13 @@
"<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
+#: mpulsweb/model/case.py:770
#, 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>"
+"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>"
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 "
@@ -1156,42 +1155,42 @@
"und versuchen Sie erneut eine Anonymisierung.</p><p>Klicken Sie auf "
"\"OK\", um fortzufahren.</p>"
-#: mpulsweb/model/case.py:1047
+#: mpulsweb/model/case.py:1044
msgid "Error on fetching data for formletter"
msgstr "Fehler beim Laden der Daten für Serienbrieffunktion"
-#: mpulsweb/model/case.py:1303 mpulsweb/model/case.py:1304
+#: mpulsweb/model/case.py:1300 mpulsweb/model/case.py:1301
#: 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:1305
+#: mpulsweb/model/case.py:1302
msgid "Outstanding deleted"
msgstr "Schwebend gelöscht"
-#: mpulsweb/model/case.py:1306
+#: mpulsweb/model/case.py:1303
msgid "Outstanding made anonymous"
msgstr "Schwebend anonymisiert"
-#: mpulsweb/model/case.py:1307
+#: mpulsweb/model/case.py:1304
msgid "Make anonymous"
msgstr "Anonymisiert"
-#: mpulsweb/model/case.py:1455
+#: mpulsweb/model/case.py:1452
#, 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:1485
+#: mpulsweb/model/case.py:1482
#, 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:1488
+#: mpulsweb/model/case.py:1485
#, python-format
msgid ""
"The case with UUID '%s' is either marked for anonymization or marked for "
@@ -1200,7 +1199,7 @@
"Der Fall mit der UUID '%s' ist entweder schwebend anonymisiert oder "
"schwebend gelöscht."
-#: mpulsweb/model/case.py:1520
+#: mpulsweb/model/case.py:1517
#, 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-30 08:57:55 UTC (rev 4831)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-03-30 11:30:32 UTC (rev 4832)
@@ -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 15:20+0200\n"
+"POT-Creation-Date: 2011-03-30 13:27+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:1351
+#: mpulsweb/controllers/case.py:219 mpulsweb/model/case.py:1348
#: 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:1353
+#: mpulsweb/controllers/case.py:221 mpulsweb/model/case.py:1350
#: 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,64 +942,63 @@
msgid "< 1 week"
msgstr ""
-#: mpulsweb/model/case.py:112
+#: mpulsweb/model/case.py:745
#, 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
+#: mpulsweb/model/case.py:770
#, python-format
msgid ""
-"<p>An anonymisation of this case is not possible: It is only possible to end"
-" \n"
+"<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 \n"
-"anonymise again.</p><p>Click on OK to continue.</p>"
+"finish the phase and try to anonymise again.</p><p>Click on OK to "
+"continue.</p>"
msgstr ""
-#: mpulsweb/model/case.py:1047
+#: mpulsweb/model/case.py:1044
msgid "Error on fetching data for formletter"
msgstr ""
-#: mpulsweb/model/case.py:1303 mpulsweb/model/case.py:1304
+#: mpulsweb/model/case.py:1300 mpulsweb/model/case.py:1301
#: 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:1305
+#: mpulsweb/model/case.py:1302
msgid "Outstanding deleted"
msgstr ""
-#: mpulsweb/model/case.py:1306
+#: mpulsweb/model/case.py:1303
msgid "Outstanding made anonymous"
msgstr ""
-#: mpulsweb/model/case.py:1307
+#: mpulsweb/model/case.py:1304
msgid "Make anonymous"
msgstr ""
-#: mpulsweb/model/case.py:1455
+#: mpulsweb/model/case.py:1452
#, python-format
msgid "The case with UUID '%s' could not be imported due to rule violations"
msgstr ""
-#: mpulsweb/model/case.py:1485
+#: mpulsweb/model/case.py:1482
#, python-format
msgid "The case with UUID '%s' was anonymized already."
msgstr ""
-#: mpulsweb/model/case.py:1488
+#: mpulsweb/model/case.py:1485
#, python-format
msgid ""
"The case with UUID '%s' is either marked for anonymization or marked for "
"deletion."
msgstr ""
-#: mpulsweb/model/case.py:1520
+#: mpulsweb/model/case.py:1517
#, 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-30 08:57:55 UTC (rev 4831)
+++ base/trunk/mpulsweb/model/case.py 2011-03-30 11:30:32 UTC (rev 4832)
@@ -108,15 +108,6 @@
CHECK_REMIND_CONDITION = """\
SELECT id FROM master_tbl_view WHERE id = %%(id)s AND (%s)"""
-#DIALOGS
-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>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:
return params.getone(k)
@@ -751,8 +742,9 @@
desc = g.mpuls_config.get('phases',
'description')[0].get(phasepart.phase)
if not phasepart.is_anonymizable():
- raise ConsistenceCheckException(h.literal(MARKANONYMIZE_FAILED_MIN_PHASE
- % desc))
+ raise ConsistenceCheckException(h.literal(_( \
+ u"<p>An anonymisation of the case is not possible in phase %s." \
+ u"</p><p>Please remove this case.</p>") % desc))
# 2. Now determine if we will enforce full consistence or minimal
# consistence (e.g on abort)
@@ -775,7 +767,12 @@
# 3. Check if the case is currently running
if isinstance(phasepart, StartPhasePart):
raise ConsistenceCheckException(
- h.literal(MARKANONYMIZE_FAILED_RUNNING_PHASE % desc))
+ h.literal(_(
+ "<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>") % desc))
def make_consistent(self, endphase=None):
"""Will ensure that the case is in a (minimal) consistent state. That
More information about the Mpuls-commits
mailing list