From 40466189fd4a5bfeab72acb8fc85eac7d357e6bf Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Mon, 23 May 2016 21:19:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D1=8B=20=D0=BE?= =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20=D0=B4=D0=BB=D1=8F=20=D1=84?= =?UTF-8?q?=D0=BE=D1=80=D0=BC=D1=8B=20=D0=BF=D0=BE=D0=B2=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=BE=D0=B9=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=BF=D0=B8=D1=81=D1=8C=D0=BC=D0=B0=20=D1=81=20=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=B8=D0=B2=D0=B0=D1=86=D0=B8=D0=B5=D0=B9=20=D0=B0?= =?UTF-8?q?=D0=BA=D0=BA=D0=B0=D1=83=D0=BD=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/auth/resendActivation/ResendActivationBody.jsx | 1 + src/i18n/en.json | 2 ++ src/i18n/ru.json | 4 +++- src/services/errorsDict.intl.json | 4 +++- src/services/errorsDict.js | 3 +++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/components/auth/resendActivation/ResendActivationBody.jsx b/src/components/auth/resendActivation/ResendActivationBody.jsx index 4fa5f59..029c94b 100644 --- a/src/components/auth/resendActivation/ResendActivationBody.jsx +++ b/src/components/auth/resendActivation/ResendActivationBody.jsx @@ -32,6 +32,7 @@ export default class ResendActivation extends BaseAuthBody { type="email" required placeholder={registerMessages.yourEmail} + defaultValue={this.context.user.email} /> diff --git a/src/i18n/en.json b/src/i18n/en.json index 2f998ce..e2994ce 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -112,12 +112,14 @@ "components.userbar.logout": "Logout", "components.userbar.register": "Join", "pages.root.siteName": "Ely.by", + "services.accountAlreadyActivated": "This account is already activated", "services.accountNotActivated": "The account is not activated", "services.doYouWantRequestKey": "Do you want to request a new key?", "services.emailFrequency": "Please cool down, you are requesting E‑mails too often. New key can be retrieved {time}.", "services.emailInvalid": "E‑mail is invalid", "services.emailIsTempmail": "Tempmail E‑mail addresses is not allowed", "services.emailNotAvailable": "This E‑mail is already registered.", + "services.emailNotFound": "Specified E‑mail is not found", "services.emailRequired": "E‑mail is required", "services.emailToLong": "E‑mail is too long", "services.forgotYourPassword": "forgot your password", diff --git a/src/i18n/ru.json b/src/i18n/ru.json index 5822a0f..410f978 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -3,7 +3,7 @@ "components.auth.activation.activationMailWasSent": "На {email} отправлено письмо с инструкциями по завершению регистрации", "components.auth.activation.confirmEmail": "Подтверждение E‑mail", "components.auth.activation.didNotReceivedEmail": "Не получили E‑mail?", - "components.auth.activation.enterTheCode": "Укажите код, полученный на E‑mail здесь", + "components.auth.activation.enterTheCode": "Укажите код из E‑mail здесь", "components.auth.appInfo.appDescription": "Вы находитесь на сервисе авторизации Ely.by, позволяющему вам безопасно совершать любые операции над вашим аккаунтом. Это единая точка входа для сайтов и настольных программ, ключая игровые лаунчеры.", "components.auth.appInfo.appName": "Аккаунты Ely", "components.auth.appInfo.documentation": "документацию", @@ -112,12 +112,14 @@ "components.userbar.logout": "Выход", "components.userbar.register": "Регистрация", "pages.root.siteName": "Ely.by", + "services.accountAlreadyActivated": "Этот аккаунт уже активирован", "services.accountNotActivated": "Аккаунт не активирован", "services.doYouWantRequestKey": "Не хотите отправить новый код?", "services.emailFrequency": "Пожалуйста, успокойтесь, вы запрашиваете E‑mail слишком часто. Новый ключ можно будет заказать {time}.", "services.emailInvalid": "Указан неправильный E‑mail", "services.emailIsTempmail": "Использование сервисов временных E‑mail адресов запрещено", "services.emailNotAvailable": "На указанный E‑mail адрес уже зарегистрирован аккаунт.", + "services.emailNotFound": "Не найдено аккаунта с указанным E‑mail адресом", "services.emailRequired": "Пожалуйста, укажите E‑mail", "services.emailToLong": "E‑mail слишком длинный", "services.forgotYourPassword": "забыли свой пароль", diff --git a/src/services/errorsDict.intl.json b/src/services/errorsDict.intl.json index 68ec9da..e30ea19 100644 --- a/src/services/errorsDict.intl.json +++ b/src/services/errorsDict.intl.json @@ -26,5 +26,7 @@ "doYouWantRequestKey": "Do you want to request a new key?", "emailFrequency": "Please cool down, you are requesting E‑mails too often. New key can be retrieved {time}.", "accountNotActivated": "The account is not activated", - "oldHashStrategy": "Sorry, but your account's password is too old. Please change your password in order to perform this action." + "oldHashStrategy": "Sorry, but your account's password is too old. Please change your password in order to perform this action.", + "emailNotFound": "Specified E‑mail is not found", + "accountAlreadyActivated": "This account is already activated" } diff --git a/src/services/errorsDict.js b/src/services/errorsDict.js index 19805fc..3fce2d0 100644 --- a/src/services/errorsDict.js +++ b/src/services/errorsDict.js @@ -73,6 +73,9 @@ const errorsMap = { time: }} />, + 'error.email_not_found': () => , + 'error.account_already_activated': () => , + suggestResetPassword: () => (