Merge branch 'authserver_intergration'

This commit is contained in:
ErickSkrauch 2016-09-01 23:19:57 +03:00
commit 923d7bf83b
6 changed files with 6 additions and 0 deletions

View File

@ -149,6 +149,7 @@
"pages.rules.mainProvisions": "Асноўныя палажэнні",
"pages.rules.title": "Правілы сайта",
"services.errorsDict.accountAlreadyActivated": "Гэты акаўнт ужо актываваны",
"services.errorsDict.accountBanned": "",
"services.errorsDict.accountNotActivated": "Акаўнт не актываваны",
"services.errorsDict.captchaRequired": "Калі ласка, вырашыце капчу",
"services.errorsDict.doYouWantRequestKey": "Не жадаеце адаслаць новы код?",

View File

@ -149,6 +149,7 @@
"pages.rules.mainProvisions": "Main provisions",
"pages.rules.title": "Site rules",
"services.errorsDict.accountAlreadyActivated": "This account is already activated",
"services.errorsDict.accountBanned": "Account is blocked",
"services.errorsDict.accountNotActivated": "The account is not activated",
"services.errorsDict.captchaRequired": "Please, solve the captcha",
"services.errorsDict.doYouWantRequestKey": "Do you want to request a new key?",

View File

@ -149,6 +149,7 @@
"pages.rules.mainProvisions": "Основные положения",
"pages.rules.title": "Правила сайта",
"services.errorsDict.accountAlreadyActivated": "Этот аккаунт уже активирован",
"services.errorsDict.accountBanned": "Аккаунт заблокирован",
"services.errorsDict.accountNotActivated": "Аккаунт не активирован",
"services.errorsDict.captchaRequired": "Пожалуйста, решите каптчу",
"services.errorsDict.doYouWantRequestKey": "Желаете отправить новый код?",

View File

@ -148,6 +148,7 @@
"pages.rules.mainProvisions": "Основні положення",
"pages.rules.title": "Правила сайту",
"services.errorsDict.accountAlreadyActivated": "Цей обліковий запис вже активований",
"services.errorsDict.accountBanned": "",
"services.errorsDict.accountNotActivated": "Акаунт не активований",
"services.errorsDict.captchaRequired": "Будь ласка, розв`яжіть капчу",
"services.errorsDict.doYouWantRequestKey": "Бажаєте відправити новий код?",

View File

@ -27,6 +27,7 @@
"doYouWantRequestKey": "Do you want to request a new key?",
"emailFrequency": "Please cool down, you are requesting Emails too often. New key can be retrieved {time}.",
"accountNotActivated": "The account is not activated",
"accountBanned": "Account is blocked",
"emailNotFound": "Specified Email is not found",
"accountAlreadyActivated": "This account is already activated"
}

View File

@ -67,6 +67,7 @@ const errorsMap = {
'error.newRePassword_required': () => <Message {...messages.newRePasswordRequired} />,
'error.account_not_activated': () => <Message {...messages.accountNotActivated} />,
'error.account_banned': () => <Message {...messages.accountBanned} />,
'error.recently_sent_message': (props) => <Message {...messages.emailFrequency} values={{
// for msLeft @see AuthError.jsx