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

Delete the need to maintain the list of locales

merge-requests/64/head
Huluti 2016-12-28 14:44:25 +01:00
parent 1563eb9edf
commit 2c3d141b64
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/manjaro_hello.py
View File

@ -78,7 +78,6 @@ class ManjaroHello():
self.builder.get_object("stack").add_named(scrolled_window, page + "page") self.builder.get_object("stack").add_named(scrolled_window, page + "page")
# Init translation # Init translation
self.locales = ("de", "en", "es", "fr", "it", "nl", "pl", "ru") # 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 = {}
@ -116,14 +115,15 @@ class ManjaroHello():
:return: locale to use :return: locale to use
:rtype: str :rtype: str
""" """
if self.preferences["locale"] in self.locales: path = self.locale_path + "{}/LC_MESSAGES/" + self.app + ".mo"
if os.path.isfile(path.format(self.preferences["locale"])):
return self.preferences["locale"] return self.preferences["locale"]
else: else:
# If user's locale is supported # If user's locale is supported
if self.sys_locale in self.locales: if os.path.isfile(path.format(self.sys_locale)):
return self.sys_locale return self.sys_locale
# If two first letters of user's locale is supported (ex: en_US -> en) # If two first letters of user's locale is supported (ex: en_US -> en)
elif self.sys_locale[:2] in self.locales: elif os.path.isfile(path.format(self.sys_locale[:2])):
return self.sys_locale[:2] return self.sys_locale[:2]
else: else:
return self.default_locale return self.default_locale
@ -137,7 +137,6 @@ class ManjaroHello():
tr = gettext.translation(self.app, self.locale_path, [locale], fallback=True) tr = gettext.translation(self.app, self.locale_path, [locale], fallback=True)
tr.install() tr.install()
except OSError: except OSError:
print("WARNING: No translation file for '{}' locale".format(locale))
return return
# Dirty code to fix an issue with gettext that can't translate strings from glade files # Dirty code to fix an issue with gettext that can't translate strings from glade files