From 76669dfebd070f6a69d554887f5160f932629be2 Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Fri, 20 May 2016 00:30:28 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=81=D0=B0=D0=B9=D1=82=D0=B0=20=D0=B2=D1=8B=D0=BD?= =?UTF-8?q?=D0=B5=D1=81=D0=B5=D0=BD=D0=BE=20=D0=B2=20=D0=BE=D1=82=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D1=83=D1=8E=20=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=D1=83=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D0=B0?= =?UTF-8?q?=20(=D0=B0=20=D0=BA=D0=B0=D0=BA=20=D0=B8=D0=BD=D0=B0=D1=87?= =?UTF-8?q?=D0=B5=20=D0=BC=D1=8B=20=D0=BD=D0=B0=D0=BF=D0=B8=D1=88=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=81ly.by=20=D0=B2=20=D0=B1=D0=B5=D0=BB=D0=BE=D1=80?= =?UTF-8?q?=D1=83=D1=81=D1=81=D0=BA=D0=BE=D0=B9=20=D0=B2=D0=B5=D1=80=D1=81?= =?UTF-8?q?=D0=B8=D0=B8=3F)=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BA=D0=BE=D1=81=D1=8F=D0=BA=20=D1=81=20=D0=BD?= =?UTF-8?q?=D0=B5=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D0=BD=D1=83=D1=82?= =?UTF-8?q?=D1=8B=D0=BC=D0=B8=20=D1=88=D1=80=D0=B8=D1=84=D1=82=D0=B0=D0=BC?= =?UTF-8?q?=D0=B8=20=D0=BF=D1=80=D0=B8=20=D0=B4=D0=BE=D1=81=D1=82=D1=83?= =?UTF-8?q?=D0=BF=D0=B5=20=D0=BA=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D0=BE=D0=B9=20=D1=82=D0=BE=D0=BB=D1=81=D1=82=D0=BE?= =?UTF-8?q?=D1=82=D1=8B=20=D1=88=D1=80=D0=B8=D1=84=D1=82=D0=B0=20=D0=B2=20?= =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BB=D1=8F=D1=85=20=D1=8F=D0=B7=D1=8B=D0=BA?= =?UTF-8?q?=D0=BE=D0=B2=D0=BE=D0=B9=20=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/langMenu/langMenu.scss | 1 + src/i18n/en.json | 1 + src/i18n/ru.json | 1 + src/pages/root/RootPage.intl.json | 3 +++ src/pages/root/RootPage.jsx | 5 ++++- 5 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/pages/root/RootPage.intl.json diff --git a/src/components/langMenu/langMenu.scss b/src/components/langMenu/langMenu.scss index bacf54e..aa0e01c 100644 --- a/src/components/langMenu/langMenu.scss +++ b/src/components/langMenu/langMenu.scss @@ -1,4 +1,5 @@ @import "~components/ui/colors.scss"; +@import "~components/ui/fonts.scss"; .container { position: relative; diff --git a/src/i18n/en.json b/src/i18n/en.json index 762b94b..48cbc64 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -92,6 +92,7 @@ "enterNewEmail": "Then provide your new E-mail address, that you want to use with this account. You will be mailed with confirmation code.", "logout": "Logout", "newEmailPlaceholder": "Enter new E-mail", + "pages.root.siteName": "Ely.by", "pleaseEnterPassword": "Please, enter your current password", "pressButtonToStart": "Press the button below to send a message with the code for E-mail change initialization.", "register": "Join", diff --git a/src/i18n/ru.json b/src/i18n/ru.json index e182eda..f2a6f03 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -92,6 +92,7 @@ "enterNewEmail": "Then provide your new E-mail address, that you want to use with this account. You will be mailed with confirmation code.", "logout": "Выход", "newEmailPlaceholder": "Новый E-mail", + "pages.root.siteName": "Ely.by", "pleaseEnterPassword": "Пожалуйста, введите пароль от аккаунта", "pressButtonToStart": "Нажмите на кнопку ниже, чтобы отправить письмо с кодом для инициализации процесса смены E-mail адреса.", "register": "Регистрация", diff --git a/src/pages/root/RootPage.intl.json b/src/pages/root/RootPage.intl.json new file mode 100644 index 0000000..0c05bc2 --- /dev/null +++ b/src/pages/root/RootPage.intl.json @@ -0,0 +1,3 @@ +{ + "siteName": "Ely.by" +} diff --git a/src/pages/root/RootPage.jsx b/src/pages/root/RootPage.jsx index 5d4a905..1a76097 100644 --- a/src/pages/root/RootPage.jsx +++ b/src/pages/root/RootPage.jsx @@ -1,5 +1,6 @@ import React, { PropTypes } from 'react'; +import { FormattedMessage as Message } from 'react-intl'; import { Link } from 'react-router'; import classNames from 'classnames'; @@ -8,6 +9,8 @@ import PopupStack from 'components/ui/popup/PopupStack'; import styles from './root.scss'; +import messages from './RootPage.intl.json'; + function RootPage(props) { return (
@@ -17,7 +20,7 @@ function RootPage(props) {
- Ely.by +