feat(account-actions): Remove "lock/enable account" feature from Acco…

…unts - translate error
bwsw · Jan 22, 2018 · 8f87b75 · 8f87b75
1 parent 435dcf8
commit 8f87b75
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/app/shared/services/error.service.ts b/src/app/shared/services/error.service.ts
@@ -48,6 +48,11 @@ export class ErrorService {
     {
       regex: /maxSnaps exceeds limit: (\d+) for interval type: hourly/,
       translation: 'ERRORS.SNAPSHOT_POLICIES.HOURLY_TURN_OFF'
+    },
+    {
+      regex:
+        /User (.*) .*or their account.* in domain (.*) is disabled\/locked. Please contact the administrator./,
+      translation: 'ERRORS.AUTH.DISABLED'
     }
   ];
 

diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -91,13 +91,15 @@
     "AUTH": {
       "INCORRECT_USERNAME": "Incorrect username",
       "INCORRECT_PASSWORD": "Incorrect password",
-      "INCORRECT_DOMAIN": "Unable to find domain {{ val1 }}"
+      "INCORRECT_DOMAIN": "Unable to find domain {{ val1 }}",
+      "DISABLED": "User {{ val1 }} (or their account) {{ val2 }} is disabled. Please contact the administrator."
     },
     "ISO": {
       "VMS_IN_USE": "Unable to delete the ISO as it's used by the following VMs:<br>{{ vms }}"
     },
     "SNAPSHOT": {
       "LIMIT_EXCEEDED": "Snapshot limit has been exceeded. You need to delete some of your previous snapshots first."
+      "LIMIT_EXCEEDED": "Snapshot limit has been exceeded. You need to delete some of your previous snapshots first."
     },
     "SSH": {
       "KEY_PAIR_ALREADY_EXISTS": "SSH key with name '{{ val1 }}' already exists"

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
@@ -91,7 +91,8 @@
     "AUTH": {
       "INCORRECT_USERNAME": "Неверное имя пользователя",
       "INCORRECT_PASSWORD": "Неверный пароль",
-      "INCORRECT_DOMAIN": "Не удалось найти домен {{ val1 }}"
+      "INCORRECT_DOMAIN": "Не удалось найти домен {{ val1 }}",
+      "DISABLED": "Пользователь {{ val1 }} (или его акаунт) {{ val2 }} деактивирован. Пожалуйста свяжитесь с администратором ."
     },
     "ISO": {
       "VMS_IN_USE": "Невозможно удалить ISO файл, так как он используется следующими машинами:<br>{{ vms }}"