Merge pull request #1 from DenisChinin/master

#2 Replace 'gtk' encoding with encoding from settings
pavelpower · Dec 2, 2014 · b872d67 · b872d67
2 parents ff9b5e6 + f5151ac
commit b872d67
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/ftl.js b/ftl.js
@@ -28,14 +28,13 @@ var processTemplate = function(args) {
     ]);
 
     cmd.stdout.on('data', function(data) {
-        // args.callback(null, iconv.decode(data, 'gbk'));
-        resultData += iconv.decode(data, 'gbk');
+        resultData += iconv.decode(data, args.settings.encoding);
         stream.emit('data', resultData);
     });
 
     cmd.stderr.on('data', function(data) {
         // Print error message
-        console.log(iconv.decode(data, 'gbk'));
+        console.log(iconv.decode(data, args.settings.encoding));
     });
 
     cmd.stdout.on('end', function(err) {