[Mpuls-commits] r5057 - in base/trunk: . mpulsweb/controllers mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Jun 3 10:44:56 CEST 2011
Author: ludwig
Date: 2011-06-03 10:44:53 +0200 (Fri, 03 Jun 2011)
New Revision: 5057
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/controllers/privacy.py
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
Log:
Issue1005: Remove imports of translation msgs and change the msgs to inline.
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2011-06-01 13:37:24 UTC (rev 5056)
+++ base/trunk/ChangeLog 2011-06-03 08:44:53 UTC (rev 5057)
@@ -1,3 +1,11 @@
+2011-06-03 Ludwig Reiter <ludwig.reiter at intevation.de>
+
+ * mpulsweb/i18n/mpulsweb.pot,
+ mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po,
+ mpulsweb/controllers/privacy.py:
+ Issue1005: Remove imports of translation msgs and change the msgs
+ to inline.
+
2011-06-01 Ludwig Reiter <ludwig.reiter at intevation.de>
* mpulsweb/i18n/mpulsweb.pot,
Modified: base/trunk/mpulsweb/controllers/privacy.py
===================================================================
--- base/trunk/mpulsweb/controllers/privacy.py 2011-06-01 13:37:24 UTC (rev 5056)
+++ base/trunk/mpulsweb/controllers/privacy.py 2011-06-03 08:44:53 UTC (rev 5057)
@@ -13,30 +13,6 @@
from mpulsweb.lib.anonymize import determineAnonymizedCaseEndPhase
from mpulsweb.model.phase import ConsistenceCheckException, PhaseAnonymizableCheckException
-from mpulsweb.controllers.case import \
- MARKANONYMIZE_SUCCESS, MARKANONYMIZE_SUCCESS_TEXT, MARKANONYMIZE_FAILED, \
- MARKANONYMIZE_FAILED_TEXT
-
-
-HEADER = _("Set declaration of consent?")
-
-ACCEPT_QUESTION = _("""You have stated that there is a declaration of consent from
-the young adult to the acquisition, handling and storage of personal data.
-Are you sure this is correct?""")
-
-SET_EE_ACCEPT_SUCCESS_HEADER = _(u"Privacy statement set!")
-SET_EE_ACCEPT_SUCCESS_TEXT = _(u'Please click Bitte klick "OK" to continue work on the case')
-
-PRIVACY_DECLINE_DISALLOWED = _('Decline privacy statement not possible')
-
-PRIVACY_DECLINE_DISALLOWED_TEXT = _('<p>The case is in a non consistent state und it will not be possible to anonimise it after retracting the privacy statement. The reason for this is listed below:</p><p>%s</p><p>Please refer to the documentation in case that the privacy statement has been declined.</p>')
-
-PRIVACY_DECLINE_DISALLOWED_TEXT2 = _('The case is in a non consistent state und it will not be possible to anonimise it after retracting the privacy statement. The reason for this is listed below:%s')
-
-PRIVACY_DECLINE = _(u"Retract privacy statement?")
-PRIVACY_DECLINE_TEXT = _(u"The case will be anonymised if you retract the privacy statement.""")
-
-
log = logging.getLogger(__name__)
@@ -84,14 +60,18 @@
session_case = session.get('case')
session_case.privacy_statement = True
session.save()
- c.dialog_title = SET_EE_ACCEPT_SUCCESS_HEADER
- c.dialog_text = SET_EE_ACCEPT_SUCCESS_TEXT
+ c.dialog_title = _(u"Privacy statement set!")
+ c.dialog_text = _(u'Please click Bitte klick "OK" to continue work'
+ ' on the case')
c.url_ok = h.url_for(controller="/case", action="digest",
id=case.id)
return render('privacy/dialogs/accept_success.mako')
else:
- c.dialog_title = HEADER
- c.dialog_text = ACCEPT_QUESTION
+ c.dialog_title = _("Set declaration of consent?")
+ c.dialog_text = _("You have stated that there is a declaration of "
+ "consent from\nthe young adult to the acquisition, handling "
+ "and storage of personal data.\n"
+ "Are you sure this is correct?")
c.url_yes = h.url_for(controller="privacy", action="accept",
id=id, confirmed="1")
c.url_no = h.url_for(controller="/case", action="select",
@@ -106,15 +86,15 @@
try:
case.check_anonymizeability()
except PhaseAnonymizableCheckException, e:
- c.dialog_title = PRIVACY_DECLINE_DISALLOWED
- c.dialog_text = h.literal(PRIVACY_DECLINE_DISALLOWED_TEXT2 % e.value)
+ c.dialog_title = _('Decline privacy statement not possible')
+ c.dialog_text = h.literal( _('The case is in a non consistent state und it will not be possible to anonimise it after retracting the privacy statement. The reason for this is listed below:%s') % e.value)
c.url_ok = h.url_for(controller='/case', action='digest',
id=case.id)
return render('/casemanagement/dialogs/failed_markanonymize.mako')
except ConsistenceCheckException, e:
- c.dialog_title = PRIVACY_DECLINE_DISALLOWED
- c.dialog_text = h.literal(PRIVACY_DECLINE_DISALLOWED_TEXT % e.value)
+ c.dialog_title = _('Decline privacy statement not possible')
+ c.dialog_text = h.literal(_('<p>The case is in a non consistent state und it will not be possible to anonimise it after retracting the privacy statement. The reason for this is listed below:</p><p>%s</p><p>Please refer to the documentation in case that the privacy statement has been declined.</p>') % e.value)
c.url_ok = h.url_for(controller='/case', action='digest',
id=case.id)
return render('/casemanagement/dialogs/failed_markanonymize.mako')
@@ -124,8 +104,11 @@
try:
case.make_anonymizable()
case.getState().setState(4)
- c.dialog_title = MARKANONYMIZE_SUCCESS
- c.dialog_text = MARKANONYMIZE_SUCCESS_TEXT
+ c.dialog_title = _(u"""Freed case document to anonymise.""")
+ c.dialog_text = _(u"The case document has been freed to be"
+ u" anonymised and has been given to\n"
+ u"the admininstration. Please click on OK, to get back "
+ u"to the overview.")
c.url_ok = h.url_for ('/case_overview')
statement = case.getPrivacyStatement()
statement.decline()
@@ -135,8 +118,11 @@
for k, values in e.errors.iteritems():
for v in values:
errors.append(v.msg)
- c.dialog_title = MARKANONYMIZE_FAILED
- c.dialog_text = MARKANONYMIZE_FAILED_TEXT % "<br>".join(errors)
+ c.dialog_title = _(u"""Anonymising not possible.""")
+ c.dialog_text = _("To anonymise this case document was not "
+ "possible, because of following \nreason:"
+ "</p><p><i>%s</i></p><p>Please click on OK to get"
+ " back to the overview.\n</p>") % "<br>".join(errors)
c.url_ok = h.url_for(controller='/case', action='select',
id=case.id, confirmed=1)
return render('/privacy/dialogs/decline_failed.mako')
@@ -144,8 +130,8 @@
else:
# Get description of the phase which will be set after anonymisation
pdescriptions = g.mpuls_config.get('phases', 'description')[0]
- c.dialog_title = PRIVACY_DECLINE
- c.dialog_text = PRIVACY_DECLINE_TEXT
+ c.dialog_title = _(u"Retract privacy statement?")
+ c.dialog_text = _(u"The case will be anonymised if you retract the privacy statement.""")
c.url_yes = h.url_for(controller="privacy", action="decline",
id=id, confirmed="1")
c.url_no = h.url_for(controller="/case", action="select",
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-06-01 13:37:24 UTC (rev 5056)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-06-03 08:44:53 UTC (rev 5057)
@@ -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-06-01 15:29+0200\n"
+"PO-Revision-Date: 2011-06-03 10:39+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"
@@ -323,7 +323,7 @@
" aus der Übersicht entfernt. Bitte klicken Sie auf \"OK\", um zur "
"Fallaktenübersicht fortzufahren."
-#: mpulsweb/controllers/case.py:44
+#: mpulsweb/controllers/case.py:44 mpulsweb/controllers/privacy.py:121
msgid "Anonymising not possible."
msgstr "Anonymisierung nicht möglich."
@@ -339,11 +339,11 @@
"möglich:</p><p><i>%s</i></p><p>Bitte klicken Sie auf \"OK\", um zur "
"Fallaktenübersicht fortzufahren.</p>"
-#: mpulsweb/controllers/case.py:49
+#: mpulsweb/controllers/case.py:49 mpulsweb/controllers/privacy.py:107
msgid "Freed case document to anonymise."
msgstr "Fallakte wurde zur Anonymisierung freigegeben!"
-#: mpulsweb/controllers/case.py:50
+#: mpulsweb/controllers/case.py:50 mpulsweb/controllers/privacy.py:108
msgid ""
"The case document has been freed to be anonymised and has been given to\n"
"the admininstration. Please click on OK, to get back to the overview."
@@ -996,11 +996,21 @@
"Die Phase konnte erfolgreich gewechselt werden. Bitte folgen Sie den "
"aufgeführten Schritten, um zur Phasenübersicht fortzufahren."
-#: mpulsweb/controllers/privacy.py:21
+#: mpulsweb/controllers/privacy.py:63
+msgid "Privacy statement set!"
+msgstr "Einwilligungserklärung gesetzt!"
+
+#: mpulsweb/controllers/privacy.py:64
+msgid "Please click Bitte klick \"OK\" to continue work on the case"
+msgstr ""
+"Bitte klicken Sie auf \"OK\", um mit der Bearbeitung der Fallakte "
+"fortzufahren."
+
+#: mpulsweb/controllers/privacy.py:70
msgid "Set declaration of consent?"
msgstr "Einwilligungserklärung setzen?"
-#: mpulsweb/controllers/privacy.py:23
+#: mpulsweb/controllers/privacy.py:71
msgid ""
"You have stated that there is a declaration of consent from\n"
"the young adult to the acquisition, handling and storage of personal "
@@ -1011,23 +1021,24 @@
"zur Erfassung, Verarbeitung und Speicherung personenbezogener Daten "
"vorliegt. Sind Sie sicher, dass diese Angabe korrekt ist?"
-#: mpulsweb/controllers/privacy.py:27
-msgid "Privacy statement set!"
-msgstr "Einwilligungserklärung gesetzt!"
-
-#: mpulsweb/controllers/privacy.py:28
-msgid "Please click Bitte klick \"OK\" to continue work on the case"
-msgstr ""
-"Bitte klicken Sie auf \"OK\", um mit der Bearbeitung der Fallakte "
-"fortzufahren."
-
-#: mpulsweb/controllers/privacy.py:30
+#: mpulsweb/controllers/privacy.py:89 mpulsweb/controllers/privacy.py:96
msgid "Decline privacy statement not possible"
msgstr "Die Einwilligungserklärung wurde nicht zurückgezogen!"
-#: mpulsweb/controllers/privacy.py:32
+#: mpulsweb/controllers/privacy.py:90
#, python-format
msgid ""
+"The case is in a non consistent state und it will not be possible to "
+"anonimise it after retracting the privacy statement. The reason for this "
+"is listed below:%s"
+msgstr ""
+"Das Zurückziehen der Einwilligungserklärung führt zur Anonymisierung der "
+"Akte.Eine Anonymisierung ist für diese Fallakte derzeit auf folgendem "
+"Grund nicht möglich:<p>%s</p>"
+
+#: mpulsweb/controllers/privacy.py:97
+#, python-format
+msgid ""
"<p>The case is in a non consistent state und it will not be possible to "
"anonimise it after retracting the privacy statement. The reason for this "
"is listed below:</p><p>%s</p><p>Please refer to the documentation in case"
@@ -1041,22 +1052,23 @@
"und die Erklärung zurückziehen zu können. Erfüllen Sie die genannten "
"Anforderungen zur Anonymisierung und wiederholen Sie den Vorgang.</p>"
-#: mpulsweb/controllers/privacy.py:34
-#, python-format
+#: mpulsweb/controllers/privacy.py:122
+#, python-format
msgid ""
-"The case is in a non consistent state und it will not be possible to "
-"anonimise it after retracting the privacy statement. The reason for this "
-"is listed below:%s"
+"To anonymise this case document was not possible, because of following \n"
+"reason:</p><p><i>%s</i></p><p>Please click on OK to get back to the "
+"overview.\n"
+"</p>"
msgstr ""
-"Das Zurückziehen der Einwilligungserklärung führt zur Anonymisierung der "
-"Akte.Eine Anonymisierung ist für diese Fallakte derzeit auf folgendem "
-"Grund nicht möglich:<p>%s</p>"
+"<p>Eine Anonymisierung der Fallakte war aus folgendem Grund nicht "
+"möglich:</p><p><i>%s</i></p><p>Bitte klicken Sie auf \"OK\", um zur "
+"Fallaktenübersicht fortzufahren.</p>"
-#: mpulsweb/controllers/privacy.py:36
+#: mpulsweb/controllers/privacy.py:133
msgid "Retract privacy statement?"
msgstr "Erklärung zurückziehen?"
-#: mpulsweb/controllers/privacy.py:37
+#: mpulsweb/controllers/privacy.py:134
msgid "The case will be anonymised if you retract the privacy statement."
msgstr ""
"Die Akte wird anonymisiert, falls die Erklärung zurückgezogen wird. Im "
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-06-01 13:37:24 UTC (rev 5056)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-06-03 08:44:53 UTC (rev 5057)
@@ -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-06-01 15:29+0200\n"
+"POT-Creation-Date: 2011-06-03 10:39+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"
@@ -267,7 +267,7 @@
"is removed from the overview. Please click on OK, to get back to the overview."
msgstr ""
-#: mpulsweb/controllers/case.py:44
+#: mpulsweb/controllers/case.py:44 mpulsweb/controllers/privacy.py:121
msgid "Anonymising not possible."
msgstr ""
@@ -280,11 +280,11 @@
"</p>"
msgstr ""
-#: mpulsweb/controllers/case.py:49
+#: mpulsweb/controllers/case.py:49 mpulsweb/controllers/privacy.py:107
msgid "Freed case document to anonymise."
msgstr ""
-#: mpulsweb/controllers/case.py:50
+#: mpulsweb/controllers/case.py:50 mpulsweb/controllers/privacy.py:108
msgid ""
"The case document has been freed to be anonymised and has been given to\n"
"the admininstration. Please click on OK, to get back to the overview."
@@ -826,30 +826,38 @@
"steps to reach the phase overview."
msgstr ""
-#: mpulsweb/controllers/privacy.py:21
+#: mpulsweb/controllers/privacy.py:63
+msgid "Privacy statement set!"
+msgstr ""
+
+#: mpulsweb/controllers/privacy.py:64
+msgid "Please click Bitte klick \"OK\" to continue work on the case"
+msgstr ""
+
+#: mpulsweb/controllers/privacy.py:70
msgid "Set declaration of consent?"
msgstr ""
-#: mpulsweb/controllers/privacy.py:23
+#: mpulsweb/controllers/privacy.py:71
msgid ""
"You have stated that there is a declaration of consent from\n"
"the young adult to the acquisition, handling and storage of personal data.\n"
"Are you sure this is correct?"
msgstr ""
-#: mpulsweb/controllers/privacy.py:27
-msgid "Privacy statement set!"
+#: mpulsweb/controllers/privacy.py:89 mpulsweb/controllers/privacy.py:96
+msgid "Decline privacy statement not possible"
msgstr ""
-#: mpulsweb/controllers/privacy.py:28
-msgid "Please click Bitte klick \"OK\" to continue work on the case"
+#: mpulsweb/controllers/privacy.py:90
+#, python-format
+msgid ""
+"The case is in a non consistent state und it will not be possible to "
+"anonimise it after retracting the privacy statement. The reason for this is "
+"listed below:%s"
msgstr ""
-#: mpulsweb/controllers/privacy.py:30
-msgid "Decline privacy statement not possible"
-msgstr ""
-
-#: mpulsweb/controllers/privacy.py:32
+#: mpulsweb/controllers/privacy.py:97
#, python-format
msgid ""
"<p>The case is in a non consistent state und it will not be possible to "
@@ -858,19 +866,20 @@
"the privacy statement has been declined.</p>"
msgstr ""
-#: mpulsweb/controllers/privacy.py:34
+#: mpulsweb/controllers/privacy.py:122
#, python-format
msgid ""
-"The case is in a non consistent state und it will not be possible to "
-"anonimise it after retracting the privacy statement. The reason for this is "
-"listed below:%s"
+"To anonymise this case document was not possible, because of following \n"
+"reason:</p><p><i>%s</i></p><p>Please click on OK to get back to the overview."
+"\n"
+"</p>"
msgstr ""
-#: mpulsweb/controllers/privacy.py:36
+#: mpulsweb/controllers/privacy.py:133
msgid "Retract privacy statement?"
msgstr ""
-#: mpulsweb/controllers/privacy.py:37
+#: mpulsweb/controllers/privacy.py:134
msgid "The case will be anonymised if you retract the privacy statement."
msgstr ""
More information about the Mpuls-commits
mailing list