Merge pull request #7 from zakkudo/cleanupPluralForms

Cleanup plural forms
zakkudo · Sep 24, 2018 · ae88d3a · ae88d3a
2 parents b40f930 + da8d347
commit ae88d3a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -99,7 +99,7 @@ Where `locales/fr.json` will look like this for use by your translators:
     },
     "There is one user": {
         // src/pages/AboutPage/index.js:40
-        "default": {"one":"French translation", "other":"French translation"},
+        "default": {"1":"French translation", "2":"French translation"},
     },
     "Welcome to the about page!": {
         // src/pages/AboutPage/index.js:38
@@ -115,7 +115,7 @@ And the optimized `src/.locales/fr.json` will look like this for use by your dev
         "default": "French translation",
         "menuitem": "French translation"
     },
-    "There is one user": {"one":"French translation", "other":"French translation"},
+    "There is one user": {"1":"French translation", "2":"French translation"},
     "Welcome to the about page!": "French translation"
 }
 ```

diff --git a/src/README.md b/src/README.md
@@ -99,7 +99,7 @@ Where `locales/fr.json` will look like this for use by your translators:
     },
     "There is one user": {
         // src/pages/AboutPage/index.js:40
-        "default": {"one":"French translation", "other":"French translation"},
+        "default": {"1":"French translation", "2":"French translation"},
     },
     "Welcome to the about page!": {
         // src/pages/AboutPage/index.js:38
@@ -115,7 +115,7 @@ And the optimized `src/.locales/fr.json` will look like this for use by your dev
         "default": "French translation",
         "menuitem": "French translation"
     },
-    "There is one user": {"one":"French translation", "other":"French translation"},
+    "There is one user": {"1":"French translation", "2":"French translation"},
     "Welcome to the about page!": "French translation"
 }
 ```

diff --git a/src/index.js b/src/index.js
@@ -54,14 +54,24 @@ function __p(context, key) {
  * @private
  */
 function __n(singular) {
-    return [toKeyWithContext(singular), {one: "", other: ""}];
+    return [toKeyWithContext(singular), {
+        // Singular form placeholder
+        "1": "",
+        // Plural form placeholder
+        "2": ""
+    }];
 }
 
 /**
  * @private
  */
 function __np(context, singular) {
-    return [toKeyWithContext(singular, context), {one: "", other: ""}];
+    return [toKeyWithContext(singular, context), {
+        // Singular form placeholder
+        "1": "",
+        // Plural form placeholder
+        "2": ""
+    }];
 }
 
 /**