From 27a9def88c4d56cb3f6633c7dce133eb4f729d4b Mon Sep 17 00:00:00 2001
From: Frank Kanis <frank.kanis@gmail.com>
Date: Wed, 28 Mar 2018 21:55:22 +0200
Subject: [PATCH] Fixed change language in production

---
 browser/lib/i18n.js               |  7 +++++++
 browser/main/lib/ConfigManager.js | 32 +------------------------------
 2 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/browser/lib/i18n.js b/browser/lib/i18n.js
index fe339072..7731eb9d 100644
--- a/browser/lib/i18n.js
+++ b/browser/lib/i18n.js
@@ -1,8 +1,15 @@
+const path = require('path')
+const { remote } = require('electron')
+const { app } = remote
+
 // load package for localization
 const i18n = new (require('i18n-2'))({
   // setup some locales - other locales default to the first locale
   locales: ['en', 'sq', 'zh-CN', 'zh-TW', 'da', 'fr', 'de', 'hu', 'ja', 'ko', 'no', 'pl', 'pt', 'es-ES'],
   extension: '.json',
+  directory: process.env.NODE_ENV === 'production'
+    ? path.join(app.getAppPath(),'./locales')
+    : path.resolve('./locales'),
   devMode: false
 })
 
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 157973ea..9f1a2ee9 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -138,37 +138,7 @@ function set (updates) {
     document.body.setAttribute('data-theme', 'default')
   }
 
-  if (newConfig.ui.language === 'sq') {
-    i18n.setLocale('sq')
-  } else if (newConfig.ui.language === 'zh-CN') {
-    i18n.setLocale('zh-CN')
-  } else if (newConfig.ui.language === 'zh-TW') {
-    i18n.setLocale('zh-TW')
-  } else if (newConfig.ui.language === 'da') {
-    i18n.setLocale('da')
-  } else if (newConfig.ui.language === 'fr') {
-    i18n.setLocale('fr')
-  } else if (newConfig.ui.language === 'de') {
-    i18n.setLocale('de')
-  } else if (newConfig.ui.language === 'hu') {
-    i18n.setLocale('hu')
-  } else if (newConfig.ui.language === 'ja') {
-    i18n.setLocale('ja')
-  } else if (newConfig.ui.language === 'ko') {
-    i18n.setLocale('ko')
-  } else if (newConfig.ui.language === 'no') {
-    i18n.setLocale('no')
-  } else if (newConfig.ui.language === 'pl') {
-    i18n.setLocale('pl')
-  } else if (newConfig.ui.language === 'pt') {
-    i18n.setLocale('pt')
-  } else if (newConfig.ui.language === 'ru') {
-    i18n.setLocale('ru')
-  } else if (newConfig.ui.language === 'es-ES') {
-    i18n.setLocale('es-ES')
-  } else {
-    i18n.setLocale('en')
-  }
+  i18n.setLocale(newConfig.ui.language)
 
   let editorTheme = document.getElementById('editorTheme')
   if (editorTheme == null) {