Fix Translations (OSX)

jaruba · Mar 6, 2016 · 2b366dc · 2b366dc
1 parent d171cc3
commit 2b366dc
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/src/hotkeys.html b/src/hotkeys.html
@@ -205,7 +205,11 @@ <h2 class="i18n">Developers</h2>
 if (!localStorage.appLang) localStorage.appLang = 'template';
 if (['template','English'].indexOf(localStorage.appLang) > -1) newLang = 'template';
 else newLang = localStorage.appLang;
-translator.changeLocal(require('path').dirname(process.execPath)+'/src/locale/' + newLang.split(' ').join('_'));
+if (process.platform == 'darwin') {
+	translator.changeLocal('./locale/' + newLang.split(' ').join('_'));
+} else {
+	translator.changeLocal(require('path').dirname(process.execPath)+'/src/locale/' + newLang.split(' ').join('_'));
+}
 var i18n = translator.i18n;
 document.title = i18n(document.title);
 </script>

diff --git a/src/lib/ui.js b/src/lib/ui.js
@@ -787,7 +787,13 @@ function refreshMainBut() {
 	}
 }
 
-require('fs').readdir(require('path').dirname(process.execPath)+'/src/locale', function(err, files) {
+if (process.platform == 'darwin') {
+	var localePath = './src/locale';
+} else {
+	var localePath = require('path').dirname(process.execPath)+'/src/locale';
+}
+
+require('fs').readdir(localePath, function(err, files) {
 	var langOptions = '<option class="i18n">' + i18n('English') + '</option>';
 	langOptions += files.map(function(el) {
 		return el != 'template.js' ? '<option value="' + el.replace('.js', '').split('_').join(' ') + '">' + translator.langName(el.replace('.js', '').split('_').join(' ')) + '</option>' : '';
@@ -801,7 +807,11 @@ $("#change-lang").on('change', function() {
 	} else {
 		localStorage.appLang = $(this).val();
 	}
-	translator.changeLocal(require('path').dirname(process.execPath)+'/src/locale/' + localStorage.appLang.split(' ').join('_'));
+	if (process.platform == 'darwin') {
+		translator.changeLocal('./locale/' + localStorage.appLang.split(' ').join('_'));
+	} else {
+		translator.changeLocal(require('path').dirname(process.execPath)+'/src/locale/' + localStorage.appLang.split(' ').join('_'));
+	}
 	setTimeout(function() {
 		refreshMainBut();
 	},0);

diff --git a/src/mask.html b/src/mask.html
@@ -33,7 +33,11 @@
 	if (!localStorage.appLang) localStorage.appLang = 'template';
 	if (['template','English'].indexOf(localStorage.appLang) > -1) newLang = 'template';
 	else newLang = localStorage.appLang;
-	translator.setLocal(require('path').dirname(process.execPath)+'/src/locale/' + newLang.split(' ').join('_'));
+	if (process.platform == 'darwin') {
+		translator.setLocal('./locale/' + newLang.split(' ').join('_'));
+	} else {
+		translator.setLocal(require('path').dirname(process.execPath)+'/src/locale/' + newLang.split(' ').join('_'));
+	}
 	var i18n = translator.i18n;
     </script>
     <script src="lib/defaults.js"></script>

diff --git a/src/updater.html b/src/updater.html
@@ -14,7 +14,11 @@
 	if (!localStorage.appLang) localStorage.appLang = 'template';
 	if (['template','English'].indexOf(localStorage.appLang) > -1) newLang = 'template';
 	else newLang = localStorage.appLang;
-	translator.setLocal(require('path').dirname(process.execPath)+'/src/locale/' + newLang.split(' ').join('_'));
+	if (process.platform == 'darwin') {
+		translator.setLocal('./locale/' + newLang.split(' ').join('_'));
+	} else {
+		translator.setLocal(require('path').dirname(process.execPath)+'/src/locale/' + newLang.split(' ').join('_'));
+	}
 	var i18n = translator.i18n;
 	document.title = i18n(document.title);
     </script>