Merge branch 'staging/fixes' into fix/2020-10_update_es_zh-cn

Author: jaapmarcus

web/add/mail/index.php

@@ -123,7 +123,7 @@
 
     // Check password length
     if (empty($_SESSION['error_msg']) && !empty($_POST['v_fwd_only']) ) {
-        if (!validate_password($_POST['v_password'])) { $_SESSION['error_msg'] = __('Password does not match the minimum requirements');}
+        if (!validate_password($_POST['v_password'])) { $_SESSION['error_msg'] = _('Password does not match the minimum requirements');}
     }
 
     // Protect input

web/edit/db/index.php

@@ -64,7 +64,7 @@
     // Change database password
     if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) {
         if (!validate_password($_POST['v_password'])) { 
-             $_SESSION['error_msg'] = __('Password does not match the minimum requirements');
+             $_SESSION['error_msg'] = _('Password does not match the minimum requirements');
         }else{ 
             $v_password = tempnam("/tmp","vst");
             $fp = fopen($v_password, "w");

web/edit/mail/index.php

@@ -399,7 +399,7 @@
     // Change password
     if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) {
         if (!validate_password($_POST['v_password'])) { 
-            $_SESSION['error_msg'] = __('Password does not match the minimum requirements');
+            $_SESSION['error_msg'] = _('Password does not match the minimum requirements');
         }else{         
             $v_password = tempnam("/tmp","vst");
             $fp = fopen($v_password, "w");

web/edit/user/index.php

@@ -101,8 +101,8 @@
     if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) {
         // Check password length
         $pw_len = strlen($_POST['v_password']);
-        if (!validate_password($_POST['v_password'])) { 
-            $_SESSION['error_msg'] = __('Password does not match the minimum requirements');
+        if (!validate_password($_POST['v_password'])){ 
+            $_SESSION['error_msg'] = _('Password does not match the minimum requirements');
         } 
         if (empty($_SESSION['error_msg'])) {
             $v_password = tempnam("/tmp","vst");

web/locale/es/LC_MESSAGES/hestiacp.po

@@ -3989,4 +3989,4 @@ msgstr "Tema"
 
 #: ../../web/templates/admin/edit_server.html:126
 msgid "Default Language"
-msgstr "Idioma Predeterminado"
+msgstr "Idioma Predeterminado"