Initial commit

__mocks__/filesystem.js

@@ -20,8 +20,7 @@ export default class SearchPage extends Component {
      }
 
     static get template() {
-         return '{{__('invalid''string')}} <div>{{__n('%d result', '%d results', 2)}}</div>';
-
+         return '{{__('invalid''string')}} {{__p('menuitem', 'Search')}} <div>{{__n('%d result', '%d results', 2)}}</div> {{__np('footer', '%d view', '%d views', 23)}}';
     }
 };
 `.trim();
@@ -41,9 +40,9 @@ module.exports = {
     'src/test.js': EmptyPage,
     'src/index.js': Application,
     './locales/existing.json': JSON.stringify({
-        "Search": "検索",
-        "test unused key": "test value",
-        "Application": "アプリケーション",
+        "Search": {"default": "検索"},
+        "test unused key": {"default": "test value"},
+        "Application": {"default": "アプリケーション"},
     }),
     'src/pages/About/.locales/existing.json': JSON.stringify({}),
     'src/pages/Search/.locales/existing.json': JSON.stringify({'Search': ''}),

package.json

@@ -43,8 +43,7 @@
         "fs-extra": "^7.0.0",
         "glob": "^7.1.2",
         "json5": "^1.0.1",
-        "safe-eval": "^0.4.1",
-        "y18n": "^4.0.0"
+        "safe-eval": "^0.4.1"
     },
     "scripts": {
         "build": "scripts/build.sh",

src/hasTranslation.js

@@ -1,3 +1,23 @@
+/**
+ * @private
+ */
+function singularHasTranslation(data) {
+    return Boolean(data.length);
+}
+
+/**
+ * @private
+ */
+function pluralHasTranslation(data) {
+    return Object.values(data || {}).some((v) => {
+        if (Object(v) === v) {
+            return pluralHasTranslation(v);
+        }
+
+        return singularHasTranslation(v);
+    });
+}
+
 /**
  * Checks of a translation key-value pair has been created.
  * @param {*} data - An object that is spidered looking for
@@ -6,23 +26,9 @@
  * @private
  */
 module.exports = function hasTranslation(data) {
-    if (Object(data) === data) {
-        const keys = Object.keys(data);
-
-        if (!keys.length) {
-            return false;
-        }
-
-        return keys.some((k) => {
-            if (typeof data[k] === 'string') {
-                return Boolean(data[k].length);
-            } else {
-                return hasTranslation(data[k]);
-            }
-        });
-    } else if (typeof data === 'string') {
-        return Boolean(data.length);
+    if (typeof data === 'string') {
+        return singularHasTranslation(data);
     }
 
-    return false;
+    return pluralHasTranslation(data);
 }