From 29a7174327007814b5253bcc9106b82d214353bf Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Sat, 6 Aug 2016 20:47:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=8B?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=D0=BD=D1=8F=D1=82=D0=B8=D1=8F=20=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D1=8B=D1=85=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/auth/acceptRules/AcceptRules.intl.json | 7 ++++--- src/components/auth/acceptRules/AcceptRules.jsx | 2 +- src/components/auth/acceptRules/AcceptRulesBody.jsx | 7 ++++++- src/i18n/be.json | 9 +++++---- src/i18n/en.json | 7 ++++--- src/i18n/ru.json | 9 +++++---- src/i18n/uk.json | 7 ++++--- 7 files changed, 29 insertions(+), 19 deletions(-) diff --git a/src/components/auth/acceptRules/AcceptRules.intl.json b/src/components/auth/acceptRules/AcceptRules.intl.json index ec23675..76eba29 100644 --- a/src/components/auth/acceptRules/AcceptRules.intl.json +++ b/src/components/auth/acceptRules/AcceptRules.intl.json @@ -1,6 +1,7 @@ { - "title": "Accept new rules", + "title": "Terms of use", "accept": "Accept", - "decline": "Decline", - "description": "We have updated our {link}. In order to get access to accounts.ely.by service, you need to accept them." + "decline_and_logout": "Decline and logout", + "description1": "We have updated our {link}.", + "description2": "In order to continue using {name} service, you need to accept them." } diff --git a/src/components/auth/acceptRules/AcceptRules.jsx b/src/components/auth/acceptRules/AcceptRules.jsx index 67504b5..96e183a 100644 --- a/src/components/auth/acceptRules/AcceptRules.jsx +++ b/src/components/auth/acceptRules/AcceptRules.jsx @@ -12,6 +12,6 @@ export default factory({ label: messages.accept }, links: { - label: messages.decline + label: messages.decline_and_logout } }); diff --git a/src/components/auth/acceptRules/AcceptRulesBody.jsx b/src/components/auth/acceptRules/AcceptRulesBody.jsx index 2515ed4..40c56c3 100644 --- a/src/components/auth/acceptRules/AcceptRulesBody.jsx +++ b/src/components/auth/acceptRules/AcceptRulesBody.jsx @@ -6,6 +6,7 @@ import { Link } from 'react-router'; import icons from 'components/ui/icons.scss'; import BaseAuthBody from 'components/auth/BaseAuthBody'; import registerMessages from 'components/auth/register/Register.intl.json'; +import appInfo from 'components/auth/appInfo/AppInfo.intl.json'; import styles from './acceptRules.scss'; import messages from './AcceptRules.intl.json'; @@ -24,13 +25,17 @@ export default class AcceptRulesBody extends BaseAuthBody {

- ) }} /> +
+ + }} />

); diff --git a/src/i18n/be.json b/src/i18n/be.json index 1820967..6f45edd 100644 --- a/src/i18n/be.json +++ b/src/i18n/be.json @@ -1,8 +1,9 @@ { - "components.auth.acceptRules.accept": "Accept", - "components.auth.acceptRules.decline": "Decline", - "components.auth.acceptRules.description": "We have updated our {link}. In order to get access to accounts.ely.by service, you need to accept them.", - "components.auth.acceptRules.title": "Accept new rules", + "components.auth.acceptRules.accept": "Принять", + "components.auth.acceptRules.decline_and_logout": "Отказаться и выйти", + "components.auth.acceptRules.description1": "Мы обновили {link}.", + "components.auth.acceptRules.description2": "Чтобы продолжить использование сервиса {name}, вам необходимо принять их.", + "components.auth.acceptRules.title": "Пользовательское соглашение", "components.auth.activation.accountActivationTitle": "Актывацыя акаунта", "components.auth.activation.activationMailWasSent": "На {email} высланы ліст з інструкцыямі па завяршэнні рэгістрацыі", "components.auth.activation.activationMailWasSentNoEmail": "На ваш E‑mail высланы ліст з інструкцыямі па завяршэнні рэгістрацыі", diff --git a/src/i18n/en.json b/src/i18n/en.json index e82a3ea..48ccf4f 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1,8 +1,9 @@ { "components.auth.acceptRules.accept": "Accept", - "components.auth.acceptRules.decline": "Decline", - "components.auth.acceptRules.description": "We have updated our {link}. In order to get access to accounts.ely.by service, you need to accept them.", - "components.auth.acceptRules.title": "Accept new rules", + "components.auth.acceptRules.decline_and_logout": "Decline and logout", + "components.auth.acceptRules.description1": "We have updated our {link}.", + "components.auth.acceptRules.description2": "In order to continue using {name} service, you need to accept them.", + "components.auth.acceptRules.title": "Terms of use", "components.auth.activation.accountActivationTitle": "Account activation", "components.auth.activation.activationMailWasSent": "Please check {email} for the message with further instructions", "components.auth.activation.activationMailWasSentNoEmail": "Please check your E-mail for the message with further instructions", diff --git a/src/i18n/ru.json b/src/i18n/ru.json index 931f536..550847a 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -1,8 +1,9 @@ { - "components.auth.acceptRules.accept": "Accept", - "components.auth.acceptRules.decline": "Decline", - "components.auth.acceptRules.description": "We have updated our {link}. In order to get access to accounts.ely.by service, you need to accept them.", - "components.auth.acceptRules.title": "Accept new rules", + "components.auth.acceptRules.accept": "Принять", + "components.auth.acceptRules.decline_and_logout": "Отказаться и выйти", + "components.auth.acceptRules.description1": "Мы обновили {link}.", + "components.auth.acceptRules.description2": "Чтобы продолжить использование сервиса {name}, вам необходимо принять их.", + "components.auth.acceptRules.title": "Пользовательское соглашение", "components.auth.activation.accountActivationTitle": "Активация аккаунта", "components.auth.activation.activationMailWasSent": "На {email} отправлено письмо с инструкциями по завершению регистрации", "components.auth.activation.activationMailWasSentNoEmail": "На ваш E-mail отправлено письмо с инструкциями по завершению регистрации", diff --git a/src/i18n/uk.json b/src/i18n/uk.json index 89c7e3f..8310584 100644 --- a/src/i18n/uk.json +++ b/src/i18n/uk.json @@ -1,8 +1,9 @@ { "components.auth.acceptRules.accept": "Accept", - "components.auth.acceptRules.decline": "Decline", - "components.auth.acceptRules.description": "We have updated our {link}. In order to get access to accounts.ely.by service, you need to accept them.", - "components.auth.acceptRules.title": "Accept new rules", + "components.auth.acceptRules.decline_and_logout": "Decline and logout", + "components.auth.acceptRules.description1": "We have updated our {link}.", + "components.auth.acceptRules.description2": "In order to continue using {name} service, you need to accept them.", + "components.auth.acceptRules.title": "Terms of use", "components.auth.activation.accountActivationTitle": "Активація акаунту", "components.auth.activation.activationMailWasSent": "На {email} відправлено повідомлення з інструкціями по завершенню реєстрації", "components.auth.activation.activationMailWasSentNoEmail": "На ваш E-mail відправлено повідомлення з інструкціями по завершенню реєстрації",