From abb3cdf43ed03d4de98266fefcfa6ebbf260d4a0 Mon Sep 17 00:00:00 2001 From: tatiana Date: Thu, 8 Apr 2010 12:46:24 +0000 Subject: [PATCH] FIX: Language combo default selection --- invesalius/i18n.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/invesalius/i18n.py b/invesalius/i18n.py index 1705f6a..ce8183a 100644 --- a/invesalius/i18n.py +++ b/invesalius/i18n.py @@ -44,13 +44,23 @@ def GetLocales(): def GetLocaleOS(): """Return language of the operating system.""" + default_locale = 'en' + locales_dict = GetLocales() + if sys.platform == 'darwin': locale.setlocale(locale.LC_ALL, "") - return locale.getlocale()[0] - lc = locale.getdefaultlocale()[0] - if lc: - return lc - return 'en' + os_locale = locale.getlocale()[0] + else: + os_locale = locale.getdefaultlocale()[0] + + if os_locale: + if os_locale in locales_dict.keys(): + default_locale = os_locale + else: + for l in locales_dict: + if l.startswith(os_locale): + default_locale = l + return default_locale def InstallLanguage(language): language_dir = os.path.abspath(os.path.join('..','locale')) -- libgit2 0.21.2