diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_de.properties
index 3ba6e12e9b885bbd00abff586328aea6f1fcca43..45c24f2577907e51352bb420166e40721053f86a 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_de.properties
@@ -42,21 +42,21 @@ admin.menu.title=Gast und Einladung
admin.menu.title.alt=$\:admin.menu.title
disable.history=ausgeschaltet
-password.history=Kennwort Geschichte
-admin.password.menu.title=Kennwortrichtlinie
-admin.password.menu.title.alt=Kennwortrichtlinie
-change.once=Passwort must einmal ge\u00E4ndert werden
-max.age=Standard Lebensdauer
-max.age.hint=In Tage
-max.age.title=Max. Lebensdauer von Kennwörter
-max.age.description=Sie können hier den maximum Lebensdauer von Kennwörter für jede Rolle definieren.
-max.age.author=Lebensdauer für Autor
-max.age.groupmanager=Lebensdauer für Gruppenverwalter
-max.age.poolmanager=Lebensdauer für Fragenpoolverwalter
-max.age.usermanager=Lebensdauer für Benutzerverwalter
-max.age.learnresourcemanager=Lebensdauer für Lernressourcenverwalter
-max.age.administrator=Lebensdauer für Systemadministrator
-password.policy.title=Kennwortrichtlinie
+password.after=für {0} Änderungen
+password.history=Verwendung von vorherigen Passwörtern verhindern
+admin.password.menu.title=Passwort-Richtlinien
+admin.password.menu.title.alt=Richtlinien über die Änderung von Passwörtern
+change.once=Passwort \u00E4ndern beim ersten Login
+max.age=Neues Passwort erzwingen nach
+max.age.hint=in Tagen
+max.age.description=Sie können hier festlegen wie oft ein Benutzer sein Passwort ändern muss und ob ein Passwort wiederverwendet werden kann. Die Lebensdauer des Passwortes kann pro Rolle festgelegt werden.
+max.age.author=... für Autoren
+max.age.groupmanager=... Gruppenverwalter
+max.age.poolmanager=... Fragenpoolverwalter
+max.age.usermanager=... Benutzerverwalter
+max.age.learnresourcemanager=... Lernressourcenverwalter
+max.age.administrator=... Systemadministrator
+password.policy.title=Passwort-Richtlinien
authentication.provider.description=Geh\u00F6ren Sie keiner der oben aufgelisteten Institutionen an oder haben ein lokales Nutzerkonto?
authentication.provider.linkText=Anmelden mit OpenOLAT Konto
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_en.properties
index f6da36811553a9751af08eb868f4a473bbd92512..fae19a732264016eb0433f4d8873a30adf1773ed 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_en.properties
@@ -41,20 +41,21 @@ accesskey.topnav=$org.olat.core.commons.fullWebApp\:accesskey.topnav
admin.menu.title=Guest and invitation
admin.menu.title.alt=$\:admin.menu.title
-disable.history=Deactivate password history
+disable.history=disabled
+password.after=for {0} changes
+password.history=Prevent reuse of previous passwords
admin.password.menu.title=Password policy
-admin.password.menu.title.alt=Password policy
-change.once=Password need to be changed once
-max.age=Default age
-max.age.hint=In days
-max.age.title=Maximum age policy for passwords
-max.age.description=You can define the maximum age for password by roles.
-max.age.author=Max. age for author
-max.age.groupmanager=Max. age for group manager
-max.age.poolmanager=Max. age for question bank manager
-max.age.usermanager=Max. age for user manager
-max.age.learnresourcemanager=Max. age for learning resource manager
-max.age.administrator=Max. age administrator
+admin.password.menu.title.alt=Policy about changing of passwords
+change.once=Change password on first login
+max.age=Enforce new password after
+max.age.hint=in days
+max.age.description=In this form you can specify how often a user has to change his password and whether or not a password can be re-used. The lifetime of the passwords can be specified for each role separately.
+max.age.author=... for authors
+max.age.groupmanager=... for group manager
+max.age.poolmanager=... for question bank manager
+max.age.usermanager=... for user manager
+max.age.learnresourcemanager=... for learning resource manager
+max.age.administrator=... for administrator
password.policy.title=Password policies
authentication.provider.description=Don't you belong to one of the institutions mentioned above or have a local user acount?
diff --git a/src/main/java/org/olat/login/ui/PasswordPolicyController.java b/src/main/java/org/olat/login/ui/PasswordPolicyController.java
index b0d4019127f2e95a32a06f6cf2c1ead4e8b5cdd3..e4d10a5391ea3518c07095e40645c8ad8c37b4ad 100644
--- a/src/main/java/org/olat/login/ui/PasswordPolicyController.java
+++ b/src/main/java/org/olat/login/ui/PasswordPolicyController.java
@@ -69,7 +69,7 @@ public class PasswordPolicyController extends FormBasicController {
setFormTitle("password.policy.title");
setFormDescription("max.age.description");
- String[] onValues = new String[] { "" };
+ String[] onValues = new String[] { translate("on") };
changeOnceEl = uifactory.addCheckboxesHorizontal("change.once", "change.once", formLayout, onKeys, onValues);
if(loginModule.isPasswordChangeOnce()) {
changeOnceEl.select(onKeys[0], true);
@@ -83,7 +83,7 @@ public class PasswordPolicyController extends FormBasicController {
hasVal = true;
}
}
- String[] historyValues = new String[] { translate("disable.history"), "1", "2", "5", "10", "15" };
+ String[] historyValues = new String[] { translate("disable.history"), translate("password.after","1"), translate("password.after","2"), translate("password.after","5"), translate("password.after","10"), translate("password.after","15")};
if(!hasVal) {
historyKeys = append(historyKeys, selectedVal);
historyValues = append(historyValues, selectedVal);
@@ -97,27 +97,21 @@ public class PasswordPolicyController extends FormBasicController {
String maxAgeAuthor = toMaxAgeAsString(loginModule.getPasswordMaxAgeAuthor());
maxAgeAuthorEl = uifactory.addTextElement("max.age.author", "max.age.author", 5, maxAgeAuthor, formLayout);
- maxAgeAuthorEl.setExampleKey("max.age.hint", null);
String maxAgeGroupManager = toMaxAgeAsString(loginModule.getPasswordMaxAgeGroupManager());
maxAgeGroupManagerEl = uifactory.addTextElement("max.age.groupmanager", "max.age.groupmanager", 5, maxAgeGroupManager, formLayout);
- maxAgeGroupManagerEl.setExampleKey("max.age.hint", null);
String maxAgePoolManager = toMaxAgeAsString(loginModule.getPasswordMaxAgePoolManager());
maxAgePoolManagerEl = uifactory.addTextElement("max.age.poolmanager", "max.age.poolmanager", 5, maxAgePoolManager, formLayout);
- maxAgePoolManagerEl.setExampleKey("max.age.hint", null);
String maxAgeUserManager = toMaxAgeAsString(loginModule.getPasswordMaxAgeUserManager());
maxAgeUserManagerEl = uifactory.addTextElement("max.age.usermanager", "max.age.usermanager", 5, maxAgeUserManager, formLayout);
- maxAgeUserManagerEl.setExampleKey("max.age.hint", null);
String maxAgeLearnResourceManager = toMaxAgeAsString(loginModule.getPasswordMaxAgeLearnResourceManager());
maxAgeLearnResourceManagerEl = uifactory.addTextElement("max.age.learnresourcemanager", "max.age.learnresourcemanager", 5, maxAgeLearnResourceManager, formLayout);
- maxAgeLearnResourceManagerEl.setExampleKey("max.age.hint", null);
String maxAgeAdministrator = toMaxAgeAsString(loginModule.getPasswordMaxAgeAdministrator());
maxAgeAdministratorEl = uifactory.addTextElement("max.age.administrator", "max.age.administrator", 5, maxAgeAdministrator, formLayout);
- maxAgeAdministratorEl.setExampleKey("max.age.hint", null);
FormLayoutContainer buttonsCont = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
formLayout.add(buttonsCont);