Merge pull request #29 from alibaba/nest

Nested json
alibaba · Sep 25, 2017 · f47a16d · f47a16d
2 parents 8cfc08a + 0f8f50d
commit f47a16d
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/examples/browser-example/package.json b/examples/browser-example/package.json
@@ -8,7 +8,7 @@
     "react-scripts": "0.8.4"
   },
   "dependencies": {
-    "react-intl-universal": "^1.3.4",
+    "react-intl-universal": "^1.4.3",
     "axios": "^0.16.1",
     "lodash": "^4.17.4",
     "react": "^15.5.4",

diff --git a/examples/node-js-example/package.json b/examples/node-js-example/package.json
@@ -8,7 +8,7 @@
     "react-scripts": "^0.9.0"
   },
   "dependencies": {
-    "react-intl-universal": "^1.3.4",
+    "react-intl-universal": "^1.4.3",
     "react": "^15.5.4",
     "react-dom": "^15.5.4"
   },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-intl-universal",
-  "version": "1.3.4",
+  "version": "1.4.3",
   "description": "Internationalize React apps. Not only for React.Component but also for Vanilla JS.",
   "keywords": [
     "intl",

diff --git a/src/index.js b/src/index.js
@@ -51,7 +51,7 @@ class ReactIntlUniversal {
     if (!locales || !locales[currentLocale]) {
       return "";
     }
-    let msg = locales[currentLocale][key];
+    let msg = this.getDescendantProp(locales[currentLocale], key);
     if (msg == null) {
       console.warn(
         `react-intl-universal key "${key}" not defined in ${currentLocale}`
@@ -221,6 +221,14 @@ class ReactIntlUniversal {
     }
   }
 
+  getDescendantProp(locale, key) {
+    const msg = key.split(".").reduce(function(a, b) {
+      return (a != undefined) ? a[b] : a ;
+    }, locale);
+
+    return msg;
+  }
+
   getLocaleFromBrowser() {
     return navigator.language || navigator.userLanguage;
   }

diff --git a/test/index.js b/test/index.js
@@ -21,6 +21,12 @@ test("Message with variables", () => {
   expect(intl.get("HELLO", { name: "Tony" })).toBe("Hello, Tony");
 });
 
+test("Set specific locale with nested notation", () => {
+  intl.init({ locales, currentLocale: "en-US" });
+  expect(intl.get("NESTED.HELLO")).toBe("Hello World");
+  expect(intl.get("NESTED.HELLO_NAME", { name: "World" })).toBe("Hello, World");
+});
+
 test("react-intl mirror API formatMessage:variables", () => {
   intl.init({ locales, currentLocale: "en-US" });
   const name = "Tony";
@@ -196,6 +202,11 @@ test("Default message", () => {
   );
 });
 
+test("Default message with nested key", () => {
+  intl.init({ locales, currentLocale: "en-US" });
+  expect(intl.get("NOT_EXIST_KEY.HELLO").defaultMessage("Hello World")).toBe("Hello World");
+});
+
 test("Default message", () => {
   intl.init({ locales, currentLocale: "en-US" });
   expect(intl.get("not-exist-key").defaultMessage("this is default msg")).toBe(

diff --git a/test/locales/en-US.js b/test/locales/en-US.js
@@ -7,5 +7,9 @@ module.exports = ({
   "SALE_END": "Sale begins {start, date, long}",
   "COUPON": "Coupon expires at {expires, time, medium}",
   "SALE_PRICE": "The price is {price, number, USD}",
-  "PHOTO": "You have {num, plural, =0 {no photos.} =1 {one photo.} other {# photos.}}"
+  "PHOTO": "You have {num, plural, =0 {no photos.} =1 {one photo.} other {# photos.}}",
+  "NESTED": {
+    "HELLO": "Hello World",
+    "HELLO_NAME": "Hello, {name}"
+  }
 });