allow multiple files for translations

mercersmith · Dec 30, 2013 · cb07bc9 · cb07bc9
1 parent 6299415
commit cb07bc9
Show file tree

Hide file tree

Showing 25 changed files with 434 additions and 1 deletion.
diff --git a/locales/bg/app.json → locales-old/bg/app.json b/locales/bg/app.json → locales-old/bg/app.json
diff --git a/locales/bg/app.original.json → locales-old/bg/app.original.json b/locales/bg/app.original.json → locales-old/bg/app.original.json
diff --git a/locales/cs/app.json → locales-old/cs/app.json b/locales/cs/app.json → locales-old/cs/app.json
diff --git a/locales/cu/app.json → locales-old/cu/app.json b/locales/cu/app.json → locales-old/cu/app.json
diff --git a/locales/de/app.json → locales-old/de/app.json b/locales/de/app.json → locales-old/de/app.json
diff --git a/locales/el/app.json → locales-old/el/app.json b/locales/el/app.json → locales-old/el/app.json
diff --git a/locales/en/app.json → locales-old/en/app.json b/locales/en/app.json → locales-old/en/app.json
diff --git a/locales/es/app.json → locales-old/es/app.json b/locales/es/app.json → locales-old/es/app.json
diff --git a/locales/fr/app.json → locales-old/fr/app.json b/locales/fr/app.json → locales-old/fr/app.json
diff --git a/locales/he/app.json → locales-old/he/app.json b/locales/he/app.json → locales-old/he/app.json
diff --git a/locales/id/app.json → locales-old/id/app.json b/locales/id/app.json → locales-old/id/app.json
diff --git a/locales/it/app.json → locales-old/it/app.json b/locales/it/app.json → locales-old/it/app.json
diff --git a/locales/ja/app.json → locales-old/ja/app.json b/locales/ja/app.json → locales-old/ja/app.json
diff --git a/locales/nl/app.json → locales-old/nl/app.json b/locales/nl/app.json → locales-old/nl/app.json
diff --git a/locales/no/app.json → locales-old/no/app.json b/locales/no/app.json → locales-old/no/app.json
diff --git a/locales/pl/app.json → locales-old/pl/app.json b/locales/pl/app.json → locales-old/pl/app.json
diff --git a/locales/pt/app.json → locales-old/pt/app.json b/locales/pt/app.json → locales-old/pt/app.json
diff --git a/locales/ru/app.json → locales-old/ru/app.json b/locales/ru/app.json → locales-old/ru/app.json
diff --git a/locales/sl/app.json → locales-old/sl/app.json b/locales/sl/app.json → locales-old/sl/app.json
diff --git a/locales/uk/app.json → locales-old/uk/app.json b/locales/uk/app.json → locales-old/uk/app.json
diff --git a/locales/ur/app.json → locales-old/ur/app.json b/locales/ur/app.json → locales-old/ur/app.json
diff --git a/locales/en/app.js b/locales/en/app.js
@@ -0,0 +1,13 @@
+var _ = require('lodash');
+
+var files = [
+  // List of files containing translations
+  require('./main.json'),
+  require('./secondary.json')
+];
+
+module.exports = {};
+
+_.each(files, function(file){
+  _.merge(module.exports, file);
+});
diff --git a/locales/en/main.json b/locales/en/main.json
diff --git a/locales/en/secondary.json b/locales/en/secondary.json
@@ -0,0 +1,3 @@
+{
+  "secondaryString": "an example"
+}
diff --git a/src/middleware.js b/src/middleware.js
@@ -94,7 +94,7 @@ var getManifestFiles = function(page){
 var translations = {};
 
 var loadTranslations = function(locale){
-  translations[locale] = require(path.join(__dirname, "/../locales/", locale, 'app.json'));
+  translations[locale] = require(path.join(__dirname, "/../locales/", locale, 'app.js'));
 }
 
 // First fetch english so we can merge with missing strings in other languages