Support of styling and i18n

.eslintrc.json

@@ -188,7 +188,7 @@
         "react/jsx-max-props-per-line": ["warn", {"maximum": 3}],
         "react/jsx-no-bind": "warn",
         "react/jsx-no-duplicate-props": "warn",
-        "react/jsx-no-literals": "warn",
+        "react/jsx-no-literals": "off",
         "react/jsx-no-undef": "warn",
         "react/jsx-pascal-case": "warn",
         "react/jsx-uses-react": "warn",
@@ -206,7 +206,7 @@
         "react/no-unknown-property": "warn",
         "react/prefer-es6-class": "warn",
         "react/prop-types": "warn",
-        "react/react-in-jsx-scope": "warn",
+        "react/react-in-jsx-scope": "off",
         "react/self-closing-comp": "warn",
         "react/sort-comp": ["warn", {"order": ["lifecycle", "render", "everything-else"]}]
     }

package.json

@@ -19,7 +19,7 @@
     "up": "npm update",
     "test": "karma start ./karma.conf.js",
     "lint": "eslint ./src",
-    "i18n": "cd ./scripts && ./node_modules/.bin/babel-node i18n-collect.js",
+    "i18n": "cd ./scripts && ../node_modules/.bin/babel-node i18n-collect.js",
     "build": "rm -rf dist/ && NODE_ENV=production webpack --progress --colors",
     "render": ""
   },

scripts/i18n-collect.js

@@ -52,38 +52,35 @@ let keysToAdd = [];
 let keysToRemove = [];
 const keysToRename = [];
 const isNotMarked = (value) => value.slice(0, 2) !== '--';
-try {
-    const prevMessages = JSON.parse(fs.readFileSync(defaultMessagesPath, 'utf8'));
-    const prevMessagesMap = Object.entries(prevMessages).reduce((acc, [key, value]) => {
-        if (acc[value]) {
-            acc[value].push(key);
-        } else {
-            acc[value] = [key];
-        }
 
-        return acc;
+const prevMessages = readJSON(defaultMessagesPath);
-    }, {});
+const prevMessagesMap = Object.entries(prevMessages).reduce((acc, [key, value]) => {
-    keysToAdd = Object.keys(collectedMessages).filter((key) => !prevMessages[key]);
+    if (acc[value]) {
-    keysToRemove = Object.keys(prevMessages).filter((key) => !collectedMessages[key]).filter(isNotMarked);
+        acc[value].push(key);
-    keysToUpdate = Object.entries(prevMessages).reduce((acc, [key, message]) =>
+    } else {
-        acc.concat(collectedMessages[key] && collectedMessages[key] !== message ? key : [])
+        acc[value] = [key];
-    , []);
+    }
 
-    // detect keys to rename, mutating keysToAdd and keysToRemove
+    return acc;
-    [].concat(keysToAdd).forEach((toKey) => {
+}, {});
-        const keys = prevMessagesMap[collectedMessages[toKey]] || [];
+keysToAdd = Object.keys(collectedMessages).filter((key) => !prevMessages[key]);
-        const fromKey = keys.find((fromKey) => keysToRemove.indexOf(fromKey) > -1);
+keysToRemove = Object.keys(prevMessages).filter((key) => !collectedMessages[key]).filter(isNotMarked);
+keysToUpdate = Object.entries(prevMessages).reduce((acc, [key, message]) =>
+    acc.concat(collectedMessages[key] && collectedMessages[key] !== message ? key : [])
+, []);
 
-        if (fromKey) {
+// detect keys to rename, mutating keysToAdd and keysToRemove
-            keysToRename.push([fromKey, toKey]);
+[].concat(keysToAdd).forEach((toKey) => {
+    const keys = prevMessagesMap[collectedMessages[toKey]] || [];
+    const fromKey = keys.find((fromKey) => keysToRemove.indexOf(fromKey) > -1);
 
-            keysToRemove.splice(keysToRemove.indexOf(fromKey), 1);
+    if (fromKey) {
-            keysToAdd.splice(keysToAdd.indexOf(toKey), 1);
+        keysToRename.push([fromKey, toKey]);
-        }
+
-    });
+        keysToRemove.splice(keysToRemove.indexOf(fromKey), 1);
-} catch (err) {
+        keysToAdd.splice(keysToAdd.indexOf(toKey), 1);
-    console.log(chalk.yellow(`Can not read ${defaultMessagesPath}. The new file will be created.`), err);
+    }
-}
+});
 
 if (!keysToAdd.length && !keysToRemove.length && !keysToUpdate.length && !keysToRename.length) {
     return console.log(chalk.green('Everything is up to date!'));
@@ -142,13 +139,7 @@ function buildLocales() {
 
     SUPPORTED_LANGS.map((lang) => {
         const destPath = `${LANG_DIR}/${lang}.json`;
-
+        const newMessages = readJSON(destPath);
-        let newMessages = {};
-        try {
-            newMessages = JSON.parse(fs.readFileSync(destPath, 'utf8'));
-        } catch (err) {
-            console.log(chalk.yellow(`Can not read ${destPath}. The new file will be created.`), err);
-        }
 
         keysToRename.forEach(([fromKey, toKey]) => {
             newMessages[toKey] = newMessages[fromKey];
@@ -181,3 +172,13 @@ function buildLocales() {
         fs.writeFileSync(destPath, JSON.stringify(sortedNewMessages, null, 4) + '\n');
     });
 }
+
+function readJSON(destPath) {
+    try {
+        return JSON.parse(fs.readFileSync(destPath, 'utf8'));
+    } catch (err) {
+        console.log(chalk.yellow(`Can not read ${destPath}. The new file will be created.`), `(${err.message})`);
+    }
+
+    return {};
+}

src/App.jsx

@@ -0,0 +1,51 @@
+import { PropTypes } from 'react';
+
+import { IntlProvider, addLocaleData } from 'react-intl';
+
+import enLocaleData from 'react-intl/locale-data/en';
+import ruLocaleData from 'react-intl/locale-data/ru';
+import beLocaleData from 'react-intl/locale-data/be';
+import ukLocaleData from 'react-intl/locale-data/uk';
+
+// till we have not so many locales, we can require their data at once
+addLocaleData(enLocaleData);
+addLocaleData(ruLocaleData);
+addLocaleData(beLocaleData);
+addLocaleData(ukLocaleData);
+
+const SUPPORTED_LANGUAGES = ['ru', 'en', 'be', 'uk'];
+const DEFAULT_LANGUAGE = 'en';
+
+export default function App({type, payload = {}, debug = false}) {
+    let {locale} = payload;
+
+    if (!locale || SUPPORTED_LANGUAGES.indexOf(locale) === -1) {
+        locale = DEFAULT_LANGUAGE;
+    }
+
+    const messages = require(`i18n/${locale}.json`);
+    const Email = require(`emails/${type}/index`).default;
+
+    return (
+        <IntlProvider locale={locale} messages={messages}>
+            {debug
+                ? (
+                    <div>
+                        Hello world
+                        <Email {...payload} />
+                    </div>
+                ) : (
+                    <Email {...payload} />
+                )
+            }
+        </IntlProvider>
+    );
+}
+
+App.propTypes = {
+    type: PropTypes.string.isRequired,
+    payload: PropTypes.shape({
+        locale: PropTypes.string
+    }),
+    debug: PropTypes.bool
+};

src/emails/register/Register.jsx

@@ -1,7 +1,18 @@
+import { PropTypes } from 'react';
+
+import { FormattedMessage as Message } from 'react-intl';
+
+import styles from './styles';
+import messages from './messages.intl.json';
+
 export default function Register({username}) {
     return (
-        <div>
+        <div style={styles.container}>
-            You Have Been Registered, {username}!
+            <Message {...messages.you_registered_as} values={{username}} />
         </div>
     );
 }
+
+Register.propTypes = {
+    username: PropTypes.string
+};

src/emails/register/messages.intl.json

@@ -0,0 +1,3 @@
+{
+    "you_registered_as": "You have been registered as {username}"
+}

src/emails/register/styles.js

@@ -0,0 +1,8 @@
+export default {
+    container: {
+        padding: '10px',
+        margin: '10px',
+        background: '#f7f7f7',
+        border: '1px #ddd solid',
+    }
+};

src/i18n/be.json

@@ -0,0 +1,3 @@
+{
+    "emails.register.you_registered_as": "Вы былі зарэгістраваныя як {username}"
+}

src/i18n/en.json

@@ -0,0 +1,3 @@
+{
+    "emails.register.you_registered_as": "You have been registered as {username}"
+}

src/i18n/ru.json

@@ -0,0 +1,3 @@
+{
+    "emails.register.you_registered_as": "Вы были зарегистрированы как {username}"
+}

src/i18n/uk.json

@@ -0,0 +1,3 @@
+{
+    "emails.register.you_registered_as": "Ви були зареєстровані як {username}"
+}

src/index.js

@@ -1,35 +1,20 @@
 import 'babel-polyfill';
 
-import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactDOMServer from 'react-dom/server';
 
-import { IntlProvider } from 'react-intl';
+import App from 'App';
-
-import Register from 'emails/register';
 
 const isCli = typeof window === 'undefined';
 
-const App = ({type, payload = {}}) => (
-    <IntlProvider locale="en" messages={{}}>
-        {isCli
-            ? (
-                <Register {...payload} />
-            ) : (
-                <div>
-                    Hello world
-                    <Register {...payload} />
-                </div>
-            )
-        }
-    </IntlProvider>
-);
-
 if (isCli) {
     module.exports = {
         default: (props) =>
             ReactDOMServer.renderToStaticMarkup(<App {...props} />)
     };
 } else {
-    ReactDOM.render(<App />, document.getElementById('app'));
+    ReactDOM.render(
+        <App type="register" payload={{locale: 'ru'}} debug />,
+        document.getElementById('app')
+    );
 }