i18n new prompt exception mechanism

Author: cdujeu

core/src/core/src/pydio/Core/Exception/PydioPromptException.php

@@ -23,6 +23,7 @@
 use Pydio\Core\Http\Middleware\WorkspaceAuthMiddleware;
 use Pydio\Core\Http\Response\JSONSerializableResponseChunk;
 use Pydio\Core\Http\Response\XMLSerializableResponseChunk;
+use Pydio\Core\Services\LocaleService;
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
 
@@ -83,12 +84,15 @@ public function __construct($promptType, $data, $messageString, $messageId = fal
      * @return  PydioPromptException
      */
     public static function promptForWorkspaceCredentials($parameters, $postSubmitCallback = ""){
+        $mess = LocaleService::getMessages();
         $inputs = [];
         foreach($parameters as $key => $value){
             if($key === WorkspaceAuthMiddleware::FORM_RESUBMIT_LOGIN) {
-                $inputs[] = "<input type='text' name='$key' value='$value' placeholder='Login'>";
+                $loginString = str_replace("'","\'", $mess['181']);
+                $inputs[] = "<input type='text' name='$key' value='$value' placeholder='$loginString'>";
             }else if($key === WorkspaceAuthMiddleware::FORM_RESUBMIT_PASS){
-                $inputs[] = "<input type='password' name='$key' value='' placeholder='Password' autocomplete='off'>";
+                $passString = str_replace("'","\'", $mess['182']);
+                $inputs[] = "<input type='password' name='$key' value='' placeholder='$passString' autocomplete='off'>";
             }else{
                 $inputs[] = "<input type='hidden' name='$key' value='$value'>";
             }
@@ -97,8 +101,8 @@ public static function promptForWorkspaceCredentials($parameters, $postSubmitCal
             "confirm",
             array(
                 "DIALOG" => "<div>
-                                <h3>Credentials Required</h3>
-                                <div class='dialogLegend'>Please provide a password to enter this workspace.</div>
+                                <h3>".$mess['557']."</h3>
+                                <div class='dialogLegend'>".$mess['558']."</div>
                                 <form autocomplete='off'>
                                     ".implode("\n", $inputs)."
                                 </form>
@@ -112,7 +116,7 @@ public static function promptForWorkspaceCredentials($parameters, $postSubmitCal
                     "EVAL" => ""
                 )
             ),
-            "Credentials Needed");
+            $mess['557']);
 
     }
 

core/src/core/src/pydio/Core/Exception/WorkspaceAuthRequired.php

@@ -24,6 +24,7 @@
 use Pydio\Auth\Core\MemorySafe;
 use Pydio\Core\Model\Context;
 use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Services\LocaleService;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 
@@ -43,10 +44,13 @@ class WorkspaceAuthRequired extends PydioException {
      * @param boolean $requireLogin
      * @param string $message
      */
-    public function __construct($workspaceId, $requireLogin = false, $message = "Authentication required for this workspace")
+    public function __construct($workspaceId, $requireLogin = false, $message = "")
     {
         $this->workspaceId = $workspaceId;
         $this->requireLogin = $requireLogin;
+        if(empty($message)){
+            $message = LocaleService::getMessages()['559'];
+        }
         parent::__construct($message, false, null);
     }
 

core/src/plugins/core.ajaxplorer/i18n/ca.php

@@ -654,5 +654,8 @@
 "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
 "554" => "%s result(s) in Recycle Bin",
 "556" => "Launching task %s in background",
+"557" => "Credentials required",
+"558" => "Please provide a password to enter this workspace.",
+"559" => "Authentication failed for this workspace.",
 
 );

core/src/plugins/core.ajaxplorer/i18n/cs.php

@@ -651,4 +651,7 @@
 "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
 "554" => "%s result(s) in Recycle Bin",
 "556" => "Launching task %s in background",
+"557" => "Credentials required",
+"558" => "Please provide a password to enter this workspace.",
+"559" => "Authentication failed for this workspace.",
 );

core/src/plugins/core.ajaxplorer/i18n/da.php

@@ -656,5 +656,8 @@
 "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
 "554" => "%s result(s) in Recycle Bin",
 "556" => "Launching task %s in background",
+"557" => "Credentials required",
+"558" => "Please provide a password to enter this workspace.",
+"559" => "Authentication failed for this workspace.",
 /* END SENTENCE */
 );

core/src/plugins/core.ajaxplorer/i18n/de.php

@@ -658,6 +658,9 @@
 "553" => "Ungültiges Passwort. Bitte stellen Sie sicher, dass die Feststelltaste nicht gedrückt ist und geben Sie das Kennwort erneut ein.",
 "554" => "%s Ergebnis(se) im Papierkorb",
 "556" => "Starte Aufgabe %s im Hintergrund",
+"557" => "Credentials required",
+"558" => "Please provide a password to enter this workspace.",
+"559" => "Authentication failed for this workspace.",
 /* END SENTENCE */
 /* password strength tester */
-);
+);

core/src/plugins/core.ajaxplorer/i18n/en.php

@@ -653,4 +653,7 @@
 "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
 "554" => "%s result(s) in Recycle Bin",
 "556" => "Launching task %s in background",
+"557" => "Credentials required",
+"558" => "Please provide a password to enter this workspace.",
+"559" => "Authentication failed for this workspace.",
 ); 

core/src/plugins/core.ajaxplorer/i18n/es.php

@@ -658,4 +658,7 @@
 "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
 "554" => "%s result(s) in Recycle Bin",
 "556" => "Launching task %s in background",
+"557" => "Credentials required",
+"558" => "Please provide a password to enter this workspace.",
+"559" => "Authentication failed for this workspace.",
 );

core/src/plugins/core.ajaxplorer/i18n/et.php

@@ -654,5 +654,8 @@
 "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
 "554" => "%s result(s) in Recycle Bin",
 "556" => "Launching task %s in background",
+"557" => "Credentials required",
+"558" => "Please provide a password to enter this workspace.",
+"559" => "Authentication failed for this workspace.",
 /* END SENTENCE */
 );

core/src/plugins/core.ajaxplorer/i18n/eus.php

@@ -652,5 +652,8 @@
 "553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
 "554" => "%s result(s) in Recycle Bin",
 "556" => "Launching task %s in background",
+"557" => "Credentials required",
+"558" => "Please provide a password to enter this workspace.",
+"559" => "Authentication failed for this workspace.",
 /* END SENTENCE */
 );