From a590681c64b3f86f12d900a2c21e6723bd9a64f5 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 6 Oct 2016 13:40:57 +0200
Subject: [PATCH] FIx password strenght translations see BT#11799

---
 app/Resources/public/css/base.css |  2 +-
 main/inc/lib/api.lib.php          | 39 ++++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
index 6f69150114..0fc4c62ba0 100644
--- a/app/Resources/public/css/base.css
+++ b/app/Resources/public/css/base.css
@@ -3403,7 +3403,7 @@ i.size-32.icon-new-work{
 }
 
 .password-verdict {
-    padding-left:5px;
+
 }
 #password_progress {
     width: 220px;
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index ae8d3dcb37..3b1df17401 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -7234,25 +7234,32 @@ function api_get_password_checker_js($usernameInputId, $passwordInputId)
         return null;
     }
 
-    $verdicts = array(
-        get_lang('PasswordWeak'),
-        get_lang('PasswordNormal'),
-        get_lang('PasswordMedium'),
-        get_lang('PasswordStrong'),
-        get_lang('PasswordVeryStrong')
-    );
+    $translations = [
+        'wordLength' => get_lang('PasswordIsTooShort'),
+        'wordNotEmail' => get_lang('YourPasswordCannotBeTheSameAsYourEmail'),
+        'wordSimilarToUsername' => get_lang('YourPasswordCannotContainYourUsername'),
+        'wordTwoCharacterClasses' => get_lang('WordTwoCharacterClasses'),
+        '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 .=  "<script>
-    var verdicts = ['".implode("','", $verdicts)."'];
+    $js .=  "<script>    
     var errorMessages = {
         password_to_short : \"" . get_lang('PasswordIsTooShort')."\",
         same_as_username : \"".get_lang('YourPasswordCannotBeTheSameAsYourUsername')."\"
     };
 
     $(document).ready(function() {
-        var options = {
-            verdicts: verdicts,
+        var lang = ".json_encode($translations).";     
+        var options = {        
             onLoad : function () {
                 //$('#messages').text('Start typing password');
             },
@@ -7267,6 +7274,12 @@ function api_get_password_checker_js($usernameInputId, $passwordInputId)
             },
             usernameField: '$usernameInputId'
         };
+        options.i18n = {
+            t: function (key) {
+                var result = lang[key];
+                return result === key ? '' : result; // This assumes you return the                
+            }
+        };
         $('".$passwordInputId."').pwstrength(options);
     });
     </script>";
@@ -8025,10 +8038,10 @@ function api_mail_html(
 
     // Clear all the addresses.
     $mail->ClearAddresses();
-    
+
     // Clear all attachments
     $mail->ClearAttachments();
-    
+
     return 1;
 }