FIx password strenght translations see BT#11799

pull/2487/head
jmontoyaa 9 years ago
parent 093b73f72b
commit a590681c64
  1. 2
      app/Resources/public/css/base.css
  2. 39
      main/inc/lib/api.lib.php

@ -3403,7 +3403,7 @@ i.size-32.icon-new-work{
} }
.password-verdict { .password-verdict {
padding-left:5px;
} }
#password_progress { #password_progress {
width: 220px; width: 220px;

@ -7234,25 +7234,32 @@ function api_get_password_checker_js($usernameInputId, $passwordInputId)
return null; return null;
} }
$verdicts = array( $translations = [
get_lang('PasswordWeak'), 'wordLength' => get_lang('PasswordIsTooShort'),
get_lang('PasswordNormal'), 'wordNotEmail' => get_lang('YourPasswordCannotBeTheSameAsYourEmail'),
get_lang('PasswordMedium'), 'wordSimilarToUsername' => get_lang('YourPasswordCannotContainYourUsername'),
get_lang('PasswordStrong'), 'wordTwoCharacterClasses' => get_lang('WordTwoCharacterClasses'),
get_lang('PasswordVeryStrong') 'wordRepetitions' => get_lang('TooManyRepetitions'),
); 'wordSequences' => get_lang('YourPasswordContainsSequences'),
'errorList' => get_lang('Errors'),
'veryWeak' => get_lang('PasswordVeryWeak'),
'weak' => get_lang('PasswordWeak'),
'normal' => get_lang('PasswordNormal'),
'medium' => get_lang('PasswordMedium'),
'strong' => get_lang('PasswordStrong'),
'veryStrong' => get_lang('PasswordVeryStrong')
];
$js = api_get_asset('pwstrength-bootstrap/dist/pwstrength-bootstrap.min.js'); $js = api_get_asset('pwstrength-bootstrap/dist/pwstrength-bootstrap.min.js');
$js .= "<script> $js .= "<script>
var verdicts = ['".implode("','", $verdicts)."'];
var errorMessages = { var errorMessages = {
password_to_short : \"" . get_lang('PasswordIsTooShort')."\", password_to_short : \"" . get_lang('PasswordIsTooShort')."\",
same_as_username : \"".get_lang('YourPasswordCannotBeTheSameAsYourUsername')."\" same_as_username : \"".get_lang('YourPasswordCannotBeTheSameAsYourUsername')."\"
}; };
$(document).ready(function() { $(document).ready(function() {
var options = { var lang = ".json_encode($translations).";
verdicts: verdicts, var options = {
onLoad : function () { onLoad : function () {
//$('#messages').text('Start typing password'); //$('#messages').text('Start typing password');
}, },
@ -7267,6 +7274,12 @@ function api_get_password_checker_js($usernameInputId, $passwordInputId)
}, },
usernameField: '$usernameInputId' usernameField: '$usernameInputId'
}; };
options.i18n = {
t: function (key) {
var result = lang[key];
return result === key ? '' : result; // This assumes you return the
}
};
$('".$passwordInputId."').pwstrength(options); $('".$passwordInputId."').pwstrength(options);
}); });
</script>"; </script>";
@ -8025,10 +8038,10 @@ function api_mail_html(
// Clear all the addresses. // Clear all the addresses.
$mail->ClearAddresses(); $mail->ClearAddresses();
// Clear all attachments // Clear all attachments
$mail->ClearAttachments(); $mail->ClearAttachments();
return 1; return 1;
} }

Loading…
Cancel
Save