[Mpuls-commits] r5483 - in base/trunk/mpulsweb: controllers i18n i18n/de/LC_MESSAGES templates/privacy/dialogs
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Oct 20 12:09:45 CEST 2011
Author: ludwig
Date: 2011-10-20 12:09:44 +0200 (Thu, 20 Oct 2011)
New Revision: 5483
Modified:
base/trunk/mpulsweb/controllers/case_bundle.py
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
Log:
Issue 2324 (missing_statement_boy part) msgids change. The Statement sentences
can be translated as whole.
Small bugfix to the case_bundle msgids.
Modified: base/trunk/mpulsweb/controllers/case_bundle.py
===================================================================
--- base/trunk/mpulsweb/controllers/case_bundle.py 2011-10-20 09:56:36 UTC (rev 5482)
+++ base/trunk/mpulsweb/controllers/case_bundle.py 2011-10-20 10:09:44 UTC (rev 5483)
@@ -409,11 +409,11 @@
# plural when talking about all selected cases
c.dialog_title = _(u"Not all cases marked for anonymisation!")
c.dialog_text = (
- ungettext(u"%(failures)s of the selected cases could not be"
+ ungettext(u"%(failures)d of the selected cases could not be"
u" marked for anonymisation."
u" The administrators will review the other cases"
u" and perform the final anonymisation ",
- u"%(failures)s of the selected cases could"
+ u"%(failures)d of the selected cases could"
u" not be marked for anonymisation."
u" The administrators will review the other cases"
u" and perform the final anonymisation.",
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-10-20 09:56:36 UTC (rev 5482)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-10-20 10:09:44 UTC (rev 5483)
@@ -8,7 +8,7 @@
"Project-Id-Version: mpulsweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2011-09-15 17:48+0200\n"
-"PO-Revision-Date: 2011-10-20 11:52+0200\n"
+"PO-Revision-Date: 2011-10-20 12:01+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"
@@ -768,7 +768,7 @@
#, python-format
msgid "%(failures)d of the selected cases could not be deleted."
msgid_plural "%(failures)d of the selected cases could not be deleted."
-msgstr[0] "%(failures)d der ausgewählten Fallakten konnte nicht gelöscht werden."
+msgstr[0] "Eine der ausgewählten Fallakten konnte nicht gelöscht werden."
msgstr[1] "%(failures)d der ausgewählten Fallakten konnten nicht gelöscht werden."
#: mpulsweb/controllers/case_bundle.py:349
@@ -834,19 +834,19 @@
#: mpulsweb/controllers/case_bundle.py:412
#, python-format
msgid ""
-"%(failures)s of the selected cases could not be marked for anonymisation."
+"%(failures)d of the selected cases could not be marked for anonymisation."
" The administrators will review the other cases and perform the final "
"anonymisation "
msgid_plural ""
-"%(failures)s of the selected cases could not be marked for anonymisation."
+"%(failures)d of the selected cases could not be marked for anonymisation."
" The administrators will review the other cases and perform the final "
"anonymisation."
msgstr[0] ""
-"%(failures)s der ausgewählten Fallakten wurde nicht zur Anonymisierung "
+"%(failures)d der ausgewählten Fallakten wurde nicht zur Anonymisierung "
"freigegeben. Die anderen Fallakten liegen der Administration zur "
"endgültigen Anonymisierung vor."
msgstr[1] ""
-"%(failures)s der ausgewählten Fallakten wurden nicht zur Anonymisierung "
+"%(failures)d der ausgewählten Fallakten wurden nicht zur Anonymisierung "
"freigegeben. Die anderen Fallakten liegen der Administration zur "
"endgültigen Anonymisierung vor."
@@ -909,7 +909,7 @@
#, python-format
msgid "%(failures)s of the selected cases could not be anonymised."
msgid_plural "%(failures)s of the selected cases could not be anonymised."
-msgstr[0] "%(failures)s der ausgewählten Fallakten konnte nicht anonymisert werden."
+msgstr[0] "Eine der ausgewählten Fallakten konnte nicht anonymisert werden."
msgstr[1] "%(failures)s der ausgewählten Fallakten konnten nicht anonymisert werden."
#: mpulsweb/controllers/case_bundle.py:498
@@ -3527,7 +3527,7 @@
#: mpulsweb/templates/dialogs/notification.mako:6
#: mpulsweb/templates/dialogs/success.mako:8
#: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:20
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:25
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:26
msgid "OK"
msgstr "OK"
@@ -4413,49 +4413,50 @@
#, python-format
msgid ""
"Please notice that the acceptence statement needs to be written. For this"
-" use %s. Please choose:"
+" use <a href=\"%s\" target=\"_blank\">Printversion of this statement</a>."
+" Please choose:"
msgstr ""
"Bitte beachten Sie, dass die Einwilligungserklärung der schriftlichen "
-"Form bedarf. Dazu steht Ihnen eine %s zur Verfügung.<br>Sie haben nun die"
-" Möglichkeit eine Angabe zur Einwilligungserklärung zu geben. Wählen Sie:"
+"Form bedarf. Dazu steht Ihnen eine <a href=\"%s\" "
+"target=\"_blank\">Druckversion dieser Erklärung</a> zur Verfügung.<br>Sie "
+"haben nun die Möglichkeit eine Angabe zur Einwilligungserklärung zu "
+"geben. Wählen Sie:"
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:6
-msgid "Printversion of this statement"
-msgstr " Druckversion dieser Erklärung"
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:10
+msgid "<strong>Statement accepted</strong>, when a statement is obtained."
+msgstr ""
+"<strong>Eine Erklärung liegt vor</strong>, wenn eine "
+"Einwilligungserklärung des Jugendlichen vorliegt."
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:10
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:19
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:13
+msgid ""
+"<strong>Statement unclear</strong>, when at the moment no statement is "
+"available, but should be obtained."
+msgstr ""
+"<strong>Erklärung noch unklar</strong>, wenn zum jetzigen Zeitpunkt noch "
+"keine Erklärung vorliegt, aber noch eingeholt werden soll."
+
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:15
+msgid ""
+"<strong>Statement declined</strong>, when no statement is available and "
+"wont be available. The case document will be made anonymous."
+msgstr ""
+"<strong>Eine Erklärung liegt nicht vor</strong>, wenn keine Erklärung des"
+" Jugendlichen vorliegt und sicher nicht vorliegen wird. Die Fallakte wird"
+" dann anonymisiert!"
+
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:20
msgid "Statement accepted"
msgstr "Eine Erklärung liegt vor"
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:10
-msgid ", when a statement is obtained."
-msgstr ", wenn eine Einwilligungserklärung des Jugendlichen vorliegt."
-
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:12
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:20
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:21
msgid "Statement unclear"
msgstr "Erklärung noch unklar"
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:12
-msgid ", when at the moment no statement is available, but should be obtained."
-msgstr ""
-", wenn zum jetzigen Zeitpunkt noch keine Erklärung vorliegt, aber noch "
-"eingeholt werden soll."
-
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:14
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:21
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:22
msgid "Statement declined"
msgstr "Eine Erklärung liegt nicht vor"
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:14
-msgid ""
-", when no statement is available and wont be available. The case document"
-" will be made anonymous."
-msgstr ""
-", wenn keine Erklärung des Jugendlichen vorliegt und sicher nicht "
-"vorliegen wird. Die Fallakte wird dann anonymisiert!"
-
#: mpulsweb/templates/search/search.mako:22
#: mpulsweb/templates/search/search.mako:44
msgid "Responsibility"
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-10-20 09:56:36 UTC (rev 5482)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-10-20 10:09:44 UTC (rev 5483)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: mpulsweb 2.0.16\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2011-10-20 11:52+0200\n"
+"POT-Creation-Date: 2011-10-20 12:01+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"
@@ -662,11 +662,11 @@
#: mpulsweb/controllers/case_bundle.py:412
#, python-format
msgid ""
-"%(failures)s of the selected cases could not be marked for anonymisation. The"
+"%(failures)d of the selected cases could not be marked for anonymisation. The"
" administrators will review the other cases and perform the final "
"anonymisation "
msgid_plural ""
-"%(failures)s of the selected cases could not be marked for anonymisation. The"
+"%(failures)d of the selected cases could not be marked for anonymisation. The"
" administrators will review the other cases and perform the final "
"anonymisation."
msgstr[0] ""
@@ -3125,7 +3125,7 @@
#: mpulsweb/templates/dialogs/notification.mako:6
#: mpulsweb/templates/dialogs/success.mako:8
#: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:20
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:25
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:26
msgid "OK"
msgstr ""
@@ -3919,42 +3919,38 @@
#, python-format
msgid ""
"Please notice that the acceptence statement needs to be written. For this use"
-" %s. Please choose:"
+" <a href=\"%s\" target=\"_blank\">Printversion of this statement</a>. Please "
+"choose:"
msgstr ""
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:6
-msgid "Printversion of this statement"
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:10
+msgid "<strong>Statement accepted</strong>, when a statement is obtained."
msgstr ""
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:10
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:19
-msgid "Statement accepted"
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:13
+msgid ""
+"<strong>Statement unclear</strong>, when at the moment no statement is "
+"available, but should be obtained."
msgstr ""
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:10
-msgid ", when a statement is obtained."
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:15
+msgid ""
+"<strong>Statement declined</strong>, when no statement is available and wont "
+"be available. The case document will be made anonymous."
msgstr ""
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:12
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:20
-msgid "Statement unclear"
+msgid "Statement accepted"
msgstr ""
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:12
-msgid ", when at the moment no statement is available, but should be obtained."
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:21
+msgid "Statement unclear"
msgstr ""
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:14
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:21
+#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:22
msgid "Statement declined"
msgstr ""
-#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:14
-msgid ""
-", when no statement is available and wont be available. The case document "
-"will be made anonymous."
-msgstr ""
-
#: mpulsweb/templates/search/search.mako:22
#: mpulsweb/templates/search/search.mako:44
msgid "Responsibility"
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako 2011-10-20 09:56:36 UTC (rev 5482)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako 2011-10-20 10:09:44 UTC (rev 5483)
@@ -3,15 +3,16 @@
<h1><img src="${h.url_for('/images/icons/info/info.png')}" alt="" width="48" height="48" />${_('Missing data for the statement')}</h1>
<p>${_('The acceptance statement of the youth for work and usage of his data. You are resonsible for this.')}</p>
% if h.hasRole(['cm_ka']):
- <p>${h.literal(_('Please notice that the acceptence statement needs to be written. For this use %s. Please choose:') % '<a href="%s" target="_blank">%s<a>' % (h.url_for(controller="/privacy", action="printStatement", id=c.ds_id), _('Printversion of this statement')))}
+ <p>${h.literal(_('Please notice that the acceptence statement needs to be written. For this use <a href="%s" target="_blank">Printversion of this statement</a>. Please choose:') % h.url_for(controller="/privacy", action="printStatement", id=c.ds_id))}
<ol>
<li>
- <strong>${_('Statement accepted')}</strong>${_(', when a statement is obtained.')}
+ ${h.literal(_('<strong>Statement accepted</strong>, when a statement is obtained.'))}
</li>
- <li><strong>${_('Statement unclear')}</strong>${_(', when at the moment no statement is available, but should be obtained.')}
+ <li>
+ ${h.literal(_('<strong>Statement unclear</strong>, when at the moment no statement is available, but should be obtained.'))}
</li>
- <li><strong>${_('Statement declined')}</strong>${_(', when no statement is available and wont be available. The case document will be made anonymous.')}
+ <li>${h.literal(_('<strong>Statement declined</strong>, when no statement is available and wont be available. The case document will be made anonymous.'))}
</li>
</ol>
</p>
More information about the Mpuls-commits
mailing list