Merge pull request #920 from jleyva/MOBILE-2026

jleyva · web-flow · commit f0a58883a2b2 · 2017-02-21T16:14:37.000+01:00
MOBILE-2026 gulp: Fix language strings ordering in build files
diff --git a/gulpfile.js b/gulpfile.js
@@ -92,6 +92,7 @@ function treatFile(file, data) {
  */
 function treatMergedData(data) {
   var merged = {};
+  var mergedOrdered = {};
 
   for (var filepath in data) {
 
@@ -126,7 +127,12 @@ function treatMergedData(data) {
     }
   }
 
-  return new Buffer(JSON.stringify(merged, null, 4));
+  // Force ordering by string key.
+  Object.keys(merged).sort().forEach(function(k){
+    mergedOrdered[k] = merged[k];
+  });
+
+  return new Buffer(JSON.stringify(mergedOrdered, null, 4));
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ function treatFile(file, data) {`
`92`	`92`	`*/`
`93`	`93`	`function treatMergedData(data) {`
`94`	`94`	`var merged = {};`
	`95`	`+ var mergedOrdered = {};`
`95`	`96`
`96`	`97`	`for (var filepath in data) {`
`97`	`98`
`@@ -126,7 +127,12 @@ function treatMergedData(data) {`
`126`	`127`	`}`
`127`	`128`	`}`
`128`	`129`
`129`		`- return new Buffer(JSON.stringify(merged, null, 4));`
	`130`	`+ // Force ordering by string key.`
	`131`	`+ Object.keys(merged).sort().forEach(function(k){`
	`132`	`+ mergedOrdered[k] = merged[k];`
	`133`	`+ });`
	`134`	`+`
	`135`	`+ return new Buffer(JSON.stringify(mergedOrdered, null, 4));`
`130`	`136`	`}`
`131`	`137`
`132`	`138`	`/**`