Merge branch 'develop' into new_locales

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"
   }
 }

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."
 }

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 {
                     <Message {...messages.description1} values={{
                         link: (
                             <Link to="/rules" target="_blank">
-                                <Message {...registerMessages.termsOfService} />
+                                <Message {...messages.termsOfService} />
                             </Link>
                         )
                     }} />

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",