diff --git a/UI/Common/English.lproj/Localizable.strings b/UI/Common/English.lproj/Localizable.strings index ad0472525..a729dfcf7 100644 --- a/UI/Common/English.lproj/Localizable.strings +++ b/UI/Common/English.lproj/Localizable.strings @@ -233,3 +233,10 @@ "passwordRecovery_SecretQuestion2" = "What was your first car ?"; "passwordRecovery_SecretQuestion3" = "What is your favorite movie ?"; "passwordRecovery_SecondaryEmail" = "Secondary E-mail"; + +/* Password */ +"POLICY_MIN_LOWERCASE_LETTER" = "Minimum of %{0} lowercase letter"; +"POLICY_MIN_UPPERCASE_LETTER" = "Minimum of %{0} uppercase letter"; +"POLICY_MIN_DIGIT" = "Minimum of %{0} digit"; +"POLICY_MIN_SPECIAL_SYMBOLS" = "Minimum of %{0} special symbols"; +"POLICY_MIN_LENGTH" = "Minimum length of %{0} characters"; \ No newline at end of file diff --git a/UI/Common/French.lproj/Localizable.strings b/UI/Common/French.lproj/Localizable.strings index a77d73904..e143bd3c6 100644 --- a/UI/Common/French.lproj/Localizable.strings +++ b/UI/Common/French.lproj/Localizable.strings @@ -233,3 +233,10 @@ "passwordRecovery_SecretQuestion2" = "Quelle était votre première voiture ?"; "passwordRecovery_SecretQuestion3" = "Quel est votre film préféré ?"; "passwordRecovery_SecondaryEmail" = "E-mail secondaire"; + +/* Password */ +"POLICY_MIN_LOWERCASE_LETTER" = "Au moins %{0} lettre(s) minuscule(s)"; +"POLICY_MIN_UPPERCASE_LETTER" = "Au moins %{0} lettre(s) majuscule(s)"; +"POLICY_MIN_DIGIT" = "Au moins %{0} chiffre(s)"; +"POLICY_MIN_SPECIAL_SYMBOLS" = "Au moins %{0} caractère(s) special(aux)"; +"POLICY_MIN_LENGTH" = "Longueur d'au moins %{0} caractère(s)"; \ No newline at end of file diff --git a/UI/MainUI/English.lproj/Localizable.strings b/UI/MainUI/English.lproj/Localizable.strings index a567f4f70..4e61e2cae 100644 --- a/UI/MainUI/English.lproj/Localizable.strings +++ b/UI/MainUI/English.lproj/Localizable.strings @@ -132,10 +132,3 @@ See this page for v "Password recovery email in error" = "Password recovery email in error"; "Password reset" = "Password reset"; "Hi %{0},\nThere was a request to change your password!\n\nIf you did not make this request then please ignore this email.\n\nOtherwise, please click this link to change your password: %{1}" = "Hi %{0},\nThere was a request to change your password!\n\nIf you did not make this request then please ignore this email.\n\nOtherwise, please click this link to change your password: %{1}"; - -/* Password */ -"POLICY_MIN_LOWERCASE_LETTER" = "Minimum of %{0} lowercase letter"; -"POLICY_MIN_UPPERCASE_LETTER" = "Minimum of %{0} uppercase letter"; -"POLICY_MIN_DIGIT" = "Minimum of %{0} digit"; -"POLICY_MIN_SPECIAL_SYMBOLS" = "Minimum of %{0} special symbols"; -"POLICY_MIN_LENGTH" = "Minimum length of %{0} characters"; \ No newline at end of file diff --git a/UI/MainUI/French.lproj/Localizable.strings b/UI/MainUI/French.lproj/Localizable.strings index 43a945586..c896cd673 100644 --- a/UI/MainUI/French.lproj/Localizable.strings +++ b/UI/MainUI/French.lproj/Localizable.strings @@ -129,10 +129,3 @@ "Password recovery email in error" = "Erreur lors de l'envoi de l'email de récupération"; "Password reset" = "Réinitialisation de mot de passe"; "Hi %{0},\nThere was a request to change your password!\n\nIf you did not make this request then please ignore this email.\n\nOtherwise, please click this link to change your password: %{1}" = "Bonjour %{0},\nUne demande de changement de mot de passe a été initiée.\n\nSi vous n'êtes pas à l'origine de cet e-mail, n'en tenez pas compte.\n\nSi vous en êtes bien à l'origine, veuillez cliquer sur le lien ci-dessous pour modifier votre mot de passe: %{1}"; - -/* Password */ -"POLICY_MIN_LOWERCASE_LETTER" = "Au moins %{0} lettre(s) minuscule(s)"; -"POLICY_MIN_UPPERCASE_LETTER" = "Au moins %{0} lettre(s) majuscule(s)"; -"POLICY_MIN_DIGIT" = "Au moins %{0} chiffre(s)"; -"POLICY_MIN_SPECIAL_SYMBOLS" = "Au moins %{0} caractère(s) special(aux)"; -"POLICY_MIN_LENGTH" = "Longueur d'au moins %{0} caractère(s)"; \ No newline at end of file diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m index ceaf19f2b..5dff225ba 100644 --- a/UI/MainUI/SOGoRootPage.m +++ b/UI/MainUI/SOGoRootPage.m @@ -219,7 +219,7 @@ static const NSString *kJwtKey = @"jwt"; if ([*additionalLoginInformations objectForKey:@"userPolicies"]) { translations = [[NSMutableDictionary alloc] init]; for (policy in [*additionalLoginInformations objectForKey:@"userPolicies"]) { - [translations setObject:[self labelForKey: [policy objectForKey:@"label"]] forKey: [policy objectForKey:@"label"]]; + [translations setObject:[self commonLabelForKey: [policy objectForKey:@"label"]] forKey: [policy objectForKey:@"label"]]; } [*additionalLoginInformations setObject:[SOGoPasswordPolicy createPasswordPolicyLabels: [*additionalLoginInformations objectForKey:@"userPolicies"] withTranslations: translations] forKey:@"userPolicies"]; diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings index 083cdcfa1..718d6ad09 100644 --- a/UI/PreferencesUI/English.lproj/Localizable.strings +++ b/UI/PreferencesUI/English.lproj/Localizable.strings @@ -274,11 +274,6 @@ "Confirmation" = "Confirmation"; "Change" = "Change"; "Passwords don't match" = "Passwords don't match"; -"POLICY_MIN_LOWERCASE_LETTER" = "Minimum of %{0} lowercase letter"; -"POLICY_MIN_UPPERCASE_LETTER" = "Minimum of %{0} uppercase letter"; -"POLICY_MIN_DIGIT" = "Minimum of %{0} digit"; -"POLICY_MIN_SPECIAL_SYMBOLS" = "Minimum of %{0} special symbols"; -"POLICY_MIN_LENGTH" = "Minimum length of %{0} characters"; /* Event+task classifications */ diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings index cf24caafd..ec1f993ee 100644 --- a/UI/PreferencesUI/French.lproj/Localizable.strings +++ b/UI/PreferencesUI/French.lproj/Localizable.strings @@ -274,11 +274,7 @@ "Confirmation" = "Confirmation"; "Change" = "Changer"; "Passwords don't match" = "Les mots de passe ne correspondent pas"; -"POLICY_MIN_LOWERCASE_LETTER" = "Au moins %{0} lettre(s) minuscule(s)"; -"POLICY_MIN_UPPERCASE_LETTER" = "Au moins %{0} lettre(s) majuscule(s)"; -"POLICY_MIN_DIGIT" = "Au moins %{0} chiffre(s)"; -"POLICY_MIN_SPECIAL_SYMBOLS" = "Au moins %{0} caractère(s) special(aux)"; -"POLICY_MIN_LENGTH" = "Longueur d'au moins %{0} caractère(s)"; + /* Event+task classifications */ diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index e542b2d94..dcadd594b 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -278,7 +278,7 @@ static NSArray *reminderValues = nil; userSource = [user authenticationSource]; for(policy in [userSource userPasswordPolicy]) { - [translations setObject:[self labelForKey:[policy objectForKey:@"label"]] + [translations setObject:[self commonLabelForKey:[policy objectForKey:@"label"]] forKey: [policy objectForKey:@"label"]]; } translatedUserPolicy = [SOGoPasswordPolicy createPasswordPolicyLabels: [userSource userPasswordPolicy] diff --git a/UI/WebServerResources/js/Main/Main.app.js b/UI/WebServerResources/js/Main/Main.app.js index 0671edad8..e1dca17e7 100644 --- a/UI/WebServerResources/js/Main/Main.app.js +++ b/UI/WebServerResources/js/Main/Main.app.js @@ -69,7 +69,6 @@ vm.passwordRecovery.passwordRecoveryEnabled = true; vm.loginState = 'passwordchange'; - vm.showLogin = false; rippleDo('loginContent'); } @@ -300,9 +299,9 @@ }; this.isInPasswordRecoveryMode = function () { - return (("SecretQuestion" == this.passwordRecovery.passwordRecoveryMode || - "SecondaryEmail" == this.passwordRecovery.passwordRecoveryMode) && - this.passwordRecovery.passwordRecoveryToken) ? true : false; + return (("SecretQuestion" == this.passwordRecovery.passwordRecoveryMode) || + ("SecondaryEmail" == this.passwordRecovery.passwordRecoveryMode && + this.passwordRecovery.passwordRecoveryToken)) ? true : false; }; this.passwordRecoveryAbort = function () {