napcok
/
manjaro-hello
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug in locale detection

merge-requests/64/head
Hugo Posnic 2016-12-19 20:03:15 +01:00
parent f2f79c0503
commit 252c9dfd16
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/manjaro_hello.py
View File

@ -57,17 +57,16 @@ class ManjaroHello():
self.builder.get_object("aboutdialog").set_logo(logo) self.builder.get_object("aboutdialog").set_logo(logo)
# Init translation # Init translation
self.locales = ("en", "fr") # supported locales
self.default_locale = "en" self.default_locale = "en"
self.sys_locale = locale.getdefaultlocale()[0] self.sys_locale = locale.getdefaultlocale()[0]
self.default_texts = {} self.default_texts = {}
locales = os.listdir(self.locale_path)
locales.append(self.default_locale)
# Choose best locale for user # Choose best locale for user
if self.preferences["locale"] not in locales: if self.preferences["locale"] not in self.locales:
if self.sys_locale in locales: if self.sys_locale in locales:
self.preferences["locale"] = self.sys_locale self.preferences["locale"] = self.sys_locale
else: else:
if self.sys_locale[:2] in locales: if self.sys_locale[:2] in self.locales:
self.preferences["locale"] = self.sys_locale[:2] self.preferences["locale"] = self.sys_locale[:2]
else: else:
self.preferences["locale"] = self.default_locale self.preferences["locale"] = self.default_locale