Satisfy ESLint rule: no-restricted-syntax (#1243)

react-boilerplate · Nov 28, 2016 · 67b131e · 67b131e
1 parent b796a3a
commit 67b131e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/app/i18n.js b/app/i18n.js
@@ -22,18 +22,15 @@ import enTranslationMessages from './translations/en.json';
 import deTranslationMessages from './translations/de.json';
 
 export const formatTranslationMessages = (locale, messages) => {
-  const defaultFormattedMessages = locale !== DEFAULT_LOCALE ? formatTranslationMessages(DEFAULT_LOCALE, enTranslationMessages) : {};
-  const formattedMessages = {};
-  const messageKeys = Object.keys(messages);
-  for (const messageKey of messageKeys) {
-    if (locale === DEFAULT_LOCALE) {
-      formattedMessages[messageKey] = messages[messageKey];
-    } else {
-      formattedMessages[messageKey] = messages[messageKey] || defaultFormattedMessages[messageKey];
-    }
-  }
-
-  return formattedMessages;
+  const defaultFormattedMessages = locale !== DEFAULT_LOCALE
+    ? formatTranslationMessages(DEFAULT_LOCALE, enTranslationMessages)
+    : {};
+  return Object.keys(messages).reduce((formattedMessages, key) => {
+    const formattedMessage = !messages[key] && locale !== DEFAULT_LOCALE
+      ? defaultFormattedMessages[key]
+      : messages[key];
+    return Object.assign(formattedMessages, { [key]: formattedMessage });
+  }, {});
 };
 
 export const translationMessages = {

diff --git a/internals/templates/i18n.js b/internals/templates/i18n.js
@@ -18,18 +18,16 @@ import enTranslationMessages from './translations/en.json';
 addLocaleData(enLocaleData);
 
 export const formatTranslationMessages = (locale, messages) => {
-  const defaultFormattedMessages = locale !== DEFAULT_LOCALE ? formatTranslationMessages(DEFAULT_LOCALE, enTranslationMessages) : {};
-  const formattedMessages = {};
-  const messageKeys = Object.keys(messages);
-  for (const messageKey of messageKeys) {
-    if (locale === DEFAULT_LOCALE) {
-      formattedMessages[messageKey] = messages[messageKey];
-    } else {
-      formattedMessages[messageKey] = messages[messageKey] || defaultFormattedMessages[messageKey];
+  const defaultFormattedMessages = locale !== DEFAULT_LOCALE
+    ? formatTranslationMessages(DEFAULT_LOCALE, enTranslationMessages)
+    : {};
+  return Object.keys(messages).reduce((formattedMessages, key) => {
+    let message = messages[key];
+    if (!message && locale !== DEFAULT_LOCALE) {
+      message = defaultFormattedMessages[key];
     }
-  }
-
-  return formattedMessages;
+    return Object.assign(formattedMessages, { [key]: message });
+  }, {});
 };
 
 export const translationMessages = {

diff --git a/package.json b/package.json
@@ -153,8 +153,7 @@
       "redux-saga/yield-effects": 2,
       "require-yield": 0,
       "import/no-webpack-loader-syntax": 0,
-      "import/first": 0,
-      "no-restricted-syntax": 0
+      "import/first": 0
     },
     "settings": {
       "import/resolver": {