Added support for multiple messages files

test/ProductionModePlugin.js

@@ -27,7 +27,8 @@ const mkWebpackConfig = (options) => ({
           production: true,
           developmentLocale: "en",
           supportedLocales: supportedLocales,
-          messages: path.join(__dirname, "fixtures/translations/[locale].json"),
+          messages: [path.join(__dirname, "fixtures/translations/[locale].json"),
+            path.join(__dirname, "fixtures/more-translations/[locale].json")],
           output: "[locale].js"
         },
         options.additionalGWPAttributes
@@ -167,6 +168,11 @@ function commonTests(testName, webpackConfig, outputPath) {
       expect(result).to.equal("Be the first to like this");
     });
 
+    it("should include strings defined in all locale files", function() {
+      const result = Globalize.formatMessage("foo");
+      expect(result).to.equal("bar");
+    });
+
     it("should include formatRelativeTime", () => {
       const result = Globalize.formatRelativeTime(1, "second");
       expect(result).to.equal("in 1 second");

test/fixtures/app.js

@@ -27,6 +27,9 @@ like( 1 );
 like( 2 );
 like( 3 );
 
+// Use Globalize to format a message from a second message file
+Globalize.messageFormatter("foo");
+
 // Use Globalize to format relative time.
 Globalize.formatRelativeTime( -35, "second" );
 

test/fixtures/more-translations/en.json

@@ -0,0 +1,5 @@
+{
+  "en": {
+    "foo": "bar"
+  }
+}

test/fixtures/more-translations/es.json

@@ -0,0 +1,5 @@
+{
+  "es": {
+    "foo": "baz"
+  }
+}

util.js

@@ -52,13 +52,19 @@ module.exports = {
     }
   },
 
-  readMessages: (messagesFilepath, locale) => {
-    messagesFilepath = messagesFilepath.replace("[locale]", locale);
-    if (!fs.existsSync(messagesFilepath) || !fs.statSync(messagesFilepath).isFile()) {
-      console.warn("Unable to find messages file: `" + messagesFilepath + "`");
-      return null;
+  readMessages: (messagesFilepaths, locale) => {
+    let messages = {};
+    const filepaths = [].concat(messagesFilepaths);
+
+    for (let path of filepaths) {
+      path = path.replace("[locale]", locale);
+      if (!fs.existsSync(path) || !fs.statSync(path).isFile()) {
+        console.warn("Unable to find messages file: `" + path + "`");
+        return null;
+      }
+      messages[locale] = Object.assign(messages[locale] || {}, JSON.parse(fs.readFileSync(path))[locale]);
     }
-    return JSON.parse(fs.readFileSync(messagesFilepath));
+    return messages;
   },
 
   tmpdir: (base) => {