convert locales to json, only en(US)? in bundles, and build all locales for dist

alexcjohnson · alexcjohnson · commit 4b48038b0ed0 · 2017-12-08T12:38:33.000-05:00
diff --git a/dist/plotly-locale-en-us.js b/dist/plotly-locale-en-us.js
diff --git a/dist/plotly-locale-en.js b/dist/plotly-locale-en.js
diff --git a/lib/index-basic.js b/lib/index-basic.js
@@ -16,6 +16,9 @@ Plotly.register([
 ]);
 
 // locales
-Plotly.register(require('./locales.js'));
+Plotly.register([
+    require('./locale-en.json'),
+    require('./locale-en-us.json')
+]);
 
 module.exports = Plotly;
diff --git a/lib/index-cartesian.js b/lib/index-cartesian.js
@@ -24,6 +24,9 @@ Plotly.register([
 ]);
 
 // locales
-Plotly.register(require('./locales.js'));
+Plotly.register([
+    require('./locale-en.json'),
+    require('./locale-en-us.json')
+]);
 
 module.exports = Plotly;
diff --git a/lib/index-finance.js b/lib/index-finance.js
@@ -19,6 +19,9 @@ Plotly.register([
 ]);
 
 // locales
-Plotly.register(require('./locales.js'));
+Plotly.register([
+    require('./locale-en.json'),
+    require('./locale-en-us.json')
+]);
 
 module.exports = Plotly;
diff --git a/lib/index-geo.js b/lib/index-geo.js
@@ -16,6 +16,9 @@ Plotly.register([
 ]);
 
 // locales
-Plotly.register(require('./locales.js'));
+Plotly.register([
+    require('./locale-en.json'),
+    require('./locale-en-us.json')
+]);
 
 module.exports = Plotly;
diff --git a/lib/index-gl2d.js b/lib/index-gl2d.js
@@ -19,6 +19,9 @@ Plotly.register([
 ]);
 
 // locales
-Plotly.register(require('./locales.js'));
+Plotly.register([
+    require('./locale-en.json'),
+    require('./locale-en-us.json')
+]);
 
 module.exports = Plotly;
diff --git a/lib/index-gl3d.js b/lib/index-gl3d.js
@@ -17,6 +17,9 @@ Plotly.register([
 ]);
 
 // locales
-Plotly.register(require('./locales.js'));
+Plotly.register([
+    require('./locale-en.json'),
+    require('./locale-en-us.json')
+]);
 
 module.exports = Plotly;
diff --git a/lib/index-mapbox.js b/lib/index-mapbox.js
@@ -15,6 +15,9 @@ Plotly.register([
 ]);
 
 // locales
-Plotly.register(require('./locales.js'));
+Plotly.register([
+    require('./locale-en.json'),
+    require('./locale-en-us.json')
+]);
 
 module.exports = Plotly;
diff --git a/lib/index.js b/lib/index.js
@@ -72,6 +72,9 @@ Plotly.register([
 ]);
 
 // locales
-Plotly.register(require('./locales.js'));
+Plotly.register([
+    require('./locale-en.json'),
+    require('./locale-en-us.json')
+]);
 
 module.exports = Plotly;
diff --git a/lib/locale-en-us.js b/lib/locale-en-us.js
diff --git a/lib/locale-en-us.json b/lib/locale-en-us.json
@@ -0,0 +1,7 @@
+{
+    "moduleType": "locale",
+    "name": "en-US",
+    "dictionary": {
+        "Click to enter Colorscale title": "Click to enter Colorscale title"
+    }
+}
diff --git a/lib/locale-en.js b/lib/locale-en.js
diff --git a/lib/locale-en.json b/lib/locale-en.json
@@ -0,0 +1,7 @@
+{
+    "moduleType": "locale",
+    "name": "en",
+    "dictionary": {
+        "Click to enter Colorscale title": "Click to enter Colourscale title"
+    }
+}
diff --git a/lib/locales.js b/lib/locales.js
diff --git a/package.json b/package.json
@@ -108,6 +108,7 @@
     "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",
@@ -122,6 +123,7 @@
     "glslify": "^4.0.0",
     "gzip-size": "^3.0.0",
     "image-size": "^0.5.1",
+    "into-stream": "^3.1.0",
     "jasmine-core": "^2.4.1",
     "jsdom": "^11.2.0",
     "karma": "^1.5.0",
diff --git a/tasks/bundle.js b/tasks/bundle.js
@@ -1,7 +1,11 @@
+var path = require('path');
+var glob = require('glob');
+
 var constants = require('./util/constants');
 var common = require('./util/common');
 var _bundle = require('./util/browserify_wrapper');
 var makeSchema = require('./util/make_schema');
+var wrapLocale = require('./util/wrap_locale');
 /*
  * This script takes one argument
  *
@@ -54,3 +58,13 @@ constants.partialBundlePaths.forEach(function(pathObj) {
         pathToMinBundle: pathObj.distMin
     });
 });
+
+// "Browserify" the locales
+var localeGlob = path.join(constants.pathToLib, 'locale-*.json');
+glob(localeGlob, function(err, files) {
+    files.forEach(function(file) {
+        var outName = 'plotly-' + path.basename(file).replace(/.json$/, '.js');
+        var outPath = path.join(constants.pathToDist, outName);
+        wrapLocale(file, outPath);
+    });
+});
diff --git a/tasks/util/wrap_locale.js b/tasks/util/wrap_locale.js
@@ -0,0 +1,35 @@
+var fs = require('fs');
+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 = ');';
+
+/** Wrap a locale json file into a standalone js file
+ *
+ * @param {string} pathToInput path to the locale json file
+ * @param {string} pathToOutput path to destination file
+ *
+ * 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);
+        });
+};
+
+function logger(pathToOutput) {
+    var log = 'ok ' + path.basename(pathToOutput);
+
+    console.log(log);
+}
