[Mpuls-commits] r5487 - in base/trunk/mpulsweb: controllers i18n i18n/de/LC_MESSAGES
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Oct 21 12:01:15 CEST 2011
Author: ludwig
Date: 2011-10-21 12:01:14 +0200 (Fri, 21 Oct 2011)
New Revision: 5487
Modified:
base/trunk/mpulsweb/controllers/case.py
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
Log:
Issue 395: Improvement to the one case change dialogs.
Modified: base/trunk/mpulsweb/controllers/case.py
===================================================================
--- base/trunk/mpulsweb/controllers/case.py 2011-10-20 16:21:47 UTC (rev 5486)
+++ base/trunk/mpulsweb/controllers/case.py 2011-10-21 10:01:14 UTC (rev 5487)
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+from cgi import escape
from datetime import datetime
import logging
import paste
@@ -20,6 +21,7 @@
from mpulsweb.lib.db import PostgresDBInterface
from mpulsweb.lib.metaclient import MetaException, MetaUnauthorized, \
UnknownMetaCase, UnknownProjectPart, MetaCaseAnonymized, MetaCasePending
+from mpulsweb.lib.helper.filters import NA
from mpulsweb.model.case import ConsistenceCheckException, SessionCase, \
MPulsXMLImporter, XMLImportException
@@ -94,6 +96,20 @@
return render(template)
#
+ # helper method
+ # return a string containing a html list with the overview_fields of
+ # the case
+ #
+ def _buildOneCaseList(self, case):
+ list = ["<ul>"]
+ overview_fields = case.get_overview_fields()
+ list.append("<li>%s</li>" % ", ".join([
+ escape(NA(case.get_value(f.name))) for f in overview_fields]))
+ list.append("</ul>")
+ return list
+
+
+ #
# Delete
#
@@ -101,8 +117,8 @@
def markForDelete(self, id, confirmed):
id = self._checkInt(id)
confirmed = self._checkBool(confirmed)
+ case = self._loadCase(id)
if confirmed == 1:
- case = self._loadCase(id)
case.markDelete()
case.checkValidity()
c.dialog_title = _("Case document deleted!")
@@ -116,9 +132,10 @@
c.context = "../main.mako"
c.dialog_title = ungettext('Delete case?', 'Delete cases?', 1)
c.dialog_text = _("Do you really want to mark this case for"
- " deletion? The case will not be editable"
+ " deletion?%s The case will not be editable"
" afterwards, and submited to the administration"
- " for deletion.")
+ " for deletion.<br>") \
+ % "\n".join(self._buildOneCaseList(case))
c.url_yes = h.url_for(controller='/case', action='markForDelete',
id=id, confirmed=1)
@@ -130,6 +147,7 @@
id = self._checkInt(id)
confirmed = self._checkBool(confirmed)
+ case = self._loadCase(id)
if not confirmed:
c.context = "../main.mako"
c.dialog_title = ungettext('Delete case?', 'Delete cases?', 1)
@@ -137,14 +155,14 @@
" be erased irrecoverable!<br>"
"Only delete the case if this case is"
" <b>not needed for evaluations</b> anymore."
- "<br><br>"
- "Do you want to delete the case from the server?")
+ "<br><br>Do you want to delete the case "
+ "from the server?%s<br>") \
+ % "\n".join(self._buildOneCaseList(case))
c.url_yes = h.url_for(controller='/case', action='delete',
id=id, confirmed=1)
c.url_no = h.url_for(controller='/case_overview')
return render('/casemanagement/dialogs/confirm_delete.mako')
- case = self._loadCase(id)
try:
return self._do_delete_case(case)
except MetaException, exc:
@@ -223,12 +241,14 @@
c.dialog_title = _(u"Do make anonymous?")
c.dialog_text = (_(u"<p>Do you really want to mark the case for"
- u" anonymization? The case can then no longer be"
+ u" anonymization?%s<br>"
+ "The case can then no longer be"
u" edited and will given to the administrators"
u" for final anonymisation.</p>"
u"<p><b>The case document is going to be"
- u" anonymised in phase </b>%s<b>!</b>""") \
- % " ".join(phase_name))
+ u" anonymised in phase </b>%s<b>!</b><br>""") \
+ % ("\n".join(self._buildOneCaseList(case)),
+ " ".join(phase_name)))
c.url_yes = h.url_for(controller='/case', action='markForAnonymize',
id=id, confirmed=1)
c.url_no = url
@@ -376,10 +396,11 @@
c.dialog_title = _(u"Do make anonymous?")
c.dialog_text = _(u"Do you really want to anonymise the case and"
u" irrecovably lose the associated personal"
- u" data?"
+ u" data? %s"
u" After it the case will not be available you."
u" The anonymised case will still be considered"
- u" for the analysis.")
+ u" for the analysis.<br>") \
+ % "\n".join(self._buildOneCaseList(case))
c.url_yes = h.url_for(controller='/case', action='anonymize',
id=id, confirmed=1)
c.url_no = h.url_for(controller='/case', action='digest', id=id)
@@ -491,9 +512,10 @@
else:
c.context = "../main.mako"
c.dialog_title = ungettext('Restore case?', 'Restore cases?', 1)
- c.dialog_text = _("Do you really want to restore the case?"
+ c.dialog_text = _("Do you really want to restore the case?%s"
" The case will be editable afterwards again"
- " for the users.")
+ " for the users.<br>") \
+ % "\n".join(self._buildOneCaseList(case))
c.url_yes = h.url_for(controller='/case', action='restore', id=id,
confirmed=1)
c.url_no = h.url_for(controller='/case_overview')
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-10-20 16:21:47 UTC (rev 5486)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-10-21 10:01:14 UTC (rev 5487)
@@ -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 12:26+0200\n"
+"PO-Revision-Date: 2011-10-21 11:55+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"
@@ -262,7 +262,7 @@
"Wollen Sie wirklich den Termin löschen und die Daten unwiederbringlich "
"verlieren?"
-#: mpulsweb/controllers/case.py:72
+#: mpulsweb/controllers/case.py:74
msgid ""
"The meta server did not accept the request because of missing or "
"incorrect username or password. Please check whether the meta-server is "
@@ -272,7 +272,7 @@
"falschem Benutzernamen oder Passwort. Bitte prüfen Sie, ob die Angaben "
"zum Meta-Server korrekt konfiguriert sind."
-#: mpulsweb/controllers/case.py:108 mpulsweb/controllers/case.py:175
+#: mpulsweb/controllers/case.py:124 mpulsweb/controllers/case.py:193
#: mpulsweb/templates/casebundle/dialogs/failure_delete_admin.mako:6
#: mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako:6
#: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:6
@@ -282,11 +282,11 @@
msgid "Case document deleted!"
msgstr "Fallakte gelöscht!"
-#: mpulsweb/controllers/case.py:109
+#: mpulsweb/controllers/case.py:125
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:117 mpulsweb/controllers/case.py:135
+#: mpulsweb/controllers/case.py:133 mpulsweb/controllers/case.py:153
#: mpulsweb/controllers/case_bundle.py:280
#: mpulsweb/controllers/case_bundle.py:300
#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:6
@@ -296,32 +296,35 @@
msgstr[0] "Fallakte löschen?"
msgstr[1] "Fallakten löschen?"
-#: mpulsweb/controllers/case.py:118
+#: mpulsweb/controllers/case.py:134
+#, python-format
msgid ""
-"Do you really want to mark this case for deletion? The case will not be "
-"editable afterwards, and submited to the administration for deletion."
+"Do you really want to mark this case for deletion?%s The case will not be"
+" editable afterwards, and submited to the administration for "
+"deletion.<br>"
msgstr ""
-"Wollen Sie wirklich die Fallakte zum Löschen freigeben? Die Fallakte "
+"Wollen Sie wirklich die Fallakte zum Löschen freigeben?%s Die Fallakte "
"steht Ihnen danach nicht mehr zur Bearbeitung zur Verfügung und wird der "
-"Administration zum Löschen vorgelegt."
+"Administration zum Löschen vorgelegt.<br>"
-#: mpulsweb/controllers/case.py:136
+#: mpulsweb/controllers/case.py:154
+#, python-format
msgid ""
"Warning! On deleting the case all data will be erased "
"irrecoverable!<br>Only delete the case if this case is <b>not needed for "
"evaluations</b> anymore.<br><br>Do you want to delete the case from the "
-"server?"
+"server?%s<br>"
msgstr ""
"Achtung, beim Löschen der Fallakte gehen alle Daten unwiederbringlich "
"verloren!<br><br>Die Akte wird vollständig aus dem Archiv gelöscht und "
"<em>für Auswertungen nicht mehr berücksichtigt</em>!<br><br>Die Akte "
-"jetzt vom Server löschen?"
+"jetzt vom Server löschen?%s<br>"
-#: mpulsweb/controllers/case.py:154 mpulsweb/controllers/case.py:163
+#: mpulsweb/controllers/case.py:172 mpulsweb/controllers/case.py:181
msgid "Case document not deleted!"
msgstr "Fallakte nicht gelöscht!"
-#: mpulsweb/controllers/case.py:155
+#: mpulsweb/controllers/case.py:173
msgid ""
"The case can not be deleted because of an unexpected problem with the "
"meta server."
@@ -329,29 +332,29 @@
"Die Fallakte konnte wegen eines unerwarteten Problems mit dem Meta-Server"
" nicht gelöscht werden."
-#: mpulsweb/controllers/case.py:164
+#: mpulsweb/controllers/case.py:182
msgid "The case can not be deleted because of an unexpected problem."
msgstr ""
"Die Fallakte konnte wegen eines unerwarteten Problems nicht gelöscht "
"werden."
-#: mpulsweb/controllers/case.py:176
+#: mpulsweb/controllers/case.py:194
msgid "Click on OK to continue."
msgstr "Bitte klicken Sie \"OK\", um fortzufahren."
-#: mpulsweb/controllers/case.py:203 mpulsweb/controllers/case.py:368
+#: mpulsweb/controllers/case.py:221 mpulsweb/controllers/case.py:388
#: mpulsweb/controllers/privacy.py:121
msgid "Anonymising not possible."
msgstr "Anonymisierung nicht möglich."
-#: mpulsweb/controllers/case.py:220 mpulsweb/model/case.py:1412
+#: mpulsweb/controllers/case.py:238 mpulsweb/model/case.py:1412
#: mpulsweb/model/phase.py:302
#: mpulsweb/templates/casemanagement/caselist.mako:152
#: mpulsweb/templates/phase/phase.mako:51
msgid "Running"
msgstr "laufend"
-#: mpulsweb/controllers/case.py:222 mpulsweb/model/case.py:1414
+#: mpulsweb/controllers/case.py:240 mpulsweb/model/case.py:1414
#: mpulsweb/model/phase.py:304
#: mpulsweb/templates/casemanagement/caselist.mako:155
#: mpulsweb/templates/phase/phase.mako:53
@@ -359,29 +362,29 @@
msgid "Finished"
msgstr "beendet"
-#: mpulsweb/controllers/case.py:224 mpulsweb/controllers/case.py:376
+#: mpulsweb/controllers/case.py:242 mpulsweb/controllers/case.py:396
msgid "Do make anonymous?"
msgstr "Fallakte anonymisieren?"
-#: mpulsweb/controllers/case.py:225
+#: mpulsweb/controllers/case.py:243
#, python-format
msgid ""
-"<p>Do you really want to mark the case for anonymization? The case can "
-"then no longer be edited and will given to the administrators for final "
-"anonymisation.</p><p><b>The case document is going to be anonymised in "
-"phase </b>%s<b>!</b>"
+"<p>Do you really want to mark the case for anonymization?%s<br>The case "
+"can then no longer be edited and will given to the administrators for "
+"final anonymisation.</p><p><b>The case document is going to be anonymised"
+" in phase </b>%s<b>!</b><br>"
msgstr ""
-"<p>Möchten Sie die Fallakte wirklich zur Anonymisierung freigeben? Die "
-"Fallakte kann dann nicht mehr bearbeitet werden und wird den "
+"<p>Möchten Sie die Fallakte wirklich zur Anonymisierung freigeben?%s<br> "
+"Die Fallakte kann dann nicht mehr bearbeitet werden und wird den "
"Administratoren zur endgültigen Anonymisierung vorgelegt.</p><p><b>Die "
-"Fallakte wird in der Phase </b>%s<b> anonymisiert!</b>"
+"Fallakte wird in der Phase </b>%s<b> anonymisiert!</b><br>"
-#: mpulsweb/controllers/case.py:245 mpulsweb/controllers/case.py:264
-#: mpulsweb/controllers/case.py:281 mpulsweb/controllers/case.py:299
+#: mpulsweb/controllers/case.py:265 mpulsweb/controllers/case.py:284
+#: mpulsweb/controllers/case.py:301 mpulsweb/controllers/case.py:319
msgid "Case document not marked for anonymization!"
msgstr "Die Fallakte wurde nicht zur Anonymisierung freigegeben!"
-#: mpulsweb/controllers/case.py:247
+#: mpulsweb/controllers/case.py:267
msgid ""
"The case has not been marked for anonymization because the data could not"
" be uploaded to the meta server because the meta case has been deleted or"
@@ -394,7 +397,7 @@
"Meta-Akte entfernt. Ein weiterer Versuch, die Fallakte zu anonymisieren "
"sollte erfolgreich sein."
-#: mpulsweb/controllers/case.py:266
+#: mpulsweb/controllers/case.py:286
msgid ""
"The case has not been marked for anonymization because the data could not"
" be uploaded to the meta server because the project part does not exist "
@@ -407,7 +410,7 @@
"mit dem Projektteil der Meta-Akte entfernt. Ein weiterer Versuch, die "
"Fallakte zu anonymisieren sollte erfolgreich sein."
-#: mpulsweb/controllers/case.py:283
+#: mpulsweb/controllers/case.py:303
msgid ""
"The case has not been marked for anonymization because the data could not"
" be uploaded to the meta server because the meta-case has been marked for"
@@ -420,7 +423,7 @@
"Akte wird eventuell wieder hergestellt, daher könnte später ein weiterer "
"Versuch, die Fallakte zur Anonymisierung freizugeben erfolgreich sein."
-#: mpulsweb/controllers/case.py:301
+#: mpulsweb/controllers/case.py:321
msgid ""
"The case has not been marked for anonymization because of an unexpected "
"problem with the meta server."
@@ -428,11 +431,11 @@
"Die Fallakte wurde nicht zur Anonymisierung freigegeben worden wegen "
"eines unerwarteten Problems mit dem Meta-Server."
-#: mpulsweb/controllers/case.py:312
+#: mpulsweb/controllers/case.py:332
msgid "Case document not marked for anonymisation!"
msgstr "Fallakte nicht zur Anonymisierung freigegeben!"
-#: mpulsweb/controllers/case.py:313
+#: mpulsweb/controllers/case.py:333
msgid ""
"The case can not be marked for anonymisation because of an unexpected "
"problem."
@@ -440,11 +443,11 @@
"Die Fallakte kann wegen eines unerwarteten Problems nicht zur "
"Anonymisierung freigeben werden."
-#: mpulsweb/controllers/case.py:330
+#: mpulsweb/controllers/case.py:350
msgid "Case marked for anonymisation."
msgstr "Fallakte zur Anonymisierung freigegeben."
-#: mpulsweb/controllers/case.py:331
+#: mpulsweb/controllers/case.py:351
msgid ""
"The case document has been marked for anonymisation and has been given to"
" the administration for final anonymisation. Please click on OK, to get "
@@ -454,11 +457,11 @@
"Administration zur endgültigen Anonymisierung vor. Bitte klicken Sie auf "
"\"OK\", um zur Fallaktenübersicht fortzufahren."
-#: mpulsweb/controllers/case.py:347
+#: mpulsweb/controllers/case.py:367
msgid "Anonymisation not possible."
msgstr "Anonymisierung nicht möglich."
-#: mpulsweb/controllers/case.py:348
+#: mpulsweb/controllers/case.py:368
#, python-format
msgid ""
"The case could not be anonymised for the following "
@@ -469,24 +472,25 @@
"möglich:</p><p><i>%s</i></p><p>Bitte klicken Sie auf \"OK\", um zur "
"Fallaktenübersicht fortzufahren.</p>"
-#: mpulsweb/controllers/case.py:377
+#: mpulsweb/controllers/case.py:397
+#, python-format
msgid ""
"Do you really want to anonymise the case and irrecovably lose the "
-"associated personal data? After it the case will not be available you. "
-"The anonymised case will still be considered for the analysis."
+"associated personal data? %s After it the case will not be available you."
+" The anonymised case will still be considered for the analysis.<br>"
msgstr ""
"Wollen Sie wirklich die Fallakte anonymisieren und die personenbezogenen "
-"Daten unwiederbringlich verlieren? Die Fallakte steht danach nicht mehr "
-"zur Bearbeitung zur Verfügung. Die anonymisierte Fallakte wird weiterhin "
-"in der Auswertung berücksichtigt werden."
+"Daten unwiederbringlich verlieren? %s Die Fallakte steht danach nicht "
+"mehr zur Bearbeitung zur Verfügung. Die anonymisierte Fallakte wird "
+"weiterhin in der Auswertung berücksichtigt werden.<br>"
-#: mpulsweb/controllers/case.py:394 mpulsweb/controllers/case.py:411
-#: mpulsweb/controllers/case.py:427 mpulsweb/controllers/case.py:444
-#: mpulsweb/controllers/case.py:454
+#: mpulsweb/controllers/case.py:415 mpulsweb/controllers/case.py:432
+#: mpulsweb/controllers/case.py:448 mpulsweb/controllers/case.py:465
+#: mpulsweb/controllers/case.py:475
msgid "Case document not anonymized!"
msgstr "Fallakte nicht anonymisiert!"
-#: mpulsweb/controllers/case.py:395
+#: mpulsweb/controllers/case.py:416
msgid ""
"The case has not been anonymized because the data could not be uploaded "
"to the meta server one last time because the meta case has been deleted "
@@ -499,7 +503,7 @@
"aufgehoben. Ein weiterer Versuch, die Fallakte zu anonymisieren sollte "
"erfolgreich sein."
-#: mpulsweb/controllers/case.py:412
+#: mpulsweb/controllers/case.py:433
msgid ""
"The case has not been anonymized because the data could not be uploaded "
"to the meta server one last time because the project part does not exist "
@@ -512,7 +516,7 @@
"Projektteil der Meta-Akte aufgehoben. Ein weiterer Versuch, die Fallakte "
"zu anonymisieren sollte erfolgreich sein."
-#: mpulsweb/controllers/case.py:428
+#: mpulsweb/controllers/case.py:449
msgid ""
"The case has not been anonymized because the data could not be uploaded "
"to the meta server one last time because the meta-case has been marked "
@@ -525,7 +529,7 @@
"eventuell wieder hergestellt, so dass später ein weiterer Versuch, die "
"Fallakte zu anonymisieren erfolgreich sein kann."
-#: mpulsweb/controllers/case.py:445
+#: mpulsweb/controllers/case.py:466
msgid ""
"The case can not be anonymized because of an unexpected problem with the "
"meta server."
@@ -533,17 +537,17 @@
"Die Fallakte kann wegen eines unerwarteten Problems mit dem Meta-Server "
"nicht anonymisiert werden."
-#: mpulsweb/controllers/case.py:455
+#: mpulsweb/controllers/case.py:476
msgid "The case can not be anonymized because of an unexpected problem."
msgstr ""
"Die Fallakte kann wegen eines unerwarteten Problems nicht anonymisiert "
"werden."
-#: mpulsweb/controllers/case.py:466
+#: mpulsweb/controllers/case.py:487
msgid "Case document anonymised!"
msgstr "Fallakte anonymisiert!"
-#: mpulsweb/controllers/case.py:467
+#: mpulsweb/controllers/case.py:488
msgid ""
"The personal data of the case document has been deleted and the case "
"document is removed from the overview. Please click on OK, to get back to"
@@ -553,13 +557,13 @@
" aus der Übersicht entfernt. Bitte klicken Sie auf \"OK\", um zur "
"Fallaktenübersicht fortzufahren."
-#: mpulsweb/controllers/case.py:487 mpulsweb/controllers/case_bundle.py:522
+#: mpulsweb/controllers/case.py:508 mpulsweb/controllers/case_bundle.py:522
msgid "Case restored!"
msgid_plural "Cases restored!"
msgstr[0] "Fallakte wiederhergestellt!"
msgstr[1] "Fallakten wiederhergestellt!"
-#: mpulsweb/controllers/case.py:488 mpulsweb/controllers/case_bundle.py:273
+#: mpulsweb/controllers/case.py:509 mpulsweb/controllers/case_bundle.py:273
#: mpulsweb/controllers/case_bundle.py:333
#: mpulsweb/controllers/case_bundle.py:346
#: mpulsweb/controllers/case_bundle.py:404
@@ -578,26 +582,27 @@
msgid "Please click OK to continue."
msgstr "Bitte klicken Sie auf OK, um fortzufahren."
-#: mpulsweb/controllers/case.py:493 mpulsweb/controllers/case_bundle.py:532
+#: mpulsweb/controllers/case.py:514 mpulsweb/controllers/case_bundle.py:532
#: 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:494
+#: mpulsweb/controllers/case.py:515
+#, python-format
msgid ""
-"Do you really want to restore the case? The case will be editable "
-"afterwards again for the users."
+"Do you really want to restore the case?%s The case will be editable "
+"afterwards again for the users.<br>"
msgstr ""
-"Wollen Sie wirklich die Fallakte wiederherstellen? Die Fallakte ist "
-"danach wieder für die Nutzer bearbeitbar."
+"Wollen Sie wirklich die Fallakte wiederherstellen? %s Die Fallakte ist "
+"danach wieder für die Nutzer bearbeitbar.<br>"
-#: mpulsweb/controllers/case.py:660
+#: mpulsweb/controllers/case.py:682
msgid "Case copied!"
msgstr "Fallakte kopiert"
-#: mpulsweb/controllers/case.py:661
+#: mpulsweb/controllers/case.py:683
msgid ""
"The case was succussfully copied and is now available in the case "
"overview. Click on \"OK\" to open the case overview."
@@ -606,11 +611,11 @@
"Fallaktenübersicht zur Verfügung. Klicken Sie auf \"OK\", um die "
"Fallaktenübersicht zu öffnen."
-#: mpulsweb/controllers/case.py:667
+#: mpulsweb/controllers/case.py:689
msgid "Copy case?"
msgstr "Fallakte kopieren?"
-#: mpulsweb/controllers/case.py:668
+#: mpulsweb/controllers/case.py:690
msgid ""
"Do you really want to copy this case? All data will be copied in the new "
"case."
@@ -618,11 +623,11 @@
"Wollen Sie wirklich die Fallakten kopieren? Sämtliche Daten der Fallakte "
"werden dann in einer neuen Fallakte übernommen."
-#: mpulsweb/controllers/case.py:689
+#: mpulsweb/controllers/case.py:711
msgid "Case(s) imported!"
msgstr "Fallakte(n) importiert!"
-#: mpulsweb/controllers/case.py:690
+#: mpulsweb/controllers/case.py:712
msgid ""
"The file was imported successfully. Click on 'OK' to open the case "
"overview."
@@ -630,11 +635,11 @@
"Die Datei wurde erfolgreich importiert. Klicken Sie auf \"OK\", um die "
"Fallaktenübersicht zu öffnen."
-#: mpulsweb/controllers/case.py:696
+#: mpulsweb/controllers/case.py:718
msgid "Case(s) not imported!"
msgstr "Fallakte(n) nicht importiert!"
-#: mpulsweb/controllers/case.py:700
+#: mpulsweb/controllers/case.py:722
msgid ""
"An error occurred during the import. Click 'OK' to return to the import "
"dialog."
@@ -642,17 +647,17 @@
"Bei dem Import ist ein Fehler aufgetreten. Klicken Sie auf \"OK\", um zu "
"dem Importdialog zurückzukehren."
-#: mpulsweb/controllers/case.py:786 mpulsweb/controllers/case.py:807
+#: mpulsweb/controllers/case.py:808 mpulsweb/controllers/case.py:829
msgid "Case storage extended"
msgstr "Aufbewahrung verlängert"
-#: mpulsweb/controllers/case.py:787
+#: mpulsweb/controllers/case.py:809
msgid "Please enter the reason for the case storage extension."
msgstr ""
"Bitte geben Sie hier den Grund für die Verlängerung der "
"Aufbewahrungsfrist ein."
-#: mpulsweb/controllers/case.py:808
+#: mpulsweb/controllers/case.py:830
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 "
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-10-20 16:21:47 UTC (rev 5486)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-10-21 10:01:14 UTC (rev 5487)
@@ -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 12:19+0200\n"
+"POT-Creation-Date: 2011-10-21 11:55+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"
@@ -224,14 +224,14 @@
"and irrevocably lose all the data?"
msgstr ""
-#: mpulsweb/controllers/case.py:72
+#: mpulsweb/controllers/case.py:74
msgid ""
"The meta server did not accept the request because of missing or incorrect "
"username or password. Please check whether the meta-server is configured "
"correctly."
msgstr ""
-#: mpulsweb/controllers/case.py:108 mpulsweb/controllers/case.py:175
+#: mpulsweb/controllers/case.py:124 mpulsweb/controllers/case.py:193
#: mpulsweb/templates/casebundle/dialogs/failure_delete_admin.mako:6
#: mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako:6
#: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:6
@@ -241,11 +241,11 @@
msgid "Case document deleted!"
msgstr ""
-#: mpulsweb/controllers/case.py:109
+#: mpulsweb/controllers/case.py:125
msgid "The case document is given to the administrator for deletion."
msgstr ""
-#: mpulsweb/controllers/case.py:117 mpulsweb/controllers/case.py:135
+#: mpulsweb/controllers/case.py:133 mpulsweb/controllers/case.py:153
#: mpulsweb/controllers/case_bundle.py:280 mpulsweb/controllers/case_bundle.py:300
#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:6
#: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:6
@@ -254,73 +254,75 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case.py:118
+#: mpulsweb/controllers/case.py:134
+#, python-format
msgid ""
-"Do you really want to mark this case for deletion? The case will not be "
-"editable afterwards, and submited to the administration for deletion."
+"Do you really want to mark this case for deletion?%s The case will not be "
+"editable afterwards, and submited to the administration for deletion.<br>"
msgstr ""
-#: mpulsweb/controllers/case.py:136
+#: mpulsweb/controllers/case.py:154
+#, python-format
msgid ""
"Warning! On deleting the case all data will be erased irrecoverable!<br>Only "
"delete the case if this case is <b>not needed for evaluations</b> "
-"anymore.<br><br>Do you want to delete the case from the server?"
+"anymore.<br><br>Do you want to delete the case from the server?%s<br>"
msgstr ""
-#: mpulsweb/controllers/case.py:154 mpulsweb/controllers/case.py:163
+#: mpulsweb/controllers/case.py:172 mpulsweb/controllers/case.py:181
msgid "Case document not deleted!"
msgstr ""
-#: mpulsweb/controllers/case.py:155
+#: mpulsweb/controllers/case.py:173
msgid ""
"The case can not be deleted because of an unexpected problem with the meta "
"server."
msgstr ""
-#: mpulsweb/controllers/case.py:164
+#: mpulsweb/controllers/case.py:182
msgid "The case can not be deleted because of an unexpected problem."
msgstr ""
-#: mpulsweb/controllers/case.py:176
+#: mpulsweb/controllers/case.py:194
msgid "Click on OK to continue."
msgstr ""
-#: mpulsweb/controllers/case.py:203 mpulsweb/controllers/case.py:368
+#: mpulsweb/controllers/case.py:221 mpulsweb/controllers/case.py:388
#: mpulsweb/controllers/privacy.py:121
msgid "Anonymising not possible."
msgstr ""
-#: mpulsweb/controllers/case.py:220 mpulsweb/model/case.py:1412
+#: mpulsweb/controllers/case.py:238 mpulsweb/model/case.py:1412
#: mpulsweb/model/phase.py:302 mpulsweb/templates/casemanagement/caselist.mako:152
#: mpulsweb/templates/phase/phase.mako:51
msgid "Running"
msgstr ""
-#: mpulsweb/controllers/case.py:222 mpulsweb/model/case.py:1414
+#: mpulsweb/controllers/case.py:240 mpulsweb/model/case.py:1414
#: mpulsweb/model/phase.py:304 mpulsweb/templates/casemanagement/caselist.mako:155
#: mpulsweb/templates/phase/phase.mako:53 mpulsweb/templates/phase/phase.mako:55
msgid "Finished"
msgstr ""
-#: mpulsweb/controllers/case.py:224 mpulsweb/controllers/case.py:376
+#: mpulsweb/controllers/case.py:242 mpulsweb/controllers/case.py:396
msgid "Do make anonymous?"
msgstr ""
-#: mpulsweb/controllers/case.py:225
+#: mpulsweb/controllers/case.py:243
#, python-format
msgid ""
-"<p>Do you really want to mark the case for anonymization? The case can then "
-"no longer be edited and will given to the administrators for final "
+"<p>Do you really want to mark the case for anonymization?%s<br>The case can "
+"then no longer be edited and will given to the administrators for final "
"anonymisation.</p><p><b>The case document is going to be anonymised in phase "
-"</b>%s<b>!</b>"
+"</b>%s<b>!</b><br>"
msgstr ""
-#: mpulsweb/controllers/case.py:245 mpulsweb/controllers/case.py:264
-#: mpulsweb/controllers/case.py:281 mpulsweb/controllers/case.py:299
+#: mpulsweb/controllers/case.py:265 mpulsweb/controllers/case.py:284
+#: mpulsweb/controllers/case.py:301 mpulsweb/controllers/case.py:319
msgid "Case document not marked for anonymization!"
msgstr ""
-#: mpulsweb/controllers/case.py:247
+#: mpulsweb/controllers/case.py:267
msgid ""
"The case has not been marked for anonymization because the data could not be "
"uploaded to the meta server because the meta case has been deleted or "
@@ -328,7 +330,7 @@
" attempt to anonymize the case should succeed."
msgstr ""
-#: mpulsweb/controllers/case.py:266
+#: mpulsweb/controllers/case.py:286
msgid ""
"The case has not been marked for anonymization because the data could not be "
"uploaded to the meta server because the project part does not exist anymore. "
@@ -336,7 +338,7 @@
"to anonymize the case should succeed."
msgstr ""
-#: mpulsweb/controllers/case.py:283
+#: mpulsweb/controllers/case.py:303
msgid ""
"The case has not been marked for anonymization because the data could not be "
"uploaded to the meta server because the meta-case has been marked for "
@@ -344,36 +346,36 @@
"restored on the meta-server."
msgstr ""
-#: mpulsweb/controllers/case.py:301
+#: mpulsweb/controllers/case.py:321
msgid ""
"The case has not been marked for anonymization because of an unexpected "
"problem with the meta server."
msgstr ""
-#: mpulsweb/controllers/case.py:312
+#: mpulsweb/controllers/case.py:332
msgid "Case document not marked for anonymisation!"
msgstr ""
-#: mpulsweb/controllers/case.py:313
+#: mpulsweb/controllers/case.py:333
msgid "The case can not be marked for anonymisation because of an unexpected problem."
msgstr ""
-#: mpulsweb/controllers/case.py:330
+#: mpulsweb/controllers/case.py:350
msgid "Case marked for anonymisation."
msgstr ""
-#: mpulsweb/controllers/case.py:331
+#: mpulsweb/controllers/case.py:351
msgid ""
"The case document has been marked for anonymisation and has been given to the"
" administration for final anonymisation. Please click on OK, to get back to "
"the overview."
msgstr ""
-#: mpulsweb/controllers/case.py:347
+#: mpulsweb/controllers/case.py:367
msgid "Anonymisation not possible."
msgstr ""
-#: mpulsweb/controllers/case.py:348
+#: mpulsweb/controllers/case.py:368
#, python-format
msgid ""
"The case could not be anonymised for the following "
@@ -381,20 +383,21 @@
"overview.</p>"
msgstr ""
-#: mpulsweb/controllers/case.py:377
+#: mpulsweb/controllers/case.py:397
+#, python-format
msgid ""
"Do you really want to anonymise the case and irrecovably lose the associated "
-"personal data? After it the case will not be available you. The anonymised "
-"case will still be considered for the analysis."
+"personal data? %s After it the case will not be available you. The anonymised"
+" case will still be considered for the analysis.<br>"
msgstr ""
-#: mpulsweb/controllers/case.py:394 mpulsweb/controllers/case.py:411
-#: mpulsweb/controllers/case.py:427 mpulsweb/controllers/case.py:444
-#: mpulsweb/controllers/case.py:454
+#: mpulsweb/controllers/case.py:415 mpulsweb/controllers/case.py:432
+#: mpulsweb/controllers/case.py:448 mpulsweb/controllers/case.py:465
+#: mpulsweb/controllers/case.py:475
msgid "Case document not anonymized!"
msgstr ""
-#: mpulsweb/controllers/case.py:395
+#: mpulsweb/controllers/case.py:416
msgid ""
"The case has not been anonymized because the data could not be uploaded to "
"the meta server one last time because the meta case has been deleted or "
@@ -402,7 +405,7 @@
" attempt to anonymize the case should succeed."
msgstr ""
-#: mpulsweb/controllers/case.py:412
+#: mpulsweb/controllers/case.py:433
msgid ""
"The case has not been anonymized because the data could not be uploaded to "
"the meta server one last time because the project part does not exist "
@@ -410,7 +413,7 @@
" attempt to anonymize the case should succeed."
msgstr ""
-#: mpulsweb/controllers/case.py:428
+#: mpulsweb/controllers/case.py:449
msgid ""
"The case has not been anonymized because the data could not be uploaded to "
"the meta server one last time because the meta-case has been marked for "
@@ -418,34 +421,34 @@
"restored on the meta-server."
msgstr ""
-#: mpulsweb/controllers/case.py:445
+#: mpulsweb/controllers/case.py:466
msgid ""
"The case can not be anonymized because of an unexpected problem with the meta"
" server."
msgstr ""
-#: mpulsweb/controllers/case.py:455
+#: mpulsweb/controllers/case.py:476
msgid "The case can not be anonymized because of an unexpected problem."
msgstr ""
-#: mpulsweb/controllers/case.py:466
+#: mpulsweb/controllers/case.py:487
msgid "Case document anonymised!"
msgstr ""
-#: mpulsweb/controllers/case.py:467
+#: mpulsweb/controllers/case.py:488
msgid ""
"The personal data of the case document has been deleted and the case document"
" is removed from the overview. Please click on OK, to get back to the "
"overview."
msgstr ""
-#: mpulsweb/controllers/case.py:487 mpulsweb/controllers/case_bundle.py:522
+#: mpulsweb/controllers/case.py:508 mpulsweb/controllers/case_bundle.py:522
msgid "Case restored!"
msgid_plural "Cases restored!"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case.py:488 mpulsweb/controllers/case_bundle.py:273
+#: mpulsweb/controllers/case.py:509 mpulsweb/controllers/case_bundle.py:273
#: mpulsweb/controllers/case_bundle.py:333 mpulsweb/controllers/case_bundle.py:346
#: mpulsweb/controllers/case_bundle.py:404 mpulsweb/controllers/case_bundle.py:422
#: mpulsweb/controllers/case_bundle.py:433 mpulsweb/controllers/case_bundle.py:481
@@ -458,64 +461,65 @@
msgid "Please click OK to continue."
msgstr ""
-#: mpulsweb/controllers/case.py:493 mpulsweb/controllers/case_bundle.py:532
+#: mpulsweb/controllers/case.py:514 mpulsweb/controllers/case_bundle.py:532
#: mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako:6
msgid "Restore case?"
msgid_plural "Restore cases?"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case.py:494
+#: mpulsweb/controllers/case.py:515
+#, python-format
msgid ""
-"Do you really want to restore the case? The case will be editable afterwards "
-"again for the users."
+"Do you really want to restore the case?%s The case will be editable "
+"afterwards again for the users.<br>"
msgstr ""
-#: mpulsweb/controllers/case.py:660
+#: mpulsweb/controllers/case.py:682
msgid "Case copied!"
msgstr ""
-#: mpulsweb/controllers/case.py:661
+#: mpulsweb/controllers/case.py:683
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:667
+#: mpulsweb/controllers/case.py:689
msgid "Copy case?"
msgstr ""
-#: mpulsweb/controllers/case.py:668
+#: mpulsweb/controllers/case.py:690
msgid "Do you really want to copy this case? All data will be copied in the new case."
msgstr ""
-#: mpulsweb/controllers/case.py:689
+#: mpulsweb/controllers/case.py:711
msgid "Case(s) imported!"
msgstr ""
-#: mpulsweb/controllers/case.py:690
+#: mpulsweb/controllers/case.py:712
msgid "The file was imported successfully. Click on 'OK' to open the case overview."
msgstr ""
-#: mpulsweb/controllers/case.py:696
+#: mpulsweb/controllers/case.py:718
msgid "Case(s) not imported!"
msgstr ""
-#: mpulsweb/controllers/case.py:700
+#: mpulsweb/controllers/case.py:722
msgid ""
"An error occurred during the import. Click 'OK' to return to the import "
"dialog."
msgstr ""
-#: mpulsweb/controllers/case.py:786 mpulsweb/controllers/case.py:807
+#: mpulsweb/controllers/case.py:808 mpulsweb/controllers/case.py:829
msgid "Case storage extended"
msgstr ""
-#: mpulsweb/controllers/case.py:787
+#: mpulsweb/controllers/case.py:809
msgid "Please enter the reason for the case storage extension."
msgstr ""
-#: mpulsweb/controllers/case.py:808
+#: mpulsweb/controllers/case.py:830
msgid "The max case storage has been extended. Please click on OK to continue"
msgstr ""
More information about the Mpuls-commits
mailing list