Changeset 1248389

Timestamp:

09/18/2015 11:40:18 AM (10 years ago)

Author:

luisfpg

Message:

Made some error messages translatable

Location:

cyclos/trunk

Files:

• Cyclos/ExternalPaymentService.php (added)
• Cyclos/FullTextDictionaryService.php (added)
• Cyclos/OperatorGroupService.php (added)
• Cyclos/OperatorService.php (added)
• Cyclos/UserRegionalSettingsService.php (added)
• Cyclos/UserValidationService.php (added)
• cyclos-admin.php (modified) (3 diffs)
• cyclos-common.php (modified) (1 diff)
• cyclos-public.php (modified) (5 diffs)

cyclos/trunk/cyclos-admin.php

@@ -78 +78 @@
             $user = $userService->getCurrentUser();
         } catch (Cyclos\ConnectionException $e) {
-            $errorMessage = "The Cyclos server couldn't be contacted";
+            $errorMessage = $t->errorConnection;
         } catch (Cyclos\ServiceException $e) {
             $errorMessage = "The current Cyclos plugin settings are not correct.<br>Make sure the administrator user and access client used in Cyclos are active.";
@@ -217 +217 @@
         $token = $result->token;
     } catch (Cyclos\ConnectionException $e) {
-        $errorMessage = "The Cyclos server couldn't be contacted";
+        $errorMessage = $t->errorConnection;
     } catch (Cyclos\ServiceException $e) {
         switch ($e->errorCode) {
             case 'CREDENTIALS_NOT_SUPPLIED':
-                $errorMessage = "Please, supply both login name and password for the Cyclos administrator";
+                $errorMessage = "Please, supply both login name and password";
                 break;
             case 'LOGIN':
-                $errorMessage = "Invalid login name and password for the Cyclos administrator";
+                $errorMessage = $t->errorLogin;
                 break;
             case 'REMOTE_ADDRESS_BLOCKED':
@@ -236 +236 @@
                 break;
             default:
-                $errorMessage = "Error activating the access client: {$e->errorCode}";
+                $errorMessage = str_replace($t->errorGeneral, "{code}", $e->errorCode);
         }
     }

cyclos/trunk/cyclos-common.php

@@ -53 +53 @@
         CyclosKey::add($result, "errorAddressBlocked", "Error message: address blocked", "Your access is blocked by exceeding invalid login attempts");
         CyclosKey::add($result, "errorEmailNotFound", "Error message: invalid e-mail", "The given e-mail address didn't match any valid user");
+        CyclosKey::add($result, "errorConnection", "Error message: the Cyclos server couldn't be contacted", "The Cyclos server couldn't be contacted");
+        CyclosKey::add($result, "errorGeneral", "Error message: unknown error", "Error performing the request: {code}");
         return $result;
     }

cyclos/trunk/cyclos-public.php

@@ -281 +281 @@
         $result = $loginService->loginUser($params);
     } catch (Cyclos\ConnectionException $e) {
-        $errorMessage = "Cyclos server couldn't be contacted";
+        $errorMessage = $t->errorConnection;
     } catch (Cyclos\ServiceException $e) {
         switch ($e->errorCode) {
@@ -295 +295 @@
                 break;
             default:
-                $errorMessage = "Error while performing login: {$e->errorCode}";
+                $errorMessage = str_replace($t->errorGeneral, "{code}", $e->errorCode);
                 break;
         }
@@ -331 +331 @@
         $content = $captchaService->readImage($id, null);
     } catch (Cyclos\ConnectionException $e) {
-        $errorMessage = "Cyclos server couldn't be contacted";
+        $errorMessage = $t->errorConnection;
     } catch (Cyclos\ServiceException $e) {
-        $errorMessage = "Error while retrieving the image: {$e->errorCode}";
+        $errorMessage = str_replace($t->errorGeneral, "{code}", $e->errorCode);
     }
     
@@ -363 +363 @@
         $passwordService->forgotPasswordRequest($params);
     } catch (Cyclos\ConnectionException $e) {
-        $errorMessage = "Cyclos server couldn't be contacted";
+        $errorMessage = $t->errorConnection;
     } catch (Cyclos\ServiceException $e) {
         switch ($e->errorCode) {
@@ -373 +373 @@
                 break;
             default:
-                $errorMessage = "Error while processing the request: {$e->errorCode}";
+                $errorMessage = str_replace($t->errorGeneral, "{code}", $e->errorCode);
                 break;
         }