From b1fe20bd5190162e3136adc3ca6bc5ba32046467 Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Tue, 30 May 2017 13:45:35 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D1=8B?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=20"?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B0"=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=86=D0=B5=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B8=20=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B5=20=D0=BF=D1=80=D0=B8=D0=BD?= =?UTF-8?q?=D1=8F=D1=82=D0=B8=D1=8F=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D1=91=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/auth/acceptRules/AcceptRules.intl.json | 1 + src/components/auth/acceptRules/AcceptRulesBody.jsx | 3 +-- src/i18n/en.json | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/auth/acceptRules/AcceptRules.intl.json b/src/components/auth/acceptRules/AcceptRules.intl.json index e1e43b8..e2a0943 100644 --- a/src/components/auth/acceptRules/AcceptRules.intl.json +++ b/src/components/auth/acceptRules/AcceptRules.intl.json @@ -3,5 +3,6 @@ "accept": "Accept", "declineAndLogout": "Decline and logout", "description1": "We have updated our {link}.", + "termsOfService": "terms of service", "description2": "In order to continue using {name} service, you need to accept them." } diff --git a/src/components/auth/acceptRules/AcceptRulesBody.jsx b/src/components/auth/acceptRules/AcceptRulesBody.jsx index 40c56c3..bb0c3bb 100644 --- a/src/components/auth/acceptRules/AcceptRulesBody.jsx +++ b/src/components/auth/acceptRules/AcceptRulesBody.jsx @@ -5,7 +5,6 @@ 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'; @@ -28,7 +27,7 @@ export default class AcceptRulesBody extends BaseAuthBody { - + ) }} /> diff --git a/src/i18n/en.json b/src/i18n/en.json index 28a69e2..e28964c 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -6,6 +6,7 @@ "components.auth.acceptRules.declineAndLogout": "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.termsOfService": "terms of service", "components.auth.acceptRules.title": "User Agreement", "components.auth.activation.accountActivationTitle": "Account activation", "components.auth.activation.activationMailWasSent": "Please check {email} for the message with further instructions", From 2dda41ccce129c3888f8e43297f6884c6025f1df Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Tue, 30 May 2017 15:00:04 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9D=D0=B0=D1=88=20pull=20request=20?= =?UTF-8?q?=D0=B2=D0=BC=D0=B5=D1=80=D0=B6=D0=B8=D0=BB=D0=B8=20=D0=B2=20?= =?UTF-8?q?=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=BD=D0=BE=D0=B9=20=D1=80=D0=B5?= =?UTF-8?q?=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0=BE=D1=80=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/package.json b/scripts/package.json index 4497cfc..c0c0018 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -12,7 +12,7 @@ "dependencies": { "chalk": "^1.1.3", "node-babel": "^0.1.2", - "onesky-utils": "erickskrauch/nodejs-onesky-utils#locales_list", + "onesky-utils": "^1.2", "prompt": "^1.0.0" } }