Merge afaec1b into aa71f10

README.md

@@ -21,15 +21,18 @@ npm install -g ember-i18n-csv
 Export your ember-i18n localization files to a CSV file for translators:
 
 ```sh
-ember-i18n-csv to-csv --locales-path=path_to_locales_folder --csv-path=i18n.csv
+ember-i18n-csv to-csv --locales-path=path_to_locales_folder --csv-path=i18n.csv [--missing-only]
 ```
 
 and import back in when you get them back:
 
 ```sh
-ember-i18n-csv to-js --csv-path=i18n.csv --locales-path=path_to_locales_folder [--jshint-ignore]
+ember-i18n-csv to-js --csv-path=i18n.csv --locales-path=path_to_locales_folder [--jshint-ignore] [--merge]
 ```
 
+`--missing-only` means the generated CSV will only contain keys where there is a missing translation in one of the locales
+`--merge` means that any keys present in the CSV will overwrite the ones present in the destination locale files but if the key is not present then the existing key will be kept in place. 
+
 ###Excel
 
 It's not as simple as opening, editing, and saving in Excel.

bin/ember-i18n-csv.js

@@ -8,6 +8,12 @@ var argv = require('yargs')
   .options({
     'jshint-ignore': {
       type: 'boolean'
+    },
+    'only-missing': {
+      type: 'boolean'
+    },
+    'merge': {
+      type: 'boolean'
     }
   })
   .argv;
@@ -16,9 +22,13 @@ var direction = argv._[0];
 var localesPath = argv['locales-path'];
 var csvPath = argv['csv-path'];
 var ignoreJshint = argv['jshint-ignore'];
+var onlyMissing = argv['only-missing'];
+var merge = argv['merge'];
 
 var options = {
-  ignoreJshint: ignoreJshint
+  ignoreJshint: ignoreJshint,
+  onlyMissing: onlyMissing,
+  merge: merge
 };
 
 emberI18nCsv(direction, localesPath, csvPath, options);

lib/to-csv.js

@@ -11,7 +11,7 @@ const stat = denodeify(fs.stat);
 const writeFile = denodeify(fs.writeFile);
 const stringify = denodeify(csvStringify);
 
-export default function(localesPath, csvPath) {
+export default function(localesPath, csvPath, { onlyMissing } = {}) {
   return readdir(localesPath).then(locales => {
     let prmoises = locales.map(locale => {
       let filePath = path.resolve(localesPath, locale, 'translations.js');
@@ -76,7 +76,9 @@ export default function(localesPath, csvPath) {
     let lines = [];
     lines.push(['key'].concat(locales.map(locale => locale.replace('.js', ''))));
     for (let i in keys) {
-      lines.push([keys[i]].concat(rows[i]));
+      if (!onlyMissing || rows[i].indexOf('') > -1) {
+        lines.push([keys[i]].concat(rows[i]));
+      }
     }
 
     return stringify(lines);

lib/to-js.js

@@ -9,7 +9,7 @@ const readFile = denodeify(fs.readFile);
 const writeFile = denodeify(fs.writeFile);
 const parse = denodeify(csvParse);
 
-export default function(csvPath, localesPath, { ignoreJshint } = {}) {
+export default function(csvPath, localesPath, { ignoreJshint, merge } = {}) {
   return readFile(csvPath, 'utf8').then(csv => {
     return parse(csv);
   }).then(lines => {
@@ -18,7 +18,14 @@ export default function(csvPath, localesPath, { ignoreJshint } = {}) {
 
     let objs = [];
     for (i in locales) {
-      objs.push({});
+      let obj = {};
+      if (merge) {
+        let filePath = path.resolve(localesPath, locales[i], 'translations.js');
+        if (fs.existsSync(filePath)) {
+          obj = require(filePath).default;
+        }
+      }
+      objs.push(obj);
     }
 
     function recurse(keySections, obj, value) {

test/acceptance/to-csv-test.js

@@ -65,4 +65,28 @@ describe('acceptance - to-csv', function() {
       });
     });
   });
+
+  it('handles option --only-missing', function(done) {
+    let ps = spawn(process.execPath, [
+      'bin/ember-i18n-csv.js',
+      'to-csv',
+      '--locales-path=test/fixtures/locales-only-missing',
+      '--csv-path=tmp/i18n.csv',
+      '--only-missing'
+    ]);
+
+    let out = '';
+    let err = '';
+    ps.stdout.on('data', buffer => out += buffer);
+    ps.stderr.on('data', buffer => err += buffer);
+
+    ps.on('exit', () => {
+      expect(out).to.equal('');
+      expect(err).to.equal('');
+      areFilesEqual('tmp/i18n.csv', 'test/fixtures/i18n-only-missing.csv').then(areSame => {
+        expect(areSame).to.be.true;
+        done();
+      }).catch(done);
+    });
+  });
 });

test/acceptance/to-js-test.js

@@ -56,4 +56,29 @@ describe('acceptance - to-js', function() {
       }).catch(done);
     });
   });
+
+  it('handles option --merge', function(done) {
+    fs.copySync('test/fixtures/locales', 'tmp/locales', { clobber: true });
+    let ps = spawn(process.execPath, [
+      'bin/ember-i18n-csv.js',
+      'to-js',
+      '--csv-path=test/fixtures/i18n-merge.csv',
+      '--locales-path=tmp/locales',
+      '--merge'
+    ]);
+
+    let out = '';
+    let err = '';
+    ps.stdout.on('data', buffer => out += buffer);
+    ps.stderr.on('data', buffer => err += buffer);
+
+    ps.on('exit', () => {
+      expect(out).to.equal('');
+      expect(err).to.equal('');
+      areDirsEqual('tmp/locales', 'test/fixtures/locales-merge').then(areSame => {
+        expect(areSame).to.be.true;
+        done();
+      }).catch(done);
+    });
+  });
 });

test/fixtures/i18n-merge.csv

@@ -0,0 +1,7 @@
+key,en-us,nl-nl,pt-br
+node1.node1-1,Industries,Industrieën,Indústrias
+node1.node1-2.node1-2-2,test,test,test
+node2.node2-1,test,test,test
+node2.node2-2.node2-2-2,test,test,test
+weekday.saturday,Saturday,Zaterdag,Sábado
+weekday.sunday,Sunday,Zondag,Domingo

test/fixtures/i18n-only-missing.csv

@@ -0,0 +1,5 @@
+key,en-us,nl-nl,pt-br
+node2.node2-1,test,test,
+node2.node2-2.node2-2-2,test,test,
+weekday.tuesday,Tuesday,,Terça
+weekday.saturday,Saturday,,Sábado

test/fixtures/locales-merge/en-us/translations.js

@@ -0,0 +1,21 @@
+export default {
+  "node1": {
+    "node1-1": "Industries",
+    "node1-2": {
+      "node1-2-1": "test",
+      "node1-2-2": "test"
+    }
+  },
+  "node2": {
+    "node2-1": "test",
+    "node2-2": {
+      "node2-2-1": "test",
+      "node2-2-2": "test"
+    }
+  },
+  "weekday": {
+    "tuesday": "Tuesday",
+    "saturday": "Saturday",
+    "sunday": "Sunday"
+  }
+};

test/fixtures/locales-merge/nl-nl/translations.js

@@ -0,0 +1,21 @@
+export default {
+  "node1": {
+    "node1-1": "Industrieën",
+    "node1-2": {
+      "node1-2-1": "test",
+      "node1-2-2": "test"
+    }
+  },
+  "node2": {
+    "node2-1": "test",
+    "node2-2": {
+      "node2-2-1": "test",
+      "node2-2-2": "test"
+    }
+  },
+  "weekday": {
+    "tuesday": "Dinsdag",
+    "saturday": "Zaterdag",
+    "sunday": "Zondag"
+  }
+};

test/fixtures/locales-merge/pt-br/translations.js

@@ -0,0 +1,21 @@
+export default {
+  "node1": {
+    "node1-1": "Indústrias",
+    "node1-2": {
+      "node1-2-1": "test",
+      "node1-2-2": "test"
+    }
+  },
+  "node2": {
+    "node2-1": "test",
+    "node2-2": {
+      "node2-2-1": "test",
+      "node2-2-2": "test"
+    }
+  },
+  "weekday": {
+    "tuesday": "Terça",
+    "saturday": "Sábado",
+    "sunday": "Domingo"
+  }
+};

test/fixtures/locales-only-missing/en-us/translations.js

@@ -0,0 +1,24 @@
+/* jshint ignore:start */
+
+export default {
+  "node1": {
+    "node1-1": "Industries",
+    "node1-2": {
+      "node1-2-1": "test",
+      "node1-2-2": "test"
+    }
+  },
+  "node2": {
+    "node2-1": "test",
+    "node2-2": {
+      "node2-2-1": "test",
+      "node2-2-2": "test"
+    }
+  },
+  "weekday": {
+    "tuesday": "Tuesday",
+    "saturday": "Saturday"
+  }
+};
+
+/* jshint ignore:end */

test/fixtures/locales-only-missing/nl-nl/translations.js

@@ -0,0 +1,20 @@
+/* jshint ignore:start */
+
+export default {
+  "node1": {
+    "node1-1": "Industrieën",
+    "node1-2": {
+      "node1-2-1": "test",
+      "node1-2-2": "test"
+    }
+  },
+  "node2": {
+    "node2-1": "test",
+    "node2-2": {
+      "node2-2-1": "test",
+      "node2-2-2": "test"
+    }
+  },
+};
+
+/* jshint ignore:end */

test/fixtures/locales-only-missing/pt-br/translations.js

@@ -0,0 +1,22 @@
+/* jshint ignore:start */
+
+export default {
+  "node1": {
+    "node1-1": "Indústrias",
+    "node1-2": {
+      "node1-2-1": "test",
+      "node1-2-2": "test"
+    }
+  },
+  "node2": {
+    "node2-2": {
+      "node2-2-1": "test",
+    }
+  },
+  "weekday": {
+    "tuesday": "Terça",
+    "saturday": "Sábado"
+  }
+};
+
+/* jshint ignore:end */

test/integration/ember-i18n-csv-test.js

@@ -17,6 +17,14 @@ describe('integration - ember-i18n-csv', function() {
       });
     });
 
+    it('handles option --only-missing', function() {
+      return emberI18nCsv('to-csv', 'test/fixtures/locales-only-missing', 'tmp/i18n.csv', { onlyMissing: true }).then(() => {
+        return areFilesEqual('tmp/i18n.csv', 'test/fixtures/i18n-only-missing.csv').then(areSame => {
+          expect(areSame).to.be.true;
+        });
+      });
+    });
+
     describe('empty folders', function() {
       beforeEach(function() {
         fs.emptyDirSync('test/fixtures/locales/unknown');
@@ -56,6 +64,23 @@ describe('integration - ember-i18n-csv', function() {
         });
       });
     });
+    describe('merge', function() {
+      beforeEach(function() {
+        fs.copySync('test/fixtures/locales', 'tmp/locales', { clobber: true });
+      });
+
+      afterEach(function() {
+        fs.emptyDirSync('tmp');
+      });
+
+      it('handles option --merge', function() {
+        return emberI18nCsv('to-js', 'tmp/locales', 'test/fixtures/i18n-merge.csv', { merge: true }).then(() => {
+          return areDirsEqual('tmp/locales', 'test/fixtures/locales-merge').then(areSame => {
+            expect(areSame).to.be.true;
+          });
+        });
+      });
+    });
   });
 
   it('handles invalid', function() {