ElyBy-Mirror/accounts-frontend
1
0
Fork 0
mirror of https://github.com/elyby/accounts-frontend.git synced 2024-12-29 00:10:54 +05:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into new_locales

Browse Source
This commit is contained in:
ErickSkrauch 2017-06-01 10:36:49 +03:00
commit 667fec45b7
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/package.json
View File

@ -12,7 +12,7 @@
"dependencies": { "dependencies": {
"chalk": "^1.1.3", "chalk": "^1.1.3",
"node-babel": "^0.1.2", "node-babel": "^0.1.2",
"onesky-utils": "erickskrauch/nodejs-onesky-utils#locales_list", "onesky-utils": "^1.2",
"prompt": "^1.0.0" "prompt": "^1.0.0"
} }
} }

1
src/components/auth/acceptRules/AcceptRules.intl.json
View File

@ -3,5 +3,6 @@
"accept": "Accept", "accept": "Accept",
"declineAndLogout": "Decline and logout", "declineAndLogout": "Decline and logout",
"description1": "We have updated our {link}.", "description1": "We have updated our {link}.",
"termsOfService": "terms of service",
"description2": "In order to continue using {name} service, you need to accept them." "description2": "In order to continue using {name} service, you need to accept them."
} }

3
src/components/auth/acceptRules/AcceptRulesBody.jsx
View File

@ -5,7 +5,6 @@ import { Link } from 'react-router';
import icons from 'components/ui/icons.scss'; import icons from 'components/ui/icons.scss';
import BaseAuthBody from 'components/auth/BaseAuthBody'; 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 appInfo from 'components/auth/appInfo/AppInfo.intl.json';
import styles from './acceptRules.scss'; import styles from './acceptRules.scss';
@ -28,7 +27,7 @@ export default class AcceptRulesBody extends BaseAuthBody {
<Message {...messages.description1} values={{ <Message {...messages.description1} values={{
link: ( link: (
<Link to="/rules" target="_blank"> <Link to="/rules" target="_blank">
<Message {...registerMessages.termsOfService} /> <Message {...messages.termsOfService} />
</Link> </Link>
) )
}} /> }} />

1
src/i18n/en.json
View File

@ -6,6 +6,7 @@
"components.auth.acceptRules.declineAndLogout": "Decline and logout", "components.auth.acceptRules.declineAndLogout": "Decline and logout",
"components.auth.acceptRules.description1": "We have updated our {link}.", "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.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.acceptRules.title": "User Agreement",
"components.auth.activation.accountActivationTitle": "Account activation", "components.auth.activation.accountActivationTitle": "Account activation",
"components.auth.activation.activationMailWasSent": "Please check {email} for the message with further instructions", "components.auth.activation.activationMailWasSent": "Please check {email} for the message with further instructions",