diff --git a/gui/app.py b/gui/app.py
index bc0c1cc225..9abd11452c 100644
--- a/gui/app.py
+++ b/gui/app.py
@@ -1,6 +1,7 @@
 import wx
 import config
 import os
+
 from logbook import Logger
 pyfalog = Logger(__name__)
 from service.settings import LocaleSettings
@@ -63,7 +64,6 @@ def UpdateLanguage(self, lang=None):
             selLang = supLang[lang].wxLocale
         else:
             selLang = wx.LANGUAGE_ENGLISH_US
-
         if self.locale:
             assert sys.getrefcount(self.locale) <= 2
             del self.locale
@@ -72,7 +72,7 @@ def UpdateLanguage(self, lang=None):
         pyfalog.debug("Setting language to: " + lang)
         self.locale = wx.Locale(selLang)
         if self.locale.IsOk():
-            success = self.locale.AddCatalog(langDomain, selLang)
+            success = self.locale.AddCatalog(langDomain)
             if not success:
                 print("Langauage catalog not successfully loaded")
 
diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
index 18c2aa0005..9039f6eee5 100644
--- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
@@ -102,8 +102,9 @@ def populatePanel(self, panel):
         self.stLangLabel.Wrap(-1)
         langSizer.Add(self.stLangLabel, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
 
-        self.langChoices = self.localeSettings.supported_langauges.keys()
-        self.chLang = wx.Choice(panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, sorted([x for x in self.langChoices]), 0)
+        self.langChoices = sorted([wx.Locale.FindLanguageInfo(x) for x in wx.Translations.Get().GetAvailableTranslations('lang')], key=lambda x: x.Description)
+
+        self.chLang = wx.Choice(panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, [x.Description for x in self.langChoices], 0)
         self.chLang.Bind(wx.EVT_CHOICE, self.onLangSelection)
 
         self.chLang.SetStringSelection(self.localeSettings.get('locale'))
@@ -167,7 +168,9 @@ def populatePanel(self, panel):
         panel.Layout()
 
     def onLangSelection(self, event):
-        self.localeSettings.set('locale', self.chLang.GetString(self.chLang.GetSelection()))
+        selection = self.chLang.GetSelection()
+        locale = self.langChoices[selection]
+        self.localeSettings.set('locale', locale.CanonicalName)
 
     def onEosLangSelection(self, event):
         self.localeSettings.set('eos_locale', self.chEosLang.GetString(self.chEosLang.GetSelection()))
diff --git a/service/settings.py b/service/settings.py
index ea172ca21f..3930fe702a 100644
--- a/service/settings.py
+++ b/service/settings.py
@@ -576,6 +576,7 @@ def get(self, key):
     def get_eos_locale(self):
         """gets the effective value of the setting"""
         val = self.settings['eos_locale']
+        return 'en'
         return val if val != self.defaults['eos_locale'] else self.supported_langauges.get(self.settings['locale'], 'en').eosLang
 
     def set(self, key, value):