Merge pull request #13 from teodors/master

cross-platform path resolution
bitjson · Nov 30, 2015 · ec3407d · ec3407d
2 parents e2c74ad + 5657525
commit ec3407d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ var l10n = require('gulp-l10n');
 var opts = {
   elements: ['title', 'p', 'h1'],
   attributes: ['alt', 'title'],
-  directives: 'translate=yes'
+  directives: 'translate=yes',
   attributeSetter: 'translate-attrs'
 };
 

diff --git a/index.js b/index.js
@@ -3,6 +3,7 @@
 var through = require('through2');
 var gutil = require('gulp-util');
 var s18n = require('s18n');
+var path = require('path');
 
 var PLUGIN_NAME = 'gulp-l10n';
 
@@ -110,7 +111,7 @@ module.exports.setLocales = function(options) {
       return;
     }
     // file is buffer
-    var localeId = file.path.split('/').pop().split('.').shift();
+    var localeId = path.basename(file.path, '.json');
     var locale = JSON.parse(String(file.contents));
     localeCaches[options.cacheId].locales[localeId] = locale;
     cb();