Add custom function to generate lang files

Author: taylortom

.gitignore

@@ -23,8 +23,6 @@
 /plugins/content/menu/versions/
 /plugins/content/bower/bowercache/
 
-/routes/lang/en.json
-
 /temp
 /test_frontend/img
 /tmp

Gruntfile.js

@@ -4,15 +4,6 @@ module.exports = function(grunt) {
   // Project configuration.
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
-    "merge-json": {
-      en: {
-        src: [
-          'routes/lang/en-application.json',
-          'frontend/src/**/lang/en.json'
-        ],
-        dest: 'routes/lang/en.json'
-      }
-    },
     copy: {
       main: {
         files: [
@@ -194,7 +185,7 @@ module.exports = function(grunt) {
       },
       lang: {
         files: ['routes/lang/*.json'],
-        tasks: ['merge-json']
+        tasks: ['generate-lang-json']
       }
     },
     mochaTest: {
@@ -251,7 +242,7 @@ module.exports = function(grunt) {
     grunt.file.write(configFile, JSON.stringify(config, null, 2));
     // run the tasks
     var compilation = (config.isProduction) ? 'compile' : 'dev';
-    grunt.task.run(['requireBundle', 'merge-json', 'copy', 'less:' + compilation, 'handlebars', 'requirejs:'+ compilation]);
+    grunt.task.run(['requireBundle', 'generate-lang-json', 'copy', 'less:' + compilation, 'handlebars', 'requirejs:'+ compilation]);
   });
 
   grunt.registerTask('server', "Running Server", function() {
@@ -346,7 +337,34 @@ module.exports = function(grunt) {
       done();
     }
   });
+  // TODO should probably have config up there ^
+  grunt.registerTask('generate-lang-json', function() {
+    var _ = require('underscore');
+    var fs = require('fs-extra');
+    var path = require('path');
+
+    var langFileExt = '.json';
+    var backendSrc = path.join('routes', 'lang', '*' + langFileExt);
+    var frontendSrc = path.join('frontend', 'src', '**', 'lang');
+    var dest = path.join('temp', 'lang');
+    // load each route lang file
+    /**
+    * NOTE there must be a file in routes/lang for the language to be loaded,
+    * won't work if you've only got lang files in frontend
+    */
+    grunt.file.expand({}, backendSrc).forEach(function(filePath) {
+      var lang = path.basename(filePath, langFileExt);
+      var data = _.extend({}, fs.readJSONSync(filePath));
+      // load all matching frontend lang files
+      grunt.file.expand({}, path.join(frontendSrc, lang + langFileExt)).forEach(function(filePath2) {
+        // TODO check for duplicates
+        _.extend(data, fs.readJSONSync(filePath2));
+      });
+      fs.ensureDirSync(dest);
+      fs.writeJSONSync(path.join(dest, lang + langFileExt), data, { spaces: 2 });
+    });
+  });
 
   grunt.registerTask('test', ['mochaTest']);
-  grunt.registerTask('default', ['merge-json', 'requireBundle', 'less:dev', 'handlebars', 'watch']);
+  grunt.registerTask('default', ['generate-lang-json', 'requireBundle', 'less:dev', 'handlebars', 'watch']);
 };

package.json

@@ -116,7 +116,6 @@
     "grunt-contrib-requirejs": "~0.4.4",
     "grunt-contrib-watch": "~0.5.1",
     "grunt-jscs": "^2.3.0",
-    "grunt-merge-json": "^0.9.5",
     "grunt-mocha-test": "~0.7.0",
     "grunt-open": "~0.2.2",
     "handlebars": "^4.0.5",

routes/lang/en-application.json routes/lang/en.jsonroutes/lang/en-application.json renamed to routes/lang/en.json

@@ -1,18 +1,19 @@
 var express = require('express');
 var path = require('path');
 var fs = require('fs');
-var server = module.exports = express();
 
-server.get('/lang/:lang', function (req, res, next) {
-    var lang = req.params.lang; // ie 'en' for /lang/en
-    var filename = path.join(__dirname, lang) + '.json';
-    var file;
+var configuration = require('../../lib/configuration');
+var Constants = require('../../lib/outputmanager').Constants;
 
-    fs.exists(filename, function(exists) {
-        file = exists 
-            ? require(filename)
-            : require(path.join(__dirname, 'en') + '.json');
+var server = module.exports = express();
 
-        return res.json(file);
-    });
+server.get('/lang/:lang', function (req, res, next) {
+  var lang = req.params.lang; // ie 'en' for /lang/en
+  var filename = path.join(configuration.serverRoot, Constants.Folders.Temp, 'lang', lang + '.json');
+  fs.exists(filename, function(exists) {
+    if(!exists) {
+      return res.status(404).end();
+    }
+    return res.json(require(filename));
+  });
 });