[Mpuls-commits] r5667 - in base/trunk/mpulsweb: i18n i18n/de/LC_MESSAGES lib templates/usersettings
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Nov 25 11:48:16 CET 2011
Author: ludwig
Date: 2011-11-25 11:48:15 +0100 (Fri, 25 Nov 2011)
New Revision: 5667
Modified:
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/lib/validators.py
base/trunk/mpulsweb/templates/usersettings/change_password.mako
Log:
Issue 2079: change password length to 12 letters in the validator.
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-11-24 20:25:06 UTC (rev 5666)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-11-25 10:48:15 UTC (rev 5667)
@@ -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-11-18 21:19+0100\n"
+"PO-Revision-Date: 2011-11-25 11:44+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"
@@ -347,14 +347,14 @@
msgid "Anonymising not possible."
msgstr "Anonymisierung nicht möglich."
-#: mpulsweb/controllers/case.py:218 mpulsweb/model/case.py:1458
+#: mpulsweb/controllers/case.py:218 mpulsweb/model/case.py:1463
#: mpulsweb/model/phase.py:302
#: mpulsweb/templates/casemanagement/caselist.mako:154
#: mpulsweb/templates/phase/phase.mako:51
msgid "Running"
msgstr "laufend"
-#: mpulsweb/controllers/case.py:220 mpulsweb/model/case.py:1460
+#: mpulsweb/controllers/case.py:220 mpulsweb/model/case.py:1465
#: mpulsweb/model/phase.py:304
#: mpulsweb/templates/casemanagement/caselist.mako:157
#: mpulsweb/templates/phase/phase.mako:53
@@ -598,11 +598,11 @@
"Wollen Sie wirklich die Fallakte wiederherstellen? %s Die Fallakte ist "
"danach wieder für die Nutzer bearbeitbar.<br>"
-#: mpulsweb/controllers/case.py:661
+#: mpulsweb/controllers/case.py:662
msgid "Case copied!"
msgstr "Fallakte kopiert"
-#: mpulsweb/controllers/case.py:662
+#: mpulsweb/controllers/case.py:663
msgid ""
"The case was succussfully copied and is now available in the case "
"overview. Click on \"OK\" to open the case overview."
@@ -611,11 +611,11 @@
"Fallaktenübersicht zur Verfügung. Klicken Sie auf \"OK\", um die "
"Fallaktenübersicht zu öffnen."
-#: mpulsweb/controllers/case.py:668
+#: mpulsweb/controllers/case.py:669
msgid "Copy case?"
msgstr "Fallakte kopieren?"
-#: mpulsweb/controllers/case.py:669
+#: mpulsweb/controllers/case.py:670
msgid ""
"Do you really want to copy this case? All data will be copied in the new "
"case."
@@ -623,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:696
+#: mpulsweb/controllers/case.py:697
msgid "Case(s) imported!"
msgstr "Fallakte(n) importiert!"
-#: mpulsweb/controllers/case.py:697
+#: mpulsweb/controllers/case.py:698
msgid ""
"The file was imported successfully. Click on 'OK' to open the case "
"overview."
@@ -635,11 +635,11 @@
"Die Datei wurde erfolgreich importiert. Klicken Sie auf \"OK\", um die "
"Fallaktenübersicht zu öffnen."
-#: mpulsweb/controllers/case.py:703
+#: mpulsweb/controllers/case.py:704
msgid "Case(s) not imported!"
msgstr "Fallakte(n) nicht importiert!"
-#: mpulsweb/controllers/case.py:707
+#: mpulsweb/controllers/case.py:708
msgid ""
"An error occurred during the import. Click 'OK' to return to the import "
"dialog."
@@ -647,33 +647,33 @@
"Bei dem Import ist ein Fehler aufgetreten. Klicken Sie auf \"OK\", um zu "
"dem Importdialog zurückzukehren."
-#: mpulsweb/controllers/case.py:748
+#: mpulsweb/controllers/case.py:749
msgid "Editor successfully set."
msgstr "Bearbeiter/in erfolgreich gesetzt."
-#: mpulsweb/controllers/case.py:754
+#: mpulsweb/controllers/case.py:755
msgid "Error! Editor cannot be set."
msgstr "Fehler! Bearbeiter/in nicht gesetzt."
-#: mpulsweb/controllers/case.py:766
+#: mpulsweb/controllers/case.py:767
msgid "Standin successfully set."
msgstr "Vertretung erfolgreich gesetzt."
-#: mpulsweb/controllers/case.py:771
+#: mpulsweb/controllers/case.py:772
msgid "Error! Standin is not set."
msgstr "Fehler! Vertretung nicht gesetzt."
-#: mpulsweb/controllers/case.py:794 mpulsweb/controllers/case.py:815
+#: mpulsweb/controllers/case.py:795 mpulsweb/controllers/case.py:816
msgid "Case storage extended"
msgstr "Aufbewahrung verlängert"
-#: mpulsweb/controllers/case.py:795
+#: mpulsweb/controllers/case.py:796
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:816
+#: mpulsweb/controllers/case.py:817
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 "
@@ -995,7 +995,7 @@
msgstr[1] "Fallakten exportieren?"
#: mpulsweb/controllers/case_bundle.py:660 mpulsweb/lib/helpers.py:91
-#: mpulsweb/lib/helpers.py:96 mpulsweb/templates/casemanagement/digest.mako:166
+#: mpulsweb/lib/helpers.py:96 mpulsweb/templates/casemanagement/digest.mako:167
msgid "unknown"
msgstr "unbekannt"
@@ -1104,11 +1104,11 @@
"Auswertungen werden auf diese Agenturen beschränkt. Bitte klicken sie auf"
" OK um fortzufahren."
-#: mpulsweb/controllers/formularpage.py:209
+#: mpulsweb/controllers/formularpage.py:213
msgid "Phase automatically changed"
msgstr "Phase automatisch gewechselt"
-#: mpulsweb/controllers/formularpage.py:210
+#: mpulsweb/controllers/formularpage.py:214
#, python-format
msgid ""
"The phase of the case was changed automatically after checking the filled"
@@ -1120,11 +1120,11 @@
"Bitte klicken Sie auf 'Ok', um mit der Bearbeitung der Fallakte "
"fortzufahren."
-#: mpulsweb/controllers/formularpage.py:215
+#: mpulsweb/controllers/formularpage.py:219
msgid "Change phase?"
msgstr "Phase wechseln?"
-#: mpulsweb/controllers/formularpage.py:216
+#: mpulsweb/controllers/formularpage.py:220
#, python-format
msgid ""
"After checking the filled out required fields, it seems that a phase "
@@ -1641,15 +1641,15 @@
"Fallakte ggf. gegen Regeln verstoßen kann, was eine Anonymisierung "
"verhindern kann. Bitte beachten Sie folgende Meldungen."
-#: mpulsweb/controllers/repeatgroup.py:43
+#: mpulsweb/controllers/repeatgroup.py:38
msgid "Repeat group not found."
msgstr "Wiederholung nicht gefunden"
-#: mpulsweb/controllers/repeatgroup.py:62
+#: mpulsweb/controllers/repeatgroup.py:57
msgid "Delete dataset?"
msgstr "Datensatz löschen?"
-#: mpulsweb/controllers/repeatgroup.py:63
+#: mpulsweb/controllers/repeatgroup.py:58
msgid ""
"Do you want to delete this dataset and\n"
"irrevocably lose the data?"
@@ -1657,7 +1657,7 @@
"Wollen Sie wirklich den Datensatz löschen und die Daten unwiederbringlich"
" verlieren?"
-#: mpulsweb/controllers/repeatgroup.py:80
+#: mpulsweb/controllers/repeatgroup.py:73
msgid "repeat group container not found."
msgstr "Wiederholungscontainer nicht gefunden"
@@ -1813,38 +1813,38 @@
msgid "Error on fetching data for formletter"
msgstr "Fehler beim Laden der Daten für Serienbrieffunktion"
-#: mpulsweb/model/case.py:1410 mpulsweb/model/case.py:1411
+#: mpulsweb/model/case.py:1415 mpulsweb/model/case.py:1416
#: mpulsweb/templates/casemanagement/caselist.mako:183
#: mpulsweb/templates/casemanagement/caselist.mako:184
#: mpulsweb/templates/search/search.mako:75
msgid "Editable"
msgstr "Bearbeitbar"
-#: mpulsweb/model/case.py:1412
+#: mpulsweb/model/case.py:1417
msgid "Outstanding deleted"
msgstr "Schwebend gelöscht"
-#: mpulsweb/model/case.py:1413
+#: mpulsweb/model/case.py:1418
msgid "Outstanding made anonymous"
msgstr "Schwebend anonymisiert"
-#: mpulsweb/model/case.py:1414
+#: mpulsweb/model/case.py:1419
msgid "Make anonymous"
msgstr "Anonymisiert"
-#: mpulsweb/model/case.py:1591
+#: mpulsweb/model/case.py:1596
#, python-format
msgid "The case with UUID '%s' could not be imported due to rule violations"
msgstr ""
"Der Fall mit der UUID '%s' konnte wegen Regelverletzungen nicht "
"importiert werden."
-#: mpulsweb/model/case.py:1625
+#: mpulsweb/model/case.py:1630
#, python-format
msgid "The case with UUID '%s' was anonymized already."
msgstr "Der Fall mit der UUID '%s' wurde bereits anonymisiert."
-#: mpulsweb/model/case.py:1628
+#: mpulsweb/model/case.py:1633
#, python-format
msgid ""
"The case with UUID '%s' is either marked for anonymization or marked for "
@@ -1853,7 +1853,7 @@
"Der Fall mit der UUID '%s' ist entweder schwebend anonymisiert oder "
"schwebend gelöscht."
-#: mpulsweb/model/case.py:1660
+#: mpulsweb/model/case.py:1665
#, python-format
msgid "The XML file has the version '%s', but supported is only version '%s'"
msgstr ""
@@ -2217,8 +2217,8 @@
#: mpulsweb/templates/administration/new_user.mako:7
#: mpulsweb/templates/auth/main.mako:29
#: mpulsweb/templates/usersettings/change_password.mako:10
-#: mpulsweb/templates/usersettings/change_password.mako:42
-#: mpulsweb/templates/usersettings/change_password.mako:45
+#: 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"
@@ -2228,8 +2228,8 @@
#: mpulsweb/templates/administration/new_user.mako:8
#: mpulsweb/templates/auth/main.mako:30
#: mpulsweb/templates/usersettings/change_password.mako:11
-#: mpulsweb/templates/usersettings/change_password.mako:51
-#: mpulsweb/templates/usersettings/change_password.mako:54
+#: 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"
@@ -2897,7 +2897,7 @@
#: mpulsweb/templates/casebundle/standin.mako:28
#: mpulsweb/templates/casemanagement/digest.mako:66
-#: mpulsweb/templates/casemanagement/digest.mako:80
+#: mpulsweb/templates/casemanagement/digest.mako:81
#: mpulsweb/templates/casemanagement/dialogs/confirm_export.mako:10
#: mpulsweb/templates/dialogs/confirm.mako:4
#: mpulsweb/templates/dialogs/confirm_case.mako:5
@@ -2914,7 +2914,7 @@
#: mpulsweb/templates/casemanagement/caselist.mako:32
#: mpulsweb/templates/casemanagement/caselist.mako:167
#: mpulsweb/templates/casemanagement/caselist.mako:168
-#: mpulsweb/templates/casemanagement/digest.mako:117
+#: mpulsweb/templates/casemanagement/digest.mako:118
#: mpulsweb/templates/casemanagement/organisation.mako:16
#: mpulsweb/templates/casemanagement/organisation.mako:49
#: mpulsweb/templates/casemanagement/organisation.mako:78
@@ -3110,31 +3110,31 @@
msgid "Max save duration exceeded!"
msgstr "Maximale Speicherdauer überschritten!"
-#: mpulsweb/templates/casemanagement/digest.mako:93
+#: mpulsweb/templates/casemanagement/digest.mako:94
msgid "Last modification"
msgstr "Letzte Bearbeitung"
-#: mpulsweb/templates/casemanagement/digest.mako:96
+#: mpulsweb/templates/casemanagement/digest.mako:97
msgid "Days to exceed the max save duration"
msgstr "Tage bis zum Überschreiten der maximalen Speicherdauer"
-#: mpulsweb/templates/casemanagement/digest.mako:99
+#: mpulsweb/templates/casemanagement/digest.mako:100
msgid "Days to next automatic reminder of the case document"
msgstr "Tage bis zur nächsten automatischen Wiedervorlage der Fallakte"
-#: mpulsweb/templates/casemanagement/digest.mako:109
+#: mpulsweb/templates/casemanagement/digest.mako:110
msgid "Information on case"
msgstr "Informationen zur Fallakte"
-#: mpulsweb/templates/casemanagement/digest.mako:112
+#: mpulsweb/templates/casemanagement/digest.mako:113
msgid "ID"
msgstr "ID"
-#: mpulsweb/templates/casemanagement/digest.mako:123
+#: mpulsweb/templates/casemanagement/digest.mako:124
msgid "Casetype"
msgstr "Fallart"
-#: mpulsweb/templates/casemanagement/digest.mako:128
+#: mpulsweb/templates/casemanagement/digest.mako:129
#: mpulsweb/templates/casemanagement/main.mako:27
#: mpulsweb/templates/evaluation/evaluate.mako:34
#: mpulsweb/templates/phase/phase.mako:21
@@ -3143,25 +3143,25 @@
msgid "Phase"
msgstr "Phase"
-#: mpulsweb/templates/casemanagement/digest.mako:133
+#: mpulsweb/templates/casemanagement/digest.mako:134
msgid "Validity"
msgstr "Validität"
-#: mpulsweb/templates/casemanagement/digest.mako:144
+#: mpulsweb/templates/casemanagement/digest.mako:145
msgid "Start and Enddates"
msgstr "Start- und Enddatum"
-#: mpulsweb/templates/casemanagement/digest.mako:157
+#: mpulsweb/templates/casemanagement/digest.mako:158
#: mpulsweb/templates/search/search.mako:108
msgid "Start date"
msgstr "Startdatum"
-#: mpulsweb/templates/casemanagement/digest.mako:158
+#: mpulsweb/templates/casemanagement/digest.mako:159
#: mpulsweb/templates/search/search.mako:117
msgid "End date"
msgstr "Enddatum"
-#: mpulsweb/templates/casemanagement/digest.mako:159
+#: mpulsweb/templates/casemanagement/digest.mako:160
#: mpulsweb/templates/phase/phase.mako:157
msgid "Duration in weeks"
msgstr "Dauer in Wochen"
@@ -4757,29 +4757,30 @@
"Fehler gefunden."
#: mpulsweb/templates/usersettings/change_password.mako:6
-#: mpulsweb/templates/usersettings/change_password.mako:16
+#: mpulsweb/templates/usersettings/change_password.mako:17
msgid "Change password"
msgstr "Benutzerpasswort ändern"
-#: mpulsweb/templates/usersettings/change_password.mako:21
+#: mpulsweb/templates/usersettings/change_password.mako:12
+#: mpulsweb/templates/usersettings/change_password.mako:34
+#: mpulsweb/templates/usersettings/change_password.mako:37
+msgid "Enter old password"
+msgstr "Altes Passwort eingeben"
+
+#: mpulsweb/templates/usersettings/change_password.mako:22
#: mpulsweb/templates/usersettings/edit_standin.mako:11
msgid "Back to: My Account"
msgstr "Zurück zu: Mein Konto"
-#: mpulsweb/templates/usersettings/change_password.mako:28
+#: mpulsweb/templates/usersettings/change_password.mako:29
msgid ""
-"The new password must contain of 8 letter at least and must contain 2 "
+"The new password must contain of 12 letter at least and must contain 2 "
"non-character at least. "
msgstr ""
-"Das neue Passwort muss aus mindestens acht Zeichen bestehen und zwei "
+"Das neue Passwort muss aus mindestens zwölf Zeichen bestehen und zwei "
"Nicht-Buchstaben enthalten. "
-#: mpulsweb/templates/usersettings/change_password.mako:33
-#: mpulsweb/templates/usersettings/change_password.mako:36
-msgid "Enter old password"
-msgstr "Altes Passwort eingeben"
-
-#: mpulsweb/templates/usersettings/change_password.mako:60
+#: mpulsweb/templates/usersettings/change_password.mako:61
#: mpulsweb/templates/usersettings/change_password_login.mako:37
msgid "Save"
msgstr "Speichern"
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-11-24 20:25:06 UTC (rev 5666)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-11-25 10:48:15 UTC (rev 5667)
@@ -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-11-18 21:17+0100\n"
+"POT-Creation-Date: 2011-11-25 11:43+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"
@@ -292,13 +292,13 @@
msgid "Anonymising not possible."
msgstr ""
-#: mpulsweb/controllers/case.py:218 mpulsweb/model/case.py:1458
+#: mpulsweb/controllers/case.py:218 mpulsweb/model/case.py:1463
#: mpulsweb/model/phase.py:302 mpulsweb/templates/casemanagement/caselist.mako:154
#: mpulsweb/templates/phase/phase.mako:51
msgid "Running"
msgstr ""
-#: mpulsweb/controllers/case.py:220 mpulsweb/model/case.py:1460
+#: mpulsweb/controllers/case.py:220 mpulsweb/model/case.py:1465
#: mpulsweb/model/phase.py:304 mpulsweb/templates/casemanagement/caselist.mako:157
#: mpulsweb/templates/phase/phase.mako:53 mpulsweb/templates/phase/phase.mako:55
msgid "Finished"
@@ -475,67 +475,67 @@
"afterwards again for the users.<br>"
msgstr ""
-#: mpulsweb/controllers/case.py:661
+#: mpulsweb/controllers/case.py:662
msgid "Case copied!"
msgstr ""
-#: mpulsweb/controllers/case.py:662
+#: mpulsweb/controllers/case.py:663
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:668
+#: mpulsweb/controllers/case.py:669
msgid "Copy case?"
msgstr ""
-#: mpulsweb/controllers/case.py:669
+#: mpulsweb/controllers/case.py:670
msgid "Do you really want to copy this case? All data will be copied in the new case."
msgstr ""
-#: mpulsweb/controllers/case.py:696
+#: mpulsweb/controllers/case.py:697
msgid "Case(s) imported!"
msgstr ""
-#: mpulsweb/controllers/case.py:697
+#: mpulsweb/controllers/case.py:698
msgid "The file was imported successfully. Click on 'OK' to open the case overview."
msgstr ""
-#: mpulsweb/controllers/case.py:703
+#: mpulsweb/controllers/case.py:704
msgid "Case(s) not imported!"
msgstr ""
-#: mpulsweb/controllers/case.py:707
+#: 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:748
+#: mpulsweb/controllers/case.py:749
msgid "Editor successfully set."
msgstr ""
-#: mpulsweb/controllers/case.py:754
+#: mpulsweb/controllers/case.py:755
msgid "Error! Editor cannot be set."
msgstr ""
-#: mpulsweb/controllers/case.py:766
+#: mpulsweb/controllers/case.py:767
msgid "Standin successfully set."
msgstr ""
-#: mpulsweb/controllers/case.py:771
+#: mpulsweb/controllers/case.py:772
msgid "Error! Standin is not set."
msgstr ""
-#: mpulsweb/controllers/case.py:794 mpulsweb/controllers/case.py:815
+#: mpulsweb/controllers/case.py:795 mpulsweb/controllers/case.py:816
msgid "Case storage extended"
msgstr ""
-#: mpulsweb/controllers/case.py:795
+#: mpulsweb/controllers/case.py:796
msgid "Please enter the reason for the case storage extension."
msgstr ""
-#: mpulsweb/controllers/case.py:816
+#: mpulsweb/controllers/case.py:817
msgid "The max case storage has been extended. Please click on OK to continue"
msgstr ""
@@ -804,7 +804,7 @@
msgstr[1] ""
#: mpulsweb/controllers/case_bundle.py:660 mpulsweb/lib/helpers.py:91
-#: mpulsweb/lib/helpers.py:96 mpulsweb/templates/casemanagement/digest.mako:166
+#: mpulsweb/lib/helpers.py:96 mpulsweb/templates/casemanagement/digest.mako:167
msgid "unknown"
msgstr ""
@@ -893,11 +893,11 @@
msgstr[0] ""
msgstr[1] ""
-#: mpulsweb/controllers/formularpage.py:209
+#: mpulsweb/controllers/formularpage.py:213
msgid "Phase automatically changed"
msgstr ""
-#: mpulsweb/controllers/formularpage.py:210
+#: mpulsweb/controllers/formularpage.py:214
#, python-format
msgid ""
"The phase of the case was changed automatically after checking the filled out"
@@ -905,11 +905,11 @@
"to proceed editing the case."
msgstr ""
-#: mpulsweb/controllers/formularpage.py:215
+#: mpulsweb/controllers/formularpage.py:219
msgid "Change phase?"
msgstr ""
-#: mpulsweb/controllers/formularpage.py:216
+#: mpulsweb/controllers/formularpage.py:220
#, python-format
msgid ""
"After checking the filled out required fields, it seems that a phase change "
@@ -1317,21 +1317,21 @@
msgid "The case will be anonymised if you retract the privacy statement."
msgstr ""
-#: mpulsweb/controllers/repeatgroup.py:43
+#: mpulsweb/controllers/repeatgroup.py:38
msgid "Repeat group not found."
msgstr ""
-#: mpulsweb/controllers/repeatgroup.py:62
+#: mpulsweb/controllers/repeatgroup.py:57
msgid "Delete dataset?"
msgstr ""
-#: mpulsweb/controllers/repeatgroup.py:63
+#: mpulsweb/controllers/repeatgroup.py:58
msgid ""
"Do you want to delete this dataset and\n"
"irrevocably lose the data?"
msgstr ""
-#: mpulsweb/controllers/repeatgroup.py:80
+#: mpulsweb/controllers/repeatgroup.py:73
msgid "repeat group container not found."
msgstr ""
@@ -1471,43 +1471,43 @@
msgid "Error on fetching data for formletter"
msgstr ""
-#: mpulsweb/model/case.py:1410 mpulsweb/model/case.py:1411
+#: mpulsweb/model/case.py:1415 mpulsweb/model/case.py:1416
#: mpulsweb/templates/casemanagement/caselist.mako:183
#: mpulsweb/templates/casemanagement/caselist.mako:184
#: mpulsweb/templates/search/search.mako:75
msgid "Editable"
msgstr ""
-#: mpulsweb/model/case.py:1412
+#: mpulsweb/model/case.py:1417
msgid "Outstanding deleted"
msgstr ""
-#: mpulsweb/model/case.py:1413
+#: mpulsweb/model/case.py:1418
msgid "Outstanding made anonymous"
msgstr ""
-#: mpulsweb/model/case.py:1414
+#: mpulsweb/model/case.py:1419
msgid "Make anonymous"
msgstr ""
-#: mpulsweb/model/case.py:1591
+#: mpulsweb/model/case.py:1596
#, python-format
msgid "The case with UUID '%s' could not be imported due to rule violations"
msgstr ""
-#: mpulsweb/model/case.py:1625
+#: mpulsweb/model/case.py:1630
#, python-format
msgid "The case with UUID '%s' was anonymized already."
msgstr ""
-#: mpulsweb/model/case.py:1628
+#: mpulsweb/model/case.py:1633
#, python-format
msgid ""
"The case with UUID '%s' is either marked for anonymization or marked for "
"deletion."
msgstr ""
-#: mpulsweb/model/case.py:1660
+#: mpulsweb/model/case.py:1665
#, python-format
msgid "The XML file has the version '%s', but supported is only version '%s'"
msgstr ""
@@ -1853,8 +1853,8 @@
#: mpulsweb/templates/administration/new_user.mako:7
#: mpulsweb/templates/auth/main.mako:29
#: mpulsweb/templates/usersettings/change_password.mako:10
-#: mpulsweb/templates/usersettings/change_password.mako:42
-#: mpulsweb/templates/usersettings/change_password.mako:45
+#: 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"
@@ -1864,8 +1864,8 @@
#: mpulsweb/templates/administration/new_user.mako:8
#: mpulsweb/templates/auth/main.mako:30
#: mpulsweb/templates/usersettings/change_password.mako:11
-#: mpulsweb/templates/usersettings/change_password.mako:51
-#: mpulsweb/templates/usersettings/change_password.mako:54
+#: 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"
@@ -2527,7 +2527,7 @@
#: mpulsweb/templates/casebundle/standin.mako:28
#: mpulsweb/templates/casemanagement/digest.mako:66
-#: mpulsweb/templates/casemanagement/digest.mako:80
+#: mpulsweb/templates/casemanagement/digest.mako:81
#: mpulsweb/templates/casemanagement/dialogs/confirm_export.mako:10
#: mpulsweb/templates/dialogs/confirm.mako:4
#: mpulsweb/templates/dialogs/confirm_case.mako:5
@@ -2544,7 +2544,7 @@
#: mpulsweb/templates/casemanagement/caselist.mako:32
#: mpulsweb/templates/casemanagement/caselist.mako:167
#: mpulsweb/templates/casemanagement/caselist.mako:168
-#: mpulsweb/templates/casemanagement/digest.mako:117
+#: mpulsweb/templates/casemanagement/digest.mako:118
#: mpulsweb/templates/casemanagement/organisation.mako:16
#: mpulsweb/templates/casemanagement/organisation.mako:49
#: mpulsweb/templates/casemanagement/organisation.mako:78
@@ -2737,31 +2737,31 @@
msgid "Max save duration exceeded!"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:93
+#: mpulsweb/templates/casemanagement/digest.mako:94
msgid "Last modification"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:96
+#: mpulsweb/templates/casemanagement/digest.mako:97
msgid "Days to exceed the max save duration"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:99
+#: mpulsweb/templates/casemanagement/digest.mako:100
msgid "Days to next automatic reminder of the case document"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:109
+#: mpulsweb/templates/casemanagement/digest.mako:110
msgid "Information on case"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:112
+#: mpulsweb/templates/casemanagement/digest.mako:113
msgid "ID"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:123
+#: mpulsweb/templates/casemanagement/digest.mako:124
msgid "Casetype"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:128
+#: mpulsweb/templates/casemanagement/digest.mako:129
#: mpulsweb/templates/casemanagement/main.mako:27
#: mpulsweb/templates/evaluation/evaluate.mako:34
#: mpulsweb/templates/phase/phase.mako:21 mpulsweb/templates/phase/phase.mako:156
@@ -2769,25 +2769,25 @@
msgid "Phase"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:133
+#: mpulsweb/templates/casemanagement/digest.mako:134
msgid "Validity"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:144
+#: mpulsweb/templates/casemanagement/digest.mako:145
msgid "Start and Enddates"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:157
+#: mpulsweb/templates/casemanagement/digest.mako:158
#: mpulsweb/templates/search/search.mako:108
msgid "Start date"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:158
+#: mpulsweb/templates/casemanagement/digest.mako:159
#: mpulsweb/templates/search/search.mako:117
msgid "End date"
msgstr ""
-#: mpulsweb/templates/casemanagement/digest.mako:159
+#: mpulsweb/templates/casemanagement/digest.mako:160
#: mpulsweb/templates/phase/phase.mako:157
msgid "Duration in weeks"
msgstr ""
@@ -4238,27 +4238,28 @@
msgstr ""
#: mpulsweb/templates/usersettings/change_password.mako:6
-#: mpulsweb/templates/usersettings/change_password.mako:16
+#: mpulsweb/templates/usersettings/change_password.mako:17
msgid "Change password"
msgstr ""
-#: mpulsweb/templates/usersettings/change_password.mako:21
+#: mpulsweb/templates/usersettings/change_password.mako:12
+#: mpulsweb/templates/usersettings/change_password.mako:34
+#: mpulsweb/templates/usersettings/change_password.mako:37
+msgid "Enter old password"
+msgstr ""
+
+#: mpulsweb/templates/usersettings/change_password.mako:22
#: mpulsweb/templates/usersettings/edit_standin.mako:11
msgid "Back to: My Account"
msgstr ""
-#: mpulsweb/templates/usersettings/change_password.mako:28
+#: mpulsweb/templates/usersettings/change_password.mako:29
msgid ""
-"The new password must contain of 8 letter at least and must contain 2 non-"
+"The new password must contain of 12 letter at least and must contain 2 non-"
"character at least. "
msgstr ""
-#: mpulsweb/templates/usersettings/change_password.mako:33
-#: mpulsweb/templates/usersettings/change_password.mako:36
-msgid "Enter old password"
-msgstr ""
-
-#: mpulsweb/templates/usersettings/change_password.mako:60
+#: mpulsweb/templates/usersettings/change_password.mako:61
#: mpulsweb/templates/usersettings/change_password_login.mako:37
msgid "Save"
msgstr ""
Modified: base/trunk/mpulsweb/lib/validators.py
===================================================================
--- base/trunk/mpulsweb/lib/validators.py 2011-11-24 20:25:06 UTC (rev 5666)
+++ base/trunk/mpulsweb/lib/validators.py 2011-11-25 10:48:15 UTC (rev 5667)
@@ -373,7 +373,7 @@
class SecurePassword(formencode.validators.FancyValidator):
- min = 8
+ min = 12
non_letter = 2
non_letter_literal = "zwei"
letter_regex = re.compile(r'[a-zA-Z]')
Modified: base/trunk/mpulsweb/templates/usersettings/change_password.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/change_password.mako 2011-11-24 20:25:06 UTC (rev 5666)
+++ base/trunk/mpulsweb/templates/usersettings/change_password.mako 2011-11-25 10:48:15 UTC (rev 5667)
@@ -26,7 +26,7 @@
</div>
${self.buildFormErrors(formular_labels)}
<div id="waska_form" class="import_box">
-<p class="import_p">${_('The new password must contain of 8 letter at least and must contain 2 non-character at least. ')}</p>
+<p class="import_p">${_('The new password must contain of 12 letter at least and must contain 2 non-character at least. ')}</p>
<div class="import_box_dialog">
<form action="${h.url_for(controller="usersettings", action="changePasswordAction")}" method="POST" autocomplete="off">
<div>
More information about the Mpuls-commits
mailing list