convert locales back into js instead of json

Author: alexcjohnson

lib/index-basic.js

@@ -17,8 +17,8 @@ Plotly.register([
 
 // locales
 Plotly.register([
-    require('./locale-en.json'),
-    require('./locale-en-us.json')
+    require('./locale-en'),
+    require('./locale-en-us')
 ]);
 
 module.exports = Plotly;

lib/index-cartesian.js

@@ -25,8 +25,8 @@ Plotly.register([
 
 // locales
 Plotly.register([
-    require('./locale-en.json'),
-    require('./locale-en-us.json')
+    require('./locale-en'),
+    require('./locale-en-us')
 ]);
 
 module.exports = Plotly;

lib/index-finance.js

@@ -20,8 +20,8 @@ Plotly.register([
 
 // locales
 Plotly.register([
-    require('./locale-en.json'),
-    require('./locale-en-us.json')
+    require('./locale-en'),
+    require('./locale-en-us')
 ]);
 
 module.exports = Plotly;

lib/index-geo.js

@@ -17,8 +17,8 @@ Plotly.register([
 
 // locales
 Plotly.register([
-    require('./locale-en.json'),
-    require('./locale-en-us.json')
+    require('./locale-en'),
+    require('./locale-en-us')
 ]);
 
 module.exports = Plotly;

lib/index-gl2d.js

@@ -20,8 +20,8 @@ Plotly.register([
 
 // locales
 Plotly.register([
-    require('./locale-en.json'),
-    require('./locale-en-us.json')
+    require('./locale-en'),
+    require('./locale-en-us')
 ]);
 
 module.exports = Plotly;

lib/index-gl3d.js

@@ -18,8 +18,8 @@ Plotly.register([
 
 // locales
 Plotly.register([
-    require('./locale-en.json'),
-    require('./locale-en-us.json')
+    require('./locale-en'),
+    require('./locale-en-us')
 ]);
 
 module.exports = Plotly;

lib/index-mapbox.js

@@ -16,8 +16,8 @@ Plotly.register([
 
 // locales
 Plotly.register([
-    require('./locale-en.json'),
-    require('./locale-en-us.json')
+    require('./locale-en'),
+    require('./locale-en-us')
 ]);
 
 module.exports = Plotly;

lib/index.js

@@ -73,8 +73,8 @@ Plotly.register([
 
 // locales
 Plotly.register([
-    require('./locale-en.json'),
-    require('./locale-en-us.json')
+    require('./locale-en.js'),
+    require('./locale-en-us.js')
 ]);
 
 module.exports = Plotly;

lib/locale-en-us.js

@@ -0,0 +1,17 @@
+/**
+* Copyright 2012-2017, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+module.exports = {
+    moduleType: 'locale',
+    name: 'en-US',
+    dictionary: {
+        'Click to enter Colorscale title': 'Click to enter Colorscale title'
+    }
+};

lib/locale-en-us.json

@@ -0,0 +1,17 @@
+/**
+* Copyright 2012-2017, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+module.exports = {
+    moduleType: 'locale',
+    name: 'en',
+    dictionary: {
+        'Click to enter Colorscale title': 'Click to enter Colourscale title'
+    }
+};

lib/locale-en.js

@@ -108,7 +108,6 @@
     "world-calendars": "^1.0.3"
   },
   "devDependencies": {
-    "add-stream": "^1.0.0",
     "brfs": "^1.4.3",
     "browserify": "^14.1.0",
     "browserify-transform-tools": "^1.7.0",

lib/locale-en.json

@@ -60,10 +60,10 @@ constants.partialBundlePaths.forEach(function(pathObj) {
 });
 
 // "Browserify" the locales
-var localeGlob = path.join(constants.pathToLib, 'locale-*.json');
+var localeGlob = path.join(constants.pathToLib, 'locale-*.js');
 glob(localeGlob, function(err, files) {
     files.forEach(function(file) {
-        var outName = 'plotly-' + path.basename(file).replace(/.json$/, '.js');
+        var outName = 'plotly-' + path.basename(file);
         var outPath = path.join(constants.pathToDist, outName);
         wrapLocale(file, outPath);
     });

package.json

@@ -3,13 +3,14 @@ var path = require('path');
 
 var minify = require('minify-stream');
 var intoStream = require('into-stream');
-var addStream = require('add-stream');
 
 var constants = require('./constants');
 
 var prefix = 'Plotly.register(';
 var suffix = ');';
 
+var moduleMarker = 'module.exports = ';
+
 /** Wrap a locale json file into a standalone js file
  *
  * @param {string} pathToInput path to the locale json file
@@ -18,14 +19,19 @@ var suffix = ');';
  * Logs basename of bundle when completed.
  */
 module.exports = function wrap_locale(pathToInput, pathToOutput) {
-    intoStream(prefix)
-        .pipe(addStream(fs.createReadStream(pathToInput)))
-        .pipe(addStream(intoStream(suffix)))
-        .pipe(minify(constants.uglifyOptions))
-        .pipe(fs.createWriteStream(pathToOutput))
-        .on('finish', function() {
-            logger(pathToOutput);
-        });
+    fs.readFile(pathToInput, 'utf8', function(err, data) {
+        var moduleStart = data.indexOf(moduleMarker) + moduleMarker.length;
+        var moduleEnd = data.indexOf(';', moduleStart);
+
+        var rawOut = prefix + data.substr(moduleStart, moduleEnd - moduleStart) + suffix;
+
+        intoStream(rawOut)
+            .pipe(minify(constants.uglifyOptions))
+            .pipe(fs.createWriteStream(pathToOutput))
+            .on('finish', function() {
+                logger(pathToOutput);
+            });
+    });
 };
 
 function logger(pathToOutput) {