[Mpuls-commits] r5522 - in base/trunk/mpulsweb: controllers i18n i18n/de/LC_MESSAGES templates/usersettings
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Nov 2 15:15:07 CET 2011
Author: ludwig
Date: 2011-11-02 15:15:06 +0100 (Wed, 02 Nov 2011)
New Revision: 5522
Modified:
base/trunk/mpulsweb/controllers/usersettings.py
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/templates/usersettings/change_password.mako
Log:
Issue 2390: Users now need the old password to set a new password.
Create a oldpw_validator and check for the old password in
changePasswordAction. Changed the translation.
Modified: base/trunk/mpulsweb/controllers/usersettings.py
===================================================================
--- base/trunk/mpulsweb/controllers/usersettings.py 2011-11-02 14:11:33 UTC (rev 5521)
+++ base/trunk/mpulsweb/controllers/usersettings.py 2011-11-02 14:15:06 UTC (rev 5522)
@@ -79,11 +79,17 @@
try:
uid = request.params['uid']
c.uo = UserObject(uid)
+ user = session['USER_AUTHORIZED']
+ def validate_oldpasswd(value_dict, userpasswd, validator):
+ if not value_dict.get('oldpasswd') == userpasswd:
+ return {'oldpasswd':_('You must enter your old password.')}
+ oldpw_validator = \
+ formencode.schema.SimpleFormValidator(validate_oldpasswd)
+ oldpw_validator.to_python(request.params, user.password)
form_result = validator.to_python(request.params)
new_pass = c.uo.setPassword(form_result.get('passwd'))
if new_pass:
# Save new password in the session
- user = session['USER_AUTHORIZED']
user.password = new_pass
session['USER_AUTHORIZED'] = user
session.save()
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-11-02 14:11:33 UTC (rev 5521)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-11-02 14:15:06 UTC (rev 5522)
@@ -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-21 11:55+0200\n"
+"PO-Revision-Date: 2011-11-02 15:01+0100\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"
@@ -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:124 mpulsweb/controllers/case.py:193
+#: mpulsweb/controllers/case.py:110 mpulsweb/controllers/case.py:179
#: 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,13 +282,13 @@
msgid "Case document deleted!"
msgstr "Fallakte gelöscht!"
-#: mpulsweb/controllers/case.py:125
+#: mpulsweb/controllers/case.py:111
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:133 mpulsweb/controllers/case.py:153
-#: mpulsweb/controllers/case_bundle.py:280
-#: mpulsweb/controllers/case_bundle.py:300
+#: mpulsweb/controllers/case.py:119 mpulsweb/controllers/case.py:139
+#: mpulsweb/controllers/case_bundle.py:286
+#: mpulsweb/controllers/case_bundle.py:306
#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:6
#: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:6
msgid "Delete case?"
@@ -296,7 +296,7 @@
msgstr[0] "Fallakte löschen?"
msgstr[1] "Fallakten löschen?"
-#: mpulsweb/controllers/case.py:134
+#: mpulsweb/controllers/case.py:120
#, python-format
msgid ""
"Do you really want to mark this case for deletion?%s The case will not be"
@@ -307,7 +307,7 @@
"steht Ihnen danach nicht mehr zur Bearbeitung zur Verfügung und wird der "
"Administration zum Löschen vorgelegt.<br>"
-#: mpulsweb/controllers/case.py:154
+#: mpulsweb/controllers/case.py:140
#, python-format
msgid ""
"Warning! On deleting the case all data will be erased "
@@ -320,11 +320,11 @@
"<em>für Auswertungen nicht mehr berücksichtigt</em>!<br><br>Die Akte "
"jetzt vom Server löschen?%s<br>"
-#: mpulsweb/controllers/case.py:172 mpulsweb/controllers/case.py:181
+#: mpulsweb/controllers/case.py:158 mpulsweb/controllers/case.py:167
msgid "Case document not deleted!"
msgstr "Fallakte nicht gelöscht!"
-#: mpulsweb/controllers/case.py:173
+#: mpulsweb/controllers/case.py:159
msgid ""
"The case can not be deleted because of an unexpected problem with the "
"meta server."
@@ -332,29 +332,29 @@
"Die Fallakte konnte wegen eines unerwarteten Problems mit dem Meta-Server"
" nicht gelöscht werden."
-#: mpulsweb/controllers/case.py:182
+#: mpulsweb/controllers/case.py:168
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:194
+#: mpulsweb/controllers/case.py:180
msgid "Click on OK to continue."
msgstr "Bitte klicken Sie \"OK\", um fortzufahren."
-#: mpulsweb/controllers/case.py:221 mpulsweb/controllers/case.py:388
+#: mpulsweb/controllers/case.py:207 mpulsweb/controllers/case.py:374
#: mpulsweb/controllers/privacy.py:121
msgid "Anonymising not possible."
msgstr "Anonymisierung nicht möglich."
-#: mpulsweb/controllers/case.py:238 mpulsweb/model/case.py:1412
+#: mpulsweb/controllers/case.py:224 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:240 mpulsweb/model/case.py:1414
+#: mpulsweb/controllers/case.py:226 mpulsweb/model/case.py:1414
#: mpulsweb/model/phase.py:304
#: mpulsweb/templates/casemanagement/caselist.mako:155
#: mpulsweb/templates/phase/phase.mako:53
@@ -362,11 +362,11 @@
msgid "Finished"
msgstr "beendet"
-#: mpulsweb/controllers/case.py:242 mpulsweb/controllers/case.py:396
+#: mpulsweb/controllers/case.py:228 mpulsweb/controllers/case.py:382
msgid "Do make anonymous?"
msgstr "Fallakte anonymisieren?"
-#: mpulsweb/controllers/case.py:243
+#: mpulsweb/controllers/case.py:229
#, python-format
msgid ""
"<p>Do you really want to mark the case for anonymization?%s<br>The case "
@@ -379,12 +379,12 @@
"Administratoren zur endgültigen Anonymisierung vorgelegt.</p><p><b>Die "
"Fallakte wird in der Phase </b>%s<b> anonymisiert!</b><br>"
-#: mpulsweb/controllers/case.py:265 mpulsweb/controllers/case.py:284
-#: mpulsweb/controllers/case.py:301 mpulsweb/controllers/case.py:319
+#: mpulsweb/controllers/case.py:251 mpulsweb/controllers/case.py:270
+#: mpulsweb/controllers/case.py:287 mpulsweb/controllers/case.py:305
msgid "Case document not marked for anonymization!"
msgstr "Die Fallakte wurde nicht zur Anonymisierung freigegeben!"
-#: mpulsweb/controllers/case.py:267
+#: mpulsweb/controllers/case.py:253
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"
@@ -397,7 +397,7 @@
"Meta-Akte entfernt. Ein weiterer Versuch, die Fallakte zu anonymisieren "
"sollte erfolgreich sein."
-#: mpulsweb/controllers/case.py:286
+#: mpulsweb/controllers/case.py:272
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 "
@@ -410,7 +410,7 @@
"mit dem Projektteil der Meta-Akte entfernt. Ein weiterer Versuch, die "
"Fallakte zu anonymisieren sollte erfolgreich sein."
-#: mpulsweb/controllers/case.py:303
+#: mpulsweb/controllers/case.py:289
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"
@@ -423,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:321
+#: mpulsweb/controllers/case.py:307
msgid ""
"The case has not been marked for anonymization because of an unexpected "
"problem with the meta server."
@@ -431,11 +431,11 @@
"Die Fallakte wurde nicht zur Anonymisierung freigegeben worden wegen "
"eines unerwarteten Problems mit dem Meta-Server."
-#: mpulsweb/controllers/case.py:332
+#: mpulsweb/controllers/case.py:318
msgid "Case document not marked for anonymisation!"
msgstr "Fallakte nicht zur Anonymisierung freigegeben!"
-#: mpulsweb/controllers/case.py:333
+#: mpulsweb/controllers/case.py:319
msgid ""
"The case can not be marked for anonymisation because of an unexpected "
"problem."
@@ -443,11 +443,11 @@
"Die Fallakte kann wegen eines unerwarteten Problems nicht zur "
"Anonymisierung freigeben werden."
-#: mpulsweb/controllers/case.py:350
+#: mpulsweb/controllers/case.py:336
msgid "Case marked for anonymisation."
msgstr "Fallakte zur Anonymisierung freigegeben."
-#: mpulsweb/controllers/case.py:351
+#: mpulsweb/controllers/case.py:337
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 "
@@ -457,11 +457,11 @@
"Administration zur endgültigen Anonymisierung vor. Bitte klicken Sie auf "
"\"OK\", um zur Fallaktenübersicht fortzufahren."
-#: mpulsweb/controllers/case.py:367
+#: mpulsweb/controllers/case.py:353
msgid "Anonymisation not possible."
msgstr "Anonymisierung nicht möglich."
-#: mpulsweb/controllers/case.py:368
+#: mpulsweb/controllers/case.py:354
#, python-format
msgid ""
"The case could not be anonymised for the following "
@@ -472,7 +472,7 @@
"möglich:</p><p><i>%s</i></p><p>Bitte klicken Sie auf \"OK\", um zur "
"Fallaktenübersicht fortzufahren.</p>"
-#: mpulsweb/controllers/case.py:397
+#: mpulsweb/controllers/case.py:383
#, python-format
msgid ""
"Do you really want to anonymise the case and irrecovably lose the "
@@ -484,13 +484,13 @@
"mehr zur Bearbeitung zur Verfügung. Die anonymisierte Fallakte wird "
"weiterhin in der Auswertung berücksichtigt werden.<br>"
-#: 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
+#: mpulsweb/controllers/case.py:401 mpulsweb/controllers/case.py:418
+#: mpulsweb/controllers/case.py:434 mpulsweb/controllers/case.py:451
+#: mpulsweb/controllers/case.py:461
msgid "Case document not anonymized!"
msgstr "Fallakte nicht anonymisiert!"
-#: mpulsweb/controllers/case.py:416
+#: mpulsweb/controllers/case.py:402
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 "
@@ -503,7 +503,7 @@
"aufgehoben. Ein weiterer Versuch, die Fallakte zu anonymisieren sollte "
"erfolgreich sein."
-#: mpulsweb/controllers/case.py:433
+#: mpulsweb/controllers/case.py:419
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 "
@@ -516,7 +516,7 @@
"Projektteil der Meta-Akte aufgehoben. Ein weiterer Versuch, die Fallakte "
"zu anonymisieren sollte erfolgreich sein."
-#: mpulsweb/controllers/case.py:449
+#: mpulsweb/controllers/case.py:435
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 "
@@ -529,7 +529,7 @@
"eventuell wieder hergestellt, so dass später ein weiterer Versuch, die "
"Fallakte zu anonymisieren erfolgreich sein kann."
-#: mpulsweb/controllers/case.py:466
+#: mpulsweb/controllers/case.py:452
msgid ""
"The case can not be anonymized because of an unexpected problem with the "
"meta server."
@@ -537,17 +537,17 @@
"Die Fallakte kann wegen eines unerwarteten Problems mit dem Meta-Server "
"nicht anonymisiert werden."
-#: mpulsweb/controllers/case.py:476
+#: mpulsweb/controllers/case.py:462
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:487
+#: mpulsweb/controllers/case.py:473
msgid "Case document anonymised!"
msgstr "Fallakte anonymisiert!"
-#: mpulsweb/controllers/case.py:488
+#: mpulsweb/controllers/case.py:474
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"
@@ -557,39 +557,40 @@
" aus der Übersicht entfernt. Bitte klicken Sie auf \"OK\", um zur "
"Fallaktenübersicht fortzufahren."
-#: mpulsweb/controllers/case.py:508 mpulsweb/controllers/case_bundle.py:522
+#: mpulsweb/controllers/case.py:494 mpulsweb/controllers/case_bundle.py:528
msgid "Case restored!"
msgid_plural "Cases restored!"
msgstr[0] "Fallakte wiederhergestellt!"
msgstr[1] "Fallakten wiederhergestellt!"
-#: 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
-#: mpulsweb/controllers/case_bundle.py:495
-#: mpulsweb/controllers/case_bundle.py:506
-#: mpulsweb/controllers/case_bundle.py:526
-#: mpulsweb/controllers/case_bundle.py:560
-#: mpulsweb/controllers/case_bundle.py:583
+#: mpulsweb/controllers/case.py:495 mpulsweb/controllers/case_bundle.py:279
+#: mpulsweb/controllers/case_bundle.py:339
+#: mpulsweb/controllers/case_bundle.py:352
+#: mpulsweb/controllers/case_bundle.py:410
+#: mpulsweb/controllers/case_bundle.py:428
+#: mpulsweb/controllers/case_bundle.py:439
+#: mpulsweb/controllers/case_bundle.py:487
+#: mpulsweb/controllers/case_bundle.py:501
+#: mpulsweb/controllers/case_bundle.py:512
+#: mpulsweb/controllers/case_bundle.py:532
+#: mpulsweb/controllers/case_bundle.py:566
+#: mpulsweb/controllers/case_bundle.py:589
#: mpulsweb/controllers/casedocument.py:57
#: mpulsweb/controllers/casedocument.py:98 mpulsweb/controllers/document.py:76
-#: mpulsweb/controllers/document.py:118 mpulsweb/controllers/usersettings.py:92
-#: mpulsweb/controllers/usersettings.py:127
+#: mpulsweb/controllers/document.py:118
+#: mpulsweb/controllers/usersettings.py:101
+#: mpulsweb/controllers/usersettings.py:136
msgid "Please click OK to continue."
msgstr "Bitte klicken Sie auf OK, um fortzufahren."
-#: mpulsweb/controllers/case.py:514 mpulsweb/controllers/case_bundle.py:532
+#: mpulsweb/controllers/case.py:500 mpulsweb/controllers/case_bundle.py:538
#: 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:515
+#: mpulsweb/controllers/case.py:501
#, python-format
msgid ""
"Do you really want to restore the case?%s The case will be editable "
@@ -598,11 +599,11 @@
"Wollen Sie wirklich die Fallakte wiederherstellen? %s Die Fallakte ist "
"danach wieder für die Nutzer bearbeitbar.<br>"
-#: mpulsweb/controllers/case.py:682
+#: mpulsweb/controllers/case.py:668
msgid "Case copied!"
msgstr "Fallakte kopiert"
-#: mpulsweb/controllers/case.py:683
+#: mpulsweb/controllers/case.py:669
msgid ""
"The case was succussfully copied and is now available in the case "
"overview. Click on \"OK\" to open the case overview."
@@ -611,11 +612,11 @@
"Fallaktenübersicht zur Verfügung. Klicken Sie auf \"OK\", um die "
"Fallaktenübersicht zu öffnen."
-#: mpulsweb/controllers/case.py:689
+#: mpulsweb/controllers/case.py:675
msgid "Copy case?"
msgstr "Fallakte kopieren?"
-#: mpulsweb/controllers/case.py:690
+#: mpulsweb/controllers/case.py:676
msgid ""
"Do you really want to copy this case? All data will be copied in the new "
"case."
@@ -623,11 +624,11 @@
"Wollen Sie wirklich die Fallakten kopieren? Sämtliche Daten der Fallakte "
"werden dann in einer neuen Fallakte übernommen."
-#: mpulsweb/controllers/case.py:711
+#: mpulsweb/controllers/case.py:697
msgid "Case(s) imported!"
msgstr "Fallakte(n) importiert!"
-#: mpulsweb/controllers/case.py:712
+#: mpulsweb/controllers/case.py:698
msgid ""
"The file was imported successfully. Click on 'OK' to open the case "
"overview."
@@ -635,11 +636,11 @@
"Die Datei wurde erfolgreich importiert. Klicken Sie auf \"OK\", um die "
"Fallaktenübersicht zu öffnen."
-#: mpulsweb/controllers/case.py:718
+#: mpulsweb/controllers/case.py:704
msgid "Case(s) not imported!"
msgstr "Fallakte(n) nicht importiert!"
-#: mpulsweb/controllers/case.py:722
+#: mpulsweb/controllers/case.py:708
msgid ""
"An error occurred during the import. Click 'OK' to return to the import "
"dialog."
@@ -647,29 +648,29 @@
"Bei dem Import ist ein Fehler aufgetreten. Klicken Sie auf \"OK\", um zu "
"dem Importdialog zurückzukehren."
-#: mpulsweb/controllers/case.py:808 mpulsweb/controllers/case.py:829
+#: mpulsweb/controllers/case.py:794 mpulsweb/controllers/case.py:815
msgid "Case storage extended"
msgstr "Aufbewahrung verlängert"
-#: mpulsweb/controllers/case.py:809
+#: mpulsweb/controllers/case.py:795
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:830
+#: mpulsweb/controllers/case.py:816
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 "
"\"OK\", um fortzufahren."
-#: mpulsweb/controllers/case_bundle.py:183
+#: mpulsweb/controllers/case_bundle.py:185
msgid "Case was marked for evaluation"
msgid_plural "Cases were marked for evaluation"
msgstr[0] "Fallakte wurde für die Auswertung markiert."
msgstr[1] "Fallakten wurden für die Auswertung markiert."
-#: mpulsweb/controllers/case_bundle.py:187
+#: mpulsweb/controllers/case_bundle.py:189
#, python-format
msgid ""
"%d case was marked for evaluation. All following evaluations will be "
@@ -686,11 +687,11 @@
"Auswertungen werden auf diese Fallakten beschränkt. Bitte klicken sie auf"
" OK um fortzufahren."
-#: mpulsweb/controllers/case_bundle.py:242
+#: mpulsweb/controllers/case_bundle.py:245
msgid "No valid cases in the selection!"
msgstr "Keine gültigen Fälle in der Auswahl!"
-#: mpulsweb/controllers/case_bundle.py:243
+#: mpulsweb/controllers/case_bundle.py:246
msgid ""
"The selected action can not be executed\n"
"on any of the cases in your selection. Please make sure that the cases "
@@ -702,12 +703,12 @@
"Fallakten in einem Zustand befinden, aus dem Sie die Aktion ausführen "
"können."
-#: mpulsweb/controllers/case_bundle.py:253
+#: mpulsweb/controllers/case_bundle.py:259
#: mpulsweb/controllers/evaluation_overview.py:188
msgid "No action specified for the selection"
msgstr "Keine Aktion für die Auswahl angegeben!"
-#: mpulsweb/controllers/case_bundle.py:254
+#: mpulsweb/controllers/case_bundle.py:260
#: mpulsweb/controllers/evaluation_overview.py:189
msgid ""
"You have not selected any action for the\n"
@@ -718,28 +719,28 @@
"OK, um zur Fallaktenübersicht zu gelangen und dort eine Aktion aus dem "
"Auswahlfeld auszuwählen."
-#: mpulsweb/controllers/case_bundle.py:268
+#: mpulsweb/controllers/case_bundle.py:274
msgid "Case deleted!"
msgid_plural "Cases deleted!"
msgstr[0] "Fallakte gelöscht!"
msgstr[1] "Fallakten gelöscht!"
-#: mpulsweb/controllers/case_bundle.py:269
+#: mpulsweb/controllers/case_bundle.py:275
#, python-format
msgid "%s case was successfully cleared for deletion."
msgid_plural "%s cases were successfully cleared for deletion."
msgstr[0] "Es wurde %s Fallakte erfolgreich zum Löschen freigegeben."
msgstr[1] "Es wurden %s Fallakten erfolgreich zum Löschen freigegeben."
-#: mpulsweb/controllers/case_bundle.py:285
-#: mpulsweb/controllers/case_bundle.py:302
+#: mpulsweb/controllers/case_bundle.py:291
+#: mpulsweb/controllers/case_bundle.py:308
#, python-format
msgid "Do you really want to delete the following case?%s"
msgid_plural "Do you really want to delete the following cases?%s"
msgstr[0] "Wollen Sie wirklich die folgende Fallakte löschen?%s"
msgstr[1] "Wollen Sie wirklich die folgenden Fallakten löschen?%s"
-#: mpulsweb/controllers/case_bundle.py:308
+#: mpulsweb/controllers/case_bundle.py:314
msgid ""
"Warning! Deleting cases will erase all data of the case "
"irrecoverably!<br>\n"
@@ -752,46 +753,46 @@
"<em>für Auswertungen nicht mehr berücksichtigt</em>!<br><br>Die Akte "
"jetzt vom Server löschen?"
-#: mpulsweb/controllers/case_bundle.py:326
+#: mpulsweb/controllers/case_bundle.py:332
msgid "Case successfully deleted."
msgid_plural "Cases successfully deleted."
msgstr[0] "Akte gelöscht!"
msgstr[1] "Akten gelöscht!"
-#: mpulsweb/controllers/case_bundle.py:330
+#: mpulsweb/controllers/case_bundle.py:336
msgid "The selected case was successfully deleted."
msgid_plural "All selected cases were successfully deleted."
msgstr[0] "Die ausgewählte Fallaktees wurde gelöscht."
msgstr[1] "Alle ausgewählten Fallakten wurden gelöscht."
-#: mpulsweb/controllers/case_bundle.py:339
+#: mpulsweb/controllers/case_bundle.py:345
msgid "Not all selected cases deleted"
msgstr "Nicht alle ausgewählte Fallakten gelöscht"
-#: mpulsweb/controllers/case_bundle.py:341
+#: mpulsweb/controllers/case_bundle.py:347
#, 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] "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
+#: mpulsweb/controllers/case_bundle.py:355
msgid "No Case deleted"
msgstr "Keine Fallakte gelöscht"
-#: mpulsweb/controllers/case_bundle.py:350
+#: mpulsweb/controllers/case_bundle.py:356
msgid "None of the selected cases could be deleted. Please click OK to continue."
msgstr ""
"Keine der ausgewählten Fallakten konnten gelöscht werden. Bitte klicken "
"Sie auf \"OK\", um zur Fallaktenübersicht fortzufahren."
-#: mpulsweb/controllers/case_bundle.py:368
+#: mpulsweb/controllers/case_bundle.py:374
msgid "Clear case for anonymisation?"
msgid_plural "Clear cases for anonymisation?"
msgstr[0] "Fallakte zur Anonymisierung freigeben?"
msgstr[1] "Fallakten zur Anonymisierung freigeben?"
-#: mpulsweb/controllers/case_bundle.py:372
+#: mpulsweb/controllers/case_bundle.py:378
#, python-format
msgid ""
"Do you really want to clear the following case for anonymisation? The "
@@ -811,13 +812,13 @@
"Die Fallakten stehen Ihnen danach nicht mehr zur Bearbeitung zur "
"Verfügung und werden der Administration zur Anonymisierung vorgelegt.%s"
-#: mpulsweb/controllers/case_bundle.py:393
+#: mpulsweb/controllers/case_bundle.py:399
msgid "Case marked for anonymisation!"
msgid_plural "Cases marked for anonymisation!"
msgstr[0] "Fallakte zur Anonymisierung freigegeben!"
msgstr[1] "Fallakten zur Anonymisierung freigegeben!"
-#: mpulsweb/controllers/case_bundle.py:397
+#: mpulsweb/controllers/case_bundle.py:403
msgid ""
"The selected case was successfully marked for anonymisation. The "
"administrators will review it and perform for the final anonymisation."
@@ -831,11 +832,11 @@
"Alle ausgewählten Fallakten wurden zur Anonymisierung freigegeben. Sie "
"liegen der Administration zur endgültigen Anonymisierung vor."
-#: mpulsweb/controllers/case_bundle.py:410
+#: mpulsweb/controllers/case_bundle.py:416
msgid "Not all cases marked for anonymisation!"
msgstr "Nicht alle Fallakten zur Anonymisierung freigegeben!"
-#: mpulsweb/controllers/case_bundle.py:412
+#: mpulsweb/controllers/case_bundle.py:418
#, python-format
msgid ""
"%(failures)d of the selected cases could not be marked for anonymisation."
@@ -854,25 +855,25 @@
"freigegeben. Die anderen Fallakten liegen der Administration zur "
"endgültigen Anonymisierung vor."
-#: mpulsweb/controllers/case_bundle.py:425
+#: mpulsweb/controllers/case_bundle.py:431
msgid "Case not marked for anonymisation."
msgid_plural "Cases not marked for anonymisation."
msgstr[0] "Fallakte nicht zur Anonymisierung freigeben."
msgstr[1] "Fallakten nicht zur Anonymisierung freigeben."
-#: mpulsweb/controllers/case_bundle.py:428
+#: mpulsweb/controllers/case_bundle.py:434
msgid "The selected case was not marked for anonymisation."
msgid_plural "None of the selected cases were marked for anonymisation."
msgstr[0] "Die ausgewählte Fallakte wurde nicht zur Anonymisierung freigegeben."
msgstr[1] "Die ausgewählte Fallakten wurden nicht zur Anonymisierung freigegeben."
-#: mpulsweb/controllers/case_bundle.py:448
+#: mpulsweb/controllers/case_bundle.py:454
msgid "Anonymise case?"
msgid_plural "Anonymise cases?"
msgstr[0] "Fallakte anonymisieren?"
msgstr[1] "Fallakten anonymisieren?"
-#: mpulsweb/controllers/case_bundle.py:451
+#: mpulsweb/controllers/case_bundle.py:457
#, python-format
msgid ""
"Do you really want to anonymise the case and irrevocably lose its "
@@ -893,49 +894,49 @@
"mehr zur Bearbeitung zur Verfügung. Die anonymisierten Fallakten werden "
"weiterhin in der Auswertung berücksichtigt werden.%s"
-#: mpulsweb/controllers/case_bundle.py:472
+#: mpulsweb/controllers/case_bundle.py:478
msgid "Case anonymised!"
msgid_plural "Cases anonymised!"
msgstr[0] "Fallakte anonymisiert!"
msgstr[1] "Fallakten anonymisiert!"
-#: mpulsweb/controllers/case_bundle.py:476
+#: mpulsweb/controllers/case_bundle.py:482
msgid "The selected case has been anonymised successfully."
msgid_plural "The selected cases have been anonymised successfully."
msgstr[0] "Die ausgewählte Fallakte wurde erfolgreich anonymisiert."
msgstr[1] "Die ausgewählten Fallakten wurden erfolgreich anonymisiert."
-#: mpulsweb/controllers/case_bundle.py:487
+#: mpulsweb/controllers/case_bundle.py:493
msgid "Not all cases anonymized."
msgstr "Nicht alle Fallakten anonymisiert."
-#: mpulsweb/controllers/case_bundle.py:489
+#: mpulsweb/controllers/case_bundle.py:495
#, 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] "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
+#: mpulsweb/controllers/case_bundle.py:504
msgid "Case not anonymized."
msgid_plural "Cases not anonymized."
msgstr[0] "Fallakte nicht anonymisiert."
msgstr[1] "Fallakten nicht anonymisiert."
-#: mpulsweb/controllers/case_bundle.py:501
+#: mpulsweb/controllers/case_bundle.py:507
msgid "The selected case has not been anonymized."
msgid_plural "None of the selected cases have been anonymized."
msgstr[0] "Die ausgewählte Fallakte wurde nicht anonymisiert."
msgstr[1] "Keine der ausgewählten Fallakten wurde anonymisiert."
-#: mpulsweb/controllers/case_bundle.py:524
+#: mpulsweb/controllers/case_bundle.py:530
#, python-format
msgid "%s was successfully restored."
msgid_plural "%s were successfully restored."
msgstr[0] "Es wurde %s Fallakte erfolgreich wiederhergestellt."
msgstr[1] "Es wurden %s Fallakten erfolgreich wiederhergestellt."
-#: mpulsweb/controllers/case_bundle.py:538
+#: mpulsweb/controllers/case_bundle.py:544
#, python-format
msgid ""
"Do you really want to restore the following case? It will be available "
@@ -950,47 +951,47 @@
"Wollen Sie wirklich die folgenden Fallakten wiederherstellen? Die "
"Fallakten stehen danach wieder zur Bearbeitung zur Verfügung. %s"
-#: mpulsweb/controllers/case_bundle.py:555
+#: mpulsweb/controllers/case_bundle.py:561
msgid "Editor appointed!"
msgstr "Bearbeitung übertragen!"
-#: mpulsweb/controllers/case_bundle.py:557
+#: mpulsweb/controllers/case_bundle.py:563
#, python-format
msgid "%s case was successfully transferred to %s %s"
msgid_plural "%s cases were successfully transferred to %s %s"
msgstr[0] "Es wurde %s Fallakte erfolgreich an %s %s übertragen."
msgstr[1] "Es wurden %s Fallakten erfolgreich an %s %s übertragen."
-#: mpulsweb/controllers/case_bundle.py:578
+#: mpulsweb/controllers/case_bundle.py:584
msgid "Stand-in appointed!"
msgstr "Vertretung zugewiesen!"
-#: mpulsweb/controllers/case_bundle.py:580
+#: mpulsweb/controllers/case_bundle.py:586
#, python-format
msgid "%s case was successfully assigned to a substitute."
msgid_plural "%s cases were successfully assigned to a substitute."
msgstr[0] "Es wurde für %s Fallakte erfolgreich die Vertretung zugewiesen."
msgstr[1] "Es wurden für %s Fallakten erfolgreich die Vertretung zugewiesen."
-#: mpulsweb/controllers/case_bundle.py:611
+#: mpulsweb/controllers/case_bundle.py:617
msgid "Export case?"
msgid_plural "Export cases?"
msgstr[0] "Fallakte exportieren?"
msgstr[1] "Fallakten exportieren?"
-#: mpulsweb/controllers/case_bundle.py:648 mpulsweb/lib/helpers.py:89
+#: mpulsweb/controllers/case_bundle.py:654 mpulsweb/lib/helpers.py:89
#: mpulsweb/lib/helpers.py:94 mpulsweb/templates/casemanagement/digest.mako:166
msgid "unknown"
msgstr "unbekannt"
-#: mpulsweb/controllers/case_bundle.py:652
+#: mpulsweb/controllers/case_bundle.py:658
#, python-format
msgid "%d Case was marked for %s"
msgid_plural "%d Cases were marked for %s"
msgstr[0] "%d Fallakte wurde für den '%s' markiert."
msgstr[1] "%d Fallakten wurden für den '%s' markiert."
-#: mpulsweb/controllers/case_bundle.py:655
+#: mpulsweb/controllers/case_bundle.py:661
#, python-format
msgid ""
"%d case can be exported. Please click on 'Download' to download the "
@@ -1653,21 +1654,31 @@
msgid "Please click on ok to continue."
msgstr "Bitte klicken Sie auf OK, um fortzufahren."
-#: mpulsweb/controllers/usersettings.py:90
-#: mpulsweb/controllers/usersettings.py:125
+#: mpulsweb/controllers/usersettings.py:86
+#: mpulsweb/templates/usersettings/change_password.mako:34
+#: mpulsweb/templates/usersettings/change_password.mako:37
+msgid "Enter old password"
+msgstr "Altes Passwort eingeben"
+
+#: mpulsweb/controllers/usersettings.py:87
+msgid "You must enter your old password."
+msgstr "Sie müssen Ihr altes Passwort eingeben."
+
+#: mpulsweb/controllers/usersettings.py:99
+#: mpulsweb/controllers/usersettings.py:134
msgid "User password changed!"
msgstr "Benutzerpasswort geändert!"
-#: mpulsweb/controllers/usersettings.py:91
-#: mpulsweb/controllers/usersettings.py:126
+#: mpulsweb/controllers/usersettings.py:100
+#: mpulsweb/controllers/usersettings.py:135
msgid "You password was successfully changed"
msgstr "Ihr Passwort wurde erfolgreich geändert."
-#: mpulsweb/controllers/usersettings.py:167
+#: mpulsweb/controllers/usersettings.py:176
msgid "Standin saved!"
msgstr "Vertretung gespeichert!"
-#: mpulsweb/controllers/usersettings.py:168
+#: mpulsweb/controllers/usersettings.py:177
msgid "Your standin is saved. Please click on ok to continue."
msgstr ""
"Ihre Standard-Vertretung wurde gespeichert. Bitte klicken Sie auf OK, um "
@@ -1683,7 +1694,7 @@
msgid "Default Text"
msgstr "Vorgabe Text"
-#: mpulsweb/lib/export.py:242
+#: mpulsweb/lib/export.py:251
msgid "Table"
msgstr "Tabelle"
@@ -2201,8 +2212,8 @@
#: mpulsweb/templates/administration/new_user.mako:7
#: mpulsweb/templates/auth/main.mako:29
#: mpulsweb/templates/usersettings/change_password.mako:11
-#: mpulsweb/templates/usersettings/change_password.mako:34
-#: mpulsweb/templates/usersettings/change_password.mako:37
+#: mpulsweb/templates/usersettings/change_password.mako:43
+#: mpulsweb/templates/usersettings/change_password.mako:46
#: mpulsweb/templates/usersettings/change_password_login.mako:20
#: mpulsweb/templates/usersettings/change_password_login.mako:23
msgid "Enter new password"
@@ -2212,8 +2223,8 @@
#: mpulsweb/templates/administration/new_user.mako:8
#: mpulsweb/templates/auth/main.mako:30
#: mpulsweb/templates/usersettings/change_password.mako:12
-#: mpulsweb/templates/usersettings/change_password.mako:43
-#: mpulsweb/templates/usersettings/change_password.mako:46
+#: mpulsweb/templates/usersettings/change_password.mako:52
+#: mpulsweb/templates/usersettings/change_password.mako:55
#: mpulsweb/templates/usersettings/change_password_login.mako:29
#: mpulsweb/templates/usersettings/change_password_login.mako:32
msgid "Repeat pasword"
@@ -3907,6 +3918,7 @@
msgstr "Druckansicht"
#: mpulsweb/templates/logbook/overview.mako:65
+#: mpulsweb/templates/logbook/overview_print.mako:36
#: mpulsweb/templates/logbook/show.mako:41
msgid "Type"
msgstr "Art"
@@ -4712,23 +4724,23 @@
msgid "Settings saved!"
msgstr "Einstellungen gespeichert!"
-#: mpulsweb/templates/tags/tags.mako:20
+#: mpulsweb/templates/tags/tags.mako:22
msgid "Evaluation"
msgstr "Auswertung"
-#: mpulsweb/templates/tags/tags.mako:44
+#: mpulsweb/templates/tags/tags.mako:48
msgid "Validities"
msgstr "Validitäten"
-#: mpulsweb/templates/tags/tags.mako:68
+#: mpulsweb/templates/tags/tags.mako:74
msgid "Rule-Check"
msgstr "Regelüberprüfungen"
-#: mpulsweb/templates/tags/tags.mako:94
+#: mpulsweb/templates/tags/tags.mako:100
msgid "Data is consitent!"
msgstr "Daten sind konsistent"
-#: mpulsweb/templates/tags/tags.mako:95
+#: mpulsweb/templates/tags/tags.mako:101
msgid "The rule based validation on the data was successfull. No errors found."
msgstr ""
"Die regelbasierte Überprüfung der Daten war erfolgreich. Es wurden keine "
@@ -4752,7 +4764,7 @@
"Das neue Passwort muss aus mindestens acht Zeichen bestehen und zwei "
"Nicht-Buchstaben enthalten. "
-#: mpulsweb/templates/usersettings/change_password.mako:53
+#: mpulsweb/templates/usersettings/change_password.mako:62
#: mpulsweb/templates/usersettings/change_password_login.mako:38
msgid "Save"
msgstr "Speichern"
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-11-02 14:11:33 UTC (rev 5521)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-11-02 14:15:06 UTC (rev 5522)
@@ -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-21 11:55+0200\n"
+"POT-Creation-Date: 2011-11-02 15:01+0100\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"
@@ -231,7 +231,7 @@
"correctly."
msgstr ""
-#: mpulsweb/controllers/case.py:124 mpulsweb/controllers/case.py:193
+#: mpulsweb/controllers/case.py:110 mpulsweb/controllers/case.py:179
#: 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,12 +241,12 @@
msgid "Case document deleted!"
msgstr ""
-#: mpulsweb/controllers/case.py:125
+#: mpulsweb/controllers/case.py:111
msgid "The case document is given to the administrator for deletion."
msgstr ""
-#: mpulsweb/controllers/case.py:133 mpulsweb/controllers/case.py:153
-#: mpulsweb/controllers/case_bundle.py:280 mpulsweb/controllers/case_bundle.py:300
+#: mpulsweb/controllers/case.py:119 mpulsweb/controllers/case.py:139
+#: mpulsweb/controllers/case_bundle.py:286 mpulsweb/controllers/case_bundle.py:306
#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:6
#: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:6
msgid "Delete case?"
@@ -254,14 +254,14 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case.py:134
+#: mpulsweb/controllers/case.py:120
#, python-format
msgid ""
"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:154
+#: mpulsweb/controllers/case.py:140
#, python-format
msgid ""
"Warning! On deleting the case all data will be erased irrecoverable!<br>Only "
@@ -269,46 +269,46 @@
"anymore.<br><br>Do you want to delete the case from the server?%s<br>"
msgstr ""
-#: mpulsweb/controllers/case.py:172 mpulsweb/controllers/case.py:181
+#: mpulsweb/controllers/case.py:158 mpulsweb/controllers/case.py:167
msgid "Case document not deleted!"
msgstr ""
-#: mpulsweb/controllers/case.py:173
+#: mpulsweb/controllers/case.py:159
msgid ""
"The case can not be deleted because of an unexpected problem with the meta "
"server."
msgstr ""
-#: mpulsweb/controllers/case.py:182
+#: mpulsweb/controllers/case.py:168
msgid "The case can not be deleted because of an unexpected problem."
msgstr ""
-#: mpulsweb/controllers/case.py:194
+#: mpulsweb/controllers/case.py:180
msgid "Click on OK to continue."
msgstr ""
-#: mpulsweb/controllers/case.py:221 mpulsweb/controllers/case.py:388
+#: mpulsweb/controllers/case.py:207 mpulsweb/controllers/case.py:374
#: mpulsweb/controllers/privacy.py:121
msgid "Anonymising not possible."
msgstr ""
-#: mpulsweb/controllers/case.py:238 mpulsweb/model/case.py:1412
+#: mpulsweb/controllers/case.py:224 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:240 mpulsweb/model/case.py:1414
+#: mpulsweb/controllers/case.py:226 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:242 mpulsweb/controllers/case.py:396
+#: mpulsweb/controllers/case.py:228 mpulsweb/controllers/case.py:382
msgid "Do make anonymous?"
msgstr ""
-#: mpulsweb/controllers/case.py:243
+#: mpulsweb/controllers/case.py:229
#, python-format
msgid ""
"<p>Do you really want to mark the case for anonymization?%s<br>The case can "
@@ -317,12 +317,12 @@
"</b>%s<b>!</b><br>"
msgstr ""
-#: mpulsweb/controllers/case.py:265 mpulsweb/controllers/case.py:284
-#: mpulsweb/controllers/case.py:301 mpulsweb/controllers/case.py:319
+#: mpulsweb/controllers/case.py:251 mpulsweb/controllers/case.py:270
+#: mpulsweb/controllers/case.py:287 mpulsweb/controllers/case.py:305
msgid "Case document not marked for anonymization!"
msgstr ""
-#: mpulsweb/controllers/case.py:267
+#: mpulsweb/controllers/case.py:253
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 "
@@ -330,7 +330,7 @@
" attempt to anonymize the case should succeed."
msgstr ""
-#: mpulsweb/controllers/case.py:286
+#: mpulsweb/controllers/case.py:272
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. "
@@ -338,7 +338,7 @@
"to anonymize the case should succeed."
msgstr ""
-#: mpulsweb/controllers/case.py:303
+#: mpulsweb/controllers/case.py:289
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 "
@@ -346,36 +346,36 @@
"restored on the meta-server."
msgstr ""
-#: mpulsweb/controllers/case.py:321
+#: mpulsweb/controllers/case.py:307
msgid ""
"The case has not been marked for anonymization because of an unexpected "
"problem with the meta server."
msgstr ""
-#: mpulsweb/controllers/case.py:332
+#: mpulsweb/controllers/case.py:318
msgid "Case document not marked for anonymisation!"
msgstr ""
-#: mpulsweb/controllers/case.py:333
+#: mpulsweb/controllers/case.py:319
msgid "The case can not be marked for anonymisation because of an unexpected problem."
msgstr ""
-#: mpulsweb/controllers/case.py:350
+#: mpulsweb/controllers/case.py:336
msgid "Case marked for anonymisation."
msgstr ""
-#: mpulsweb/controllers/case.py:351
+#: mpulsweb/controllers/case.py:337
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:367
+#: mpulsweb/controllers/case.py:353
msgid "Anonymisation not possible."
msgstr ""
-#: mpulsweb/controllers/case.py:368
+#: mpulsweb/controllers/case.py:354
#, python-format
msgid ""
"The case could not be anonymised for the following "
@@ -383,7 +383,7 @@
"overview.</p>"
msgstr ""
-#: mpulsweb/controllers/case.py:397
+#: mpulsweb/controllers/case.py:383
#, python-format
msgid ""
"Do you really want to anonymise the case and irrecovably lose the associated "
@@ -391,13 +391,13 @@
" case will still be considered for the analysis.<br>"
msgstr ""
-#: 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
+#: mpulsweb/controllers/case.py:401 mpulsweb/controllers/case.py:418
+#: mpulsweb/controllers/case.py:434 mpulsweb/controllers/case.py:451
+#: mpulsweb/controllers/case.py:461
msgid "Case document not anonymized!"
msgstr ""
-#: mpulsweb/controllers/case.py:416
+#: mpulsweb/controllers/case.py:402
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 "
@@ -405,7 +405,7 @@
" attempt to anonymize the case should succeed."
msgstr ""
-#: mpulsweb/controllers/case.py:433
+#: mpulsweb/controllers/case.py:419
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 "
@@ -413,7 +413,7 @@
" attempt to anonymize the case should succeed."
msgstr ""
-#: mpulsweb/controllers/case.py:449
+#: mpulsweb/controllers/case.py:435
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 "
@@ -421,115 +421,115 @@
"restored on the meta-server."
msgstr ""
-#: mpulsweb/controllers/case.py:466
+#: mpulsweb/controllers/case.py:452
msgid ""
"The case can not be anonymized because of an unexpected problem with the meta"
" server."
msgstr ""
-#: mpulsweb/controllers/case.py:476
+#: mpulsweb/controllers/case.py:462
msgid "The case can not be anonymized because of an unexpected problem."
msgstr ""
-#: mpulsweb/controllers/case.py:487
+#: mpulsweb/controllers/case.py:473
msgid "Case document anonymised!"
msgstr ""
-#: mpulsweb/controllers/case.py:488
+#: mpulsweb/controllers/case.py:474
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:508 mpulsweb/controllers/case_bundle.py:522
+#: mpulsweb/controllers/case.py:494 mpulsweb/controllers/case_bundle.py:528
msgid "Case restored!"
msgid_plural "Cases restored!"
msgstr[0] ""
msgstr[1] ""
-#: 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
-#: mpulsweb/controllers/case_bundle.py:495 mpulsweb/controllers/case_bundle.py:506
-#: mpulsweb/controllers/case_bundle.py:526 mpulsweb/controllers/case_bundle.py:560
-#: mpulsweb/controllers/case_bundle.py:583 mpulsweb/controllers/casedocument.py:57
+#: mpulsweb/controllers/case.py:495 mpulsweb/controllers/case_bundle.py:279
+#: mpulsweb/controllers/case_bundle.py:339 mpulsweb/controllers/case_bundle.py:352
+#: mpulsweb/controllers/case_bundle.py:410 mpulsweb/controllers/case_bundle.py:428
+#: mpulsweb/controllers/case_bundle.py:439 mpulsweb/controllers/case_bundle.py:487
+#: mpulsweb/controllers/case_bundle.py:501 mpulsweb/controllers/case_bundle.py:512
+#: mpulsweb/controllers/case_bundle.py:532 mpulsweb/controllers/case_bundle.py:566
+#: mpulsweb/controllers/case_bundle.py:589 mpulsweb/controllers/casedocument.py:57
#: mpulsweb/controllers/casedocument.py:98 mpulsweb/controllers/document.py:76
-#: mpulsweb/controllers/document.py:118 mpulsweb/controllers/usersettings.py:92
-#: mpulsweb/controllers/usersettings.py:127
+#: mpulsweb/controllers/document.py:118 mpulsweb/controllers/usersettings.py:101
+#: mpulsweb/controllers/usersettings.py:136
msgid "Please click OK to continue."
msgstr ""
-#: mpulsweb/controllers/case.py:514 mpulsweb/controllers/case_bundle.py:532
+#: mpulsweb/controllers/case.py:500 mpulsweb/controllers/case_bundle.py:538
#: mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako:6
msgid "Restore case?"
msgid_plural "Restore cases?"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case.py:515
+#: mpulsweb/controllers/case.py:501
#, python-format
msgid ""
"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:682
+#: mpulsweb/controllers/case.py:668
msgid "Case copied!"
msgstr ""
-#: mpulsweb/controllers/case.py:683
+#: mpulsweb/controllers/case.py:669
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:689
+#: mpulsweb/controllers/case.py:675
msgid "Copy case?"
msgstr ""
-#: mpulsweb/controllers/case.py:690
+#: mpulsweb/controllers/case.py:676
msgid "Do you really want to copy this case? All data will be copied in the new case."
msgstr ""
-#: mpulsweb/controllers/case.py:711
+#: mpulsweb/controllers/case.py:697
msgid "Case(s) imported!"
msgstr ""
-#: mpulsweb/controllers/case.py:712
+#: mpulsweb/controllers/case.py:698
msgid "The file was imported successfully. Click on 'OK' to open the case overview."
msgstr ""
-#: mpulsweb/controllers/case.py:718
+#: mpulsweb/controllers/case.py:704
msgid "Case(s) not imported!"
msgstr ""
-#: mpulsweb/controllers/case.py:722
+#: mpulsweb/controllers/case.py:708
msgid ""
"An error occurred during the import. Click 'OK' to return to the import "
"dialog."
msgstr ""
-#: mpulsweb/controllers/case.py:808 mpulsweb/controllers/case.py:829
+#: mpulsweb/controllers/case.py:794 mpulsweb/controllers/case.py:815
msgid "Case storage extended"
msgstr ""
-#: mpulsweb/controllers/case.py:809
+#: mpulsweb/controllers/case.py:795
msgid "Please enter the reason for the case storage extension."
msgstr ""
-#: mpulsweb/controllers/case.py:830
+#: mpulsweb/controllers/case.py:816
msgid "The max case storage has been extended. Please click on OK to continue"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:183
+#: mpulsweb/controllers/case_bundle.py:185
msgid "Case was marked for evaluation"
msgid_plural "Cases were marked for evaluation"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:187
+#: mpulsweb/controllers/case_bundle.py:189
#, python-format
msgid ""
"%d case was marked for evaluation. All following evaluations will be limited "
@@ -540,23 +540,23 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:242
+#: mpulsweb/controllers/case_bundle.py:245
msgid "No valid cases in the selection!"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:243
+#: mpulsweb/controllers/case_bundle.py:246
msgid ""
"The selected action can not be executed\n"
"on any of the cases in your selection. Please make sure that the cases are\n"
"in a state from which you can execute the selected action."
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:253
+#: mpulsweb/controllers/case_bundle.py:259
#: mpulsweb/controllers/evaluation_overview.py:188
msgid "No action specified for the selection"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:254
+#: mpulsweb/controllers/case_bundle.py:260
#: mpulsweb/controllers/evaluation_overview.py:189
msgid ""
"You have not selected any action for the\n"
@@ -564,27 +564,27 @@
"an action from the drop down menu."
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:268
+#: mpulsweb/controllers/case_bundle.py:274
msgid "Case deleted!"
msgid_plural "Cases deleted!"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:269
+#: mpulsweb/controllers/case_bundle.py:275
#, python-format
msgid "%s case was successfully cleared for deletion."
msgid_plural "%s cases were successfully cleared for deletion."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:285 mpulsweb/controllers/case_bundle.py:302
+#: mpulsweb/controllers/case_bundle.py:291 mpulsweb/controllers/case_bundle.py:308
#, python-format
msgid "Do you really want to delete the following case?%s"
msgid_plural "Do you really want to delete the following cases?%s"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:308
+#: mpulsweb/controllers/case_bundle.py:314
msgid ""
"Warning! Deleting cases will erase all data of the case irrecoverably!<br>\n"
"Only delete the case if this case is <b>not needed for evaluations</b> "
@@ -592,44 +592,44 @@
"Do you want to delete the case from the server?"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:326
+#: mpulsweb/controllers/case_bundle.py:332
msgid "Case successfully deleted."
msgid_plural "Cases successfully deleted."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:330
+#: mpulsweb/controllers/case_bundle.py:336
msgid "The selected case was successfully deleted."
msgid_plural "All selected cases were successfully deleted."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:339
+#: mpulsweb/controllers/case_bundle.py:345
msgid "Not all selected cases deleted"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:341
+#: mpulsweb/controllers/case_bundle.py:347
#, 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] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:349
+#: mpulsweb/controllers/case_bundle.py:355
msgid "No Case deleted"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:350
+#: mpulsweb/controllers/case_bundle.py:356
msgid "None of the selected cases could be deleted. Please click OK to continue."
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:368
+#: mpulsweb/controllers/case_bundle.py:374
msgid "Clear case for anonymisation?"
msgid_plural "Clear cases for anonymisation?"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:372
+#: mpulsweb/controllers/case_bundle.py:378
#, python-format
msgid ""
"Do you really want to clear the following case for anonymisation? The case "
@@ -642,13 +642,13 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:393
+#: mpulsweb/controllers/case_bundle.py:399
msgid "Case marked for anonymisation!"
msgid_plural "Cases marked for anonymisation!"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:397
+#: mpulsweb/controllers/case_bundle.py:403
msgid ""
"The selected case was successfully marked for anonymisation. The "
"administrators will review it and perform for the final anonymisation."
@@ -658,11 +658,11 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:410
+#: mpulsweb/controllers/case_bundle.py:416
msgid "Not all cases marked for anonymisation!"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:412
+#: mpulsweb/controllers/case_bundle.py:418
#, python-format
msgid ""
"%(failures)d of the selected cases could not be marked for anonymisation. The"
@@ -675,25 +675,25 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:425
+#: mpulsweb/controllers/case_bundle.py:431
msgid "Case not marked for anonymisation."
msgid_plural "Cases not marked for anonymisation."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:428
+#: mpulsweb/controllers/case_bundle.py:434
msgid "The selected case was not marked for anonymisation."
msgid_plural "None of the selected cases were marked for anonymisation."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:448
+#: mpulsweb/controllers/case_bundle.py:454
msgid "Anonymise case?"
msgid_plural "Anonymise cases?"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:451
+#: mpulsweb/controllers/case_bundle.py:457
#, python-format
msgid ""
"Do you really want to anonymise the case and irrevocably lose its personal "
@@ -706,49 +706,49 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:472
+#: mpulsweb/controllers/case_bundle.py:478
msgid "Case anonymised!"
msgid_plural "Cases anonymised!"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:476
+#: mpulsweb/controllers/case_bundle.py:482
msgid "The selected case has been anonymised successfully."
msgid_plural "The selected cases have been anonymised successfully."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:487
+#: mpulsweb/controllers/case_bundle.py:493
msgid "Not all cases anonymized."
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:489
+#: mpulsweb/controllers/case_bundle.py:495
#, 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] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:498
+#: mpulsweb/controllers/case_bundle.py:504
msgid "Case not anonymized."
msgid_plural "Cases not anonymized."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:501
+#: mpulsweb/controllers/case_bundle.py:507
msgid "The selected case has not been anonymized."
msgid_plural "None of the selected cases have been anonymized."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:524
+#: mpulsweb/controllers/case_bundle.py:530
#, python-format
msgid "%s was successfully restored."
msgid_plural "%s were successfully restored."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:538
+#: mpulsweb/controllers/case_bundle.py:544
#, python-format
msgid ""
"Do you really want to restore the following case? It will be available again "
@@ -759,47 +759,47 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:555
+#: mpulsweb/controllers/case_bundle.py:561
msgid "Editor appointed!"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:557
+#: mpulsweb/controllers/case_bundle.py:563
#, python-format
msgid "%s case was successfully transferred to %s %s"
msgid_plural "%s cases were successfully transferred to %s %s"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:578
+#: mpulsweb/controllers/case_bundle.py:584
msgid "Stand-in appointed!"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:580
+#: mpulsweb/controllers/case_bundle.py:586
#, python-format
msgid "%s case was successfully assigned to a substitute."
msgid_plural "%s cases were successfully assigned to a substitute."
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:611
+#: mpulsweb/controllers/case_bundle.py:617
msgid "Export case?"
msgid_plural "Export cases?"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:648 mpulsweb/lib/helpers.py:89
+#: mpulsweb/controllers/case_bundle.py:654 mpulsweb/lib/helpers.py:89
#: mpulsweb/lib/helpers.py:94 mpulsweb/templates/casemanagement/digest.mako:166
msgid "unknown"
msgstr ""
-#: mpulsweb/controllers/case_bundle.py:652
+#: mpulsweb/controllers/case_bundle.py:658
#, python-format
msgid "%d Case was marked for %s"
msgid_plural "%d Cases were marked for %s"
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/case_bundle.py:655
+#: mpulsweb/controllers/case_bundle.py:661
#, python-format
msgid ""
"%d case can be exported. Please click on 'Download' to download the exported "
@@ -1327,19 +1327,30 @@
msgid "Please click on ok to continue."
msgstr ""
-#: mpulsweb/controllers/usersettings.py:90 mpulsweb/controllers/usersettings.py:125
+#: mpulsweb/controllers/usersettings.py:86
+#: mpulsweb/templates/usersettings/change_password.mako:34
+#: mpulsweb/templates/usersettings/change_password.mako:37
+msgid "Enter old password"
+msgstr ""
+
+#: mpulsweb/controllers/usersettings.py:87
+msgid "You must enter your old password."
+msgstr ""
+
+#: mpulsweb/controllers/usersettings.py:99 mpulsweb/controllers/usersettings.py:134
msgid "User password changed!"
msgstr ""
-#: mpulsweb/controllers/usersettings.py:91 mpulsweb/controllers/usersettings.py:126
+#: mpulsweb/controllers/usersettings.py:100
+#: mpulsweb/controllers/usersettings.py:135
msgid "You password was successfully changed"
msgstr ""
-#: mpulsweb/controllers/usersettings.py:167
+#: mpulsweb/controllers/usersettings.py:176
msgid "Standin saved!"
msgstr ""
-#: mpulsweb/controllers/usersettings.py:168
+#: mpulsweb/controllers/usersettings.py:177
msgid "Your standin is saved. Please click on ok to continue."
msgstr ""
@@ -1353,7 +1364,7 @@
msgid "Default Text"
msgstr ""
-#: mpulsweb/lib/export.py:242
+#: mpulsweb/lib/export.py:251
msgid "Table"
msgstr ""
@@ -1837,8 +1848,8 @@
#: mpulsweb/templates/administration/new_user.mako:7
#: mpulsweb/templates/auth/main.mako:29
#: mpulsweb/templates/usersettings/change_password.mako:11
-#: mpulsweb/templates/usersettings/change_password.mako:34
-#: mpulsweb/templates/usersettings/change_password.mako:37
+#: mpulsweb/templates/usersettings/change_password.mako:43
+#: mpulsweb/templates/usersettings/change_password.mako:46
#: mpulsweb/templates/usersettings/change_password_login.mako:20
#: mpulsweb/templates/usersettings/change_password_login.mako:23
msgid "Enter new password"
@@ -1848,8 +1859,8 @@
#: mpulsweb/templates/administration/new_user.mako:8
#: mpulsweb/templates/auth/main.mako:30
#: mpulsweb/templates/usersettings/change_password.mako:12
-#: mpulsweb/templates/usersettings/change_password.mako:43
-#: mpulsweb/templates/usersettings/change_password.mako:46
+#: mpulsweb/templates/usersettings/change_password.mako:52
+#: mpulsweb/templates/usersettings/change_password.mako:55
#: mpulsweb/templates/usersettings/change_password_login.mako:29
#: mpulsweb/templates/usersettings/change_password_login.mako:32
msgid "Repeat pasword"
@@ -3495,6 +3506,7 @@
msgstr ""
#: mpulsweb/templates/logbook/overview.mako:65
+#: mpulsweb/templates/logbook/overview_print.mako:36
#: mpulsweb/templates/logbook/show.mako:41
msgid "Type"
msgstr ""
@@ -4193,23 +4205,23 @@
msgid "Settings saved!"
msgstr ""
-#: mpulsweb/templates/tags/tags.mako:20
+#: mpulsweb/templates/tags/tags.mako:22
msgid "Evaluation"
msgstr ""
-#: mpulsweb/templates/tags/tags.mako:44
+#: mpulsweb/templates/tags/tags.mako:48
msgid "Validities"
msgstr ""
-#: mpulsweb/templates/tags/tags.mako:68
+#: mpulsweb/templates/tags/tags.mako:74
msgid "Rule-Check"
msgstr ""
-#: mpulsweb/templates/tags/tags.mako:94
+#: mpulsweb/templates/tags/tags.mako:100
msgid "Data is consitent!"
msgstr ""
-#: mpulsweb/templates/tags/tags.mako:95
+#: mpulsweb/templates/tags/tags.mako:101
msgid "The rule based validation on the data was successfull. No errors found."
msgstr ""
@@ -4229,7 +4241,7 @@
"character at least. "
msgstr ""
-#: mpulsweb/templates/usersettings/change_password.mako:53
+#: mpulsweb/templates/usersettings/change_password.mako:62
#: mpulsweb/templates/usersettings/change_password_login.mako:38
msgid "Save"
msgstr ""
Modified: base/trunk/mpulsweb/templates/usersettings/change_password.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/change_password.mako 2011-11-02 14:11:33 UTC (rev 5521)
+++ base/trunk/mpulsweb/templates/usersettings/change_password.mako 2011-11-02 14:15:06 UTC (rev 5522)
@@ -30,26 +30,35 @@
<div class="import_box_dialog">
<form action="${h.url_for(controller="usersettings", action="changePasswordAction")}" method="POST" autocomplete="off">
<div>
+ % if c.form_errors.get('oldpasswd'):
+ <label class="import_label" for="oldpasswd" class="error_font"><strong class="import_number">1. </strong>${_('Enter old password')}:</label>
+ <input type="password" class="field error_box" id="oldpasswd" name="oldpasswd">
+ % else:
+ <label class="import_label" for="oldpasswd"><strong class="import_number">1. </strong>${_('Enter old password')}:</label>
+ <input type="password" class="field" id="oldpasswd" name="oldpasswd">
+ % endif
+</div>
+<div>
% if c.form_errors.get('passwd'):
- <label class="import_label" for="passwd" class="error_font"><strong class="import_number">1. </strong>${_('Enter new password')}:</label>
+ <label class="import_label" for="passwd" class="error_font"><strong class="import_number">2. </strong>${_('Enter new password')}:</label>
<input type="password" class="field error_box" id="passwd" name="passwd">
% else:
- <label class="import_label" for="passwd"><strong class="import_number">1. </strong>${_('Enter new password')}:</label>
+ <label class="import_label" for="passwd"><strong class="import_number">2. </strong>${_('Enter new password')}:</label>
<input type="password" class="field" id="passwd" name="passwd">
% endif
</div>
<div>
% if c.form_errors.get('passwd2'):
- <label class="import_label" for="passwd2" class="error_font"><strong class="import_number">2. </strong>${_('Repeat pasword')}:</label>
+ <label class="import_label" for="passwd2" class="error_font"><strong class="import_number">3. </strong>${_('Repeat pasword')}:</label>
<input type="password" class="field error_box" id="passwd2" name="passwd2">
% else:
- <label class="import_label" for="passwd2"><strong class="import_number">2. </strong>${_('Repeat pasword')}:</label>
+ <label class="import_label" for="passwd2"><strong class="import_number">3. </strong>${_('Repeat pasword')}:</label>
<input type="password" class="field" id="passwd2" name="passwd2">
% endif
</div>
<div>
<input type="hidden" name="uid" value="${h.getUserId()}">
- <label class="import_label" for="passwd2"><strong class="import_number">3. </strong>Neues Passwort speichern:</label>
+ <label class="import_label" for="passwd2"><strong class="import_number">4. </strong>Neues Passwort speichern:</label>
<input id="account_pw_sub" class="btn_space" type="submit" value="${_('Save')}">
</div>
</form>
More information about the Mpuls-commits
mailing list