[r21646]GrampsLocale: Code cleanup
And make sure that setting lang on the GrampsLocale constructor overrides the languages from the first instance. svn: r21650
This commit is contained in:
John Ralls
parent
6e525893bd
commit
0e195c04c8
@ -98,12 +98,12 @@ class GrampsLocale(object):
|
|||||||
|
|
||||||
return super(GrampsLocale, cls).__new__(cls)
|
return super(GrampsLocale, cls).__new__(cls)
|
||||||
|
|
||||||
def __init_from_environment(self, lang=None, language=None):
|
def __init_from_environment(self):
|
||||||
if not lang:
|
if not (hasattr(self, 'lang') and self.lang):
|
||||||
lang = ' '
|
lang = ' '
|
||||||
try:
|
if 'LANG' in os.environ:
|
||||||
lang = os.environ["LANG"]
|
lang = os.environ["LANG"]
|
||||||
except KeyError:
|
else:
|
||||||
lang = locale.getlocale()[0]
|
lang = locale.getlocale()[0]
|
||||||
if not lang:
|
if not lang:
|
||||||
try:
|
try:
|
||||||
@ -113,29 +113,36 @@ class GrampsLocale(object):
|
|||||||
lang = 'C.UTF-8'
|
lang = 'C.UTF-8'
|
||||||
self.lang = lang
|
self.lang = lang
|
||||||
|
|
||||||
if not language or len(language) == 0:
|
if not self.language:
|
||||||
if "LANGUAGE" in os.environ:
|
if "LANGUAGE" in os.environ:
|
||||||
avail = self.get_available_translations()
|
language = [x for x in [self.check_available_translations(l)
|
||||||
language = [l for l in os.environ["LANGUAGE"].split(":")
|
for l in os.environ["LANGUAGE"].split(":")]
|
||||||
if l[:5] in avail or l[:2] in avail]
|
if x]
|
||||||
|
|
||||||
self.language = language
|
self.language = language
|
||||||
elif not lang == "C.UTF-8":
|
elif 'LC_MESSAGES' in os.environ:
|
||||||
self.language = [lang]
|
lang = self.check_available_translations(os.environ['LC_MESSAGES'])
|
||||||
|
if lang:
|
||||||
|
self.language = [lang]
|
||||||
|
elif not self.lang == "C.UTF-8":
|
||||||
|
l = self.check_available_translations(lang)
|
||||||
|
if l:
|
||||||
|
self.language = [l]
|
||||||
else:
|
else:
|
||||||
self.language = ["en"]
|
self.language = ["en"]
|
||||||
|
|
||||||
if "LC_MONETARY" not in os.environ:
|
if "LC_MONETARY" not in os.environ:
|
||||||
self.currency = lang
|
self.currency = self.lang
|
||||||
else:
|
else:
|
||||||
self.currency = os.environ["LC_MONETARY"]
|
self.currency = os.environ["LC_MONETARY"]
|
||||||
|
|
||||||
if "LC_TIME" not in os.environ:
|
if "LC_TIME" not in os.environ:
|
||||||
self.calendar = lang
|
self.calendar = self.lang
|
||||||
else:
|
else:
|
||||||
self.calendar = os.environ["LC_TIME"]
|
self.calendar = os.environ["LC_TIME"]
|
||||||
|
|
||||||
if "LC_COLLATE" not in os.environ:
|
if "LC_COLLATE" not in os.environ:
|
||||||
self.collation = lang
|
self.collation = self.lang
|
||||||
else:
|
else:
|
||||||
self.collation = os.environ["LC_COLLATE"]
|
self.collation = os.environ["LC_COLLATE"]
|
||||||
|
|
||||||
@ -155,9 +162,7 @@ class GrampsLocale(object):
|
|||||||
except WindowsError:
|
except WindowsError:
|
||||||
LOG.warning("Localization library libintl not on %PATH%, localization will be incomplete")
|
LOG.warning("Localization library libintl not on %PATH%, localization will be incomplete")
|
||||||
|
|
||||||
|
def __init_first_instance(self, localedir):
|
||||||
def __init_first_instance(self, localedir, lang=None,
|
|
||||||
domain=None, language=None):
|
|
||||||
global _hdlr
|
global _hdlr
|
||||||
_hdlr = logging.StreamHandler()
|
_hdlr = logging.StreamHandler()
|
||||||
_hdlr.setFormatter(logging.Formatter(fmt="%(name)s.%(levelname)s: %(message)s"))
|
_hdlr.setFormatter(logging.Formatter(fmt="%(name)s.%(levelname)s: %(message)s"))
|
||||||
@ -169,36 +174,23 @@ class GrampsLocale(object):
|
|||||||
except locale.Error:
|
except locale.Error:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if localedir and os.path.exists(localedir):
|
if not (hasattr(self, 'lang') and self.lang
|
||||||
self.localedir = localedir
|
and hasattr(self, 'language') and self.language):
|
||||||
else:
|
if mac():
|
||||||
if not lang:
|
from . import maclocale
|
||||||
lang = os.environ.get('LANG', 'en')
|
maclocale.mac_setup_localization(self)
|
||||||
if lang and lang[:2] == 'en':
|
|
||||||
pass # No need to display warning, we're in English
|
|
||||||
else:
|
else:
|
||||||
LOG.warning('Locale dir does not exist at %s', localedir)
|
self.__init_from_environment()
|
||||||
LOG.warning('Running python setup.py install --prefix=YourPrefixDir might fix the problem')
|
|
||||||
|
|
||||||
if not self.localedir:
|
|
||||||
#No localization files, no point in continuing
|
|
||||||
return
|
|
||||||
if domain:
|
|
||||||
self.localedomain = domain
|
|
||||||
else:
|
else:
|
||||||
self.localedomain = 'gramps'
|
self.currency = self.calendar = self.collation = self.lang
|
||||||
|
|
||||||
if not language or not isinstance(language, list):
|
if not self.lang:
|
||||||
language = []
|
self.lang = 'en_US.UTF-8'
|
||||||
else:
|
if not self.language:
|
||||||
language = [l for l in languages
|
self.language.append('en')
|
||||||
if l in self.get_available_translations()]
|
if not self.have_localedir and not self.lang.startswith('en'):
|
||||||
|
LOG.warning("No translations for %s were found, setting localization to U.S. English", self.localedomain)
|
||||||
|
|
||||||
if mac():
|
|
||||||
from . import maclocale
|
|
||||||
maclocale.mac_setup_localization(self, lang, language)
|
|
||||||
else:
|
|
||||||
self.__init_from_environment(lang, language)
|
|
||||||
#A variety of useful functions use the current locale for
|
#A variety of useful functions use the current locale for
|
||||||
#formatting. Pending global replacement of those functions with ICU
|
#formatting. Pending global replacement of those functions with ICU
|
||||||
#equivalents, we need to use setlocale to our chosen default. This
|
#equivalents, we need to use setlocale to our chosen default. This
|
||||||
@ -238,7 +230,6 @@ class GrampsLocale(object):
|
|||||||
else:
|
else:
|
||||||
self._win_bindtextdomain(self.localedomain, self.localedir)
|
self._win_bindtextdomain(self.localedomain, self.localedir)
|
||||||
|
|
||||||
self.initialized = True
|
|
||||||
|
|
||||||
def __init__(self, localedir=None, lang=None, domain=None, languages=None):
|
def __init__(self, localedir=None, lang=None, domain=None, languages=None):
|
||||||
"""
|
"""
|
||||||
@ -247,36 +238,49 @@ class GrampsLocale(object):
|
|||||||
otherwise if called without arguments.
|
otherwise if called without arguments.
|
||||||
"""
|
"""
|
||||||
global _hdlr
|
global _hdlr
|
||||||
if self == self._GrampsLocale__first_instance:
|
|
||||||
if not self.initialized:
|
|
||||||
self._GrampsLocale__init_first_instance(localedir, lang,
|
|
||||||
domain, languages)
|
|
||||||
else:
|
|
||||||
return
|
|
||||||
|
|
||||||
|
if hasattr(self, 'initialized') and self.initialized:
|
||||||
|
return
|
||||||
|
|
||||||
|
_first = self._GrampsLocale__first_instance
|
||||||
|
self.have_localedir = True
|
||||||
|
|
||||||
|
if domain:
|
||||||
|
self.localedomain = domain
|
||||||
|
elif hasattr(_first, 'localedomain'):
|
||||||
|
self.localedomain = _first.localedomain
|
||||||
else:
|
else:
|
||||||
if domain:
|
self.localedomain = "gramps"
|
||||||
self.localedomain = domain
|
if localedir and os.path.exists(localedir):
|
||||||
else:
|
self.localedir = localedir
|
||||||
self.localedomain = self._GrampsLocale__first_instance.localedomain
|
elif hasattr(_first, 'localedir'):
|
||||||
if localedir:
|
self.localedir = _first.localedir
|
||||||
self.localedir = localedir
|
else:
|
||||||
else:
|
self.have_localedir = False
|
||||||
self.localedir = self._GrampsLocale__first_instance.localedir
|
|
||||||
|
|
||||||
self.language = []
|
if lang:
|
||||||
if languages and len(languages) > 0:
|
self.lang = lang
|
||||||
self.language = [l for l in languages
|
elif hasattr(_first, 'lang'):
|
||||||
if l in self.get_available_translations()]
|
self.lang = _first.lang
|
||||||
if len(self.language) == 0:
|
|
||||||
self.language = self._GrampsLocale__first_instance.language
|
|
||||||
|
|
||||||
if lang:
|
self.language = []
|
||||||
self.lang = lang
|
if languages:
|
||||||
else:
|
self.language = [x for x in [self.check_available_translations(l)
|
||||||
self.lang = self._GrampsLocale__first_instance.lang
|
for l in languages]
|
||||||
|
if x]
|
||||||
|
elif hasattr(self, 'lang') and self.lang:
|
||||||
|
trans = self.check_available_translations(lang)
|
||||||
|
if trans:
|
||||||
|
self.language.append(trans)
|
||||||
|
|
||||||
|
if not self.language and hasattr(_first, 'language'):
|
||||||
|
self.language = _first.language
|
||||||
|
|
||||||
|
if self == _first:
|
||||||
|
self._GrampsLocale__init_first_instance(localedir)
|
||||||
|
else:
|
||||||
|
self.currency = self.calendar = self.collation = self.lang
|
||||||
|
|
||||||
self.collation = self.currency = self.calendar = self.lang
|
|
||||||
|
|
||||||
self.icu_locales = {}
|
self.icu_locales = {}
|
||||||
self.collator = None
|
self.collator = None
|
||||||
@ -294,10 +298,11 @@ class GrampsLocale(object):
|
|||||||
|
|
||||||
self.translation = self._get_translation(self.localedomain,
|
self.translation = self._get_translation(self.localedomain,
|
||||||
self.localedir, self.language)
|
self.localedir, self.language)
|
||||||
self._set_dictionaries()
|
|
||||||
if _hdlr:
|
if _hdlr:
|
||||||
LOG.removeHandler(_hdlr)
|
LOG.removeHandler(_hdlr)
|
||||||
|
|
||||||
|
self.initialized = True
|
||||||
|
|
||||||
def _get_translation(self, domain = None,
|
def _get_translation(self, domain = None,
|
||||||
localedir = None,
|
localedir = None,
|
||||||
languages=None):
|
languages=None):
|
||||||
@ -390,6 +395,9 @@ class GrampsLocale(object):
|
|||||||
code_parts = lang_code.rsplit("_")
|
code_parts = lang_code.rsplit("_")
|
||||||
|
|
||||||
lang = code_parts[0]
|
lang = code_parts[0]
|
||||||
|
if not hasattr(self, 'lang_map'):
|
||||||
|
self._set_dictionaries()
|
||||||
|
|
||||||
if lang in self.lang_map:
|
if lang in self.lang_map:
|
||||||
lang = self.lang_map[lang]
|
lang = self.lang_map[lang]
|
||||||
|
|
||||||
@ -487,7 +495,7 @@ class GrampsLocale(object):
|
|||||||
gramps_translator.add_fallback(addon_translator)
|
gramps_translator.add_fallback(addon_translator)
|
||||||
return gramps_translator # with a language fallback
|
return gramps_translator # with a language fallback
|
||||||
|
|
||||||
def get_available_translations(self):
|
def get_available_translations(self, localedir = None, localedomain = None):
|
||||||
"""
|
"""
|
||||||
Get a list of available translations.
|
Get a list of available translations.
|
||||||
|
|
||||||
@ -497,13 +505,19 @@ class GrampsLocale(object):
|
|||||||
"""
|
"""
|
||||||
languages = ["en"]
|
languages = ["en"]
|
||||||
|
|
||||||
if self.localedir is None:
|
if not localedir and hasattr(self, 'localedir'):
|
||||||
|
localedir = self.localedir
|
||||||
|
|
||||||
|
if localedir is None:
|
||||||
return languages
|
return languages
|
||||||
|
|
||||||
|
if not localedomain and hasattr(self, 'localedomain'):
|
||||||
|
localedomain = self.localedomain
|
||||||
|
|
||||||
for langdir in os.listdir(self.localedir):
|
for langdir in os.listdir(self.localedir):
|
||||||
mofilename = os.path.join(self.localedir, langdir,
|
mofilename = os.path.join(localedir, langdir,
|
||||||
"LC_MESSAGES",
|
"LC_MESSAGES",
|
||||||
"%s.mo" % self.localedomain )
|
"%s.mo" % localedomain )
|
||||||
if os.path.exists(mofilename):
|
if os.path.exists(mofilename):
|
||||||
languages.append(langdir)
|
languages.append(langdir)
|
||||||
|
|
||||||
@ -511,6 +525,23 @@ class GrampsLocale(object):
|
|||||||
|
|
||||||
return languages
|
return languages
|
||||||
|
|
||||||
|
def check_available_translations(self, locale):
|
||||||
|
"""
|
||||||
|
Test a locale for having a translation available
|
||||||
|
locale -- string with standard language code, locale code, or name
|
||||||
|
"""
|
||||||
|
if not self.have_localedir:
|
||||||
|
return None
|
||||||
|
if not hasattr(self, 'languages'):
|
||||||
|
self.languages = self.get_available_translations()
|
||||||
|
|
||||||
|
if locale[:2] in self.languages:
|
||||||
|
return locale[:2]
|
||||||
|
if locale[:5] in self.languages:
|
||||||
|
return locale[:5]
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
def get_language_dict(self):
|
def get_language_dict(self):
|
||||||
'''
|
'''
|
||||||
return a dictionary of language names : codes for use by language
|
return a dictionary of language names : codes for use by language
|
||||||
|
|||||||
@ -73,7 +73,7 @@ locale, leaving $LANGUAGE unset (which is the same as setting it to
|
|||||||
|
|
||||||
import sys, os, subprocess
|
import sys, os, subprocess
|
||||||
|
|
||||||
def mac_setup_localization(glocale, lang, language):
|
def mac_setup_localization(glocale):
|
||||||
"""
|
"""
|
||||||
Set up the localization parameters from OSX's "defaults" system,
|
Set up the localization parameters from OSX's "defaults" system,
|
||||||
permitting environment variables to override the settings.
|
permitting environment variables to override the settings.
|
||||||
@ -81,10 +81,6 @@ def mac_setup_localization(glocale, lang, language):
|
|||||||
defaults = "/usr/bin/defaults"
|
defaults = "/usr/bin/defaults"
|
||||||
find = "/usr/bin/find"
|
find = "/usr/bin/find"
|
||||||
locale_dir = "/usr/share/locale"
|
locale_dir = "/usr/share/locale"
|
||||||
if glocale:
|
|
||||||
available = glocale.get_available_translations()
|
|
||||||
else:
|
|
||||||
available = ['en']
|
|
||||||
|
|
||||||
def _mac_get_gramps_defaults(pref):
|
def _mac_get_gramps_defaults(pref):
|
||||||
try:
|
try:
|
||||||
@ -121,8 +117,8 @@ def mac_setup_localization(glocale, lang, language):
|
|||||||
lang = "cn_TW"
|
lang = "cn_TW"
|
||||||
if lang == "cn_Hans": #Simplified; Gettext uses cn_CN
|
if lang == "cn_Hans": #Simplified; Gettext uses cn_CN
|
||||||
lang = "cn_CN"
|
lang = "cn_CN"
|
||||||
|
lang = glocale.check_available_translations(lang)
|
||||||
if lang in available or lang[:2] in available:
|
if lang:
|
||||||
usable.append(lang)
|
usable.append(lang)
|
||||||
|
|
||||||
return usable
|
return usable
|
||||||
@ -203,13 +199,12 @@ def mac_setup_localization(glocale, lang, language):
|
|||||||
# The action starts here
|
# The action starts here
|
||||||
|
|
||||||
(loc, currency, calendar) = mac_get_locale()
|
(loc, currency, calendar) = mac_get_locale()
|
||||||
translations = mac_language_list()
|
|
||||||
if "LC_COLLATE" in os.environ:
|
if "LC_COLLATE" in os.environ:
|
||||||
collation = os.environ["LC_COLLATE"]
|
collation = os.environ["LC_COLLATE"]
|
||||||
else:
|
else:
|
||||||
collation = mac_get_collation()
|
collation = mac_get_collation()
|
||||||
|
|
||||||
if not lang:
|
if not (hasattr(glocale, 'lang') and glocale.lang):
|
||||||
if "LANG" in os.environ:
|
if "LANG" in os.environ:
|
||||||
lang = os.environ["LANG"]
|
lang = os.environ["LANG"]
|
||||||
else:
|
else:
|
||||||
@ -220,24 +215,35 @@ def mac_setup_localization(glocale, lang, language):
|
|||||||
if not lang and collation != None:
|
if not lang and collation != None:
|
||||||
lang = mac_resolve_locale(collation)
|
lang = mac_resolve_locale(collation)
|
||||||
|
|
||||||
glocale.lang = lang
|
glocale.lang = lang
|
||||||
|
|
||||||
if not language or len(language) == 0:
|
if not glocale.language:
|
||||||
if "LANGUAGE" in os.environ:
|
if "LANGUAGE" in os.environ:
|
||||||
language = [l[:5] for l in os.environ["LANGUAGE"].split(":")
|
language = [x for x in [glocale.check_available_translations(l)
|
||||||
if l[:5] in available or l[:2] in available]
|
for l in os.environ["LANGUAGE"].split(":")]
|
||||||
elif "LANG" in os.environ and not lang.startswith("en_US"):
|
if x]
|
||||||
language = [lang[:5]]
|
elif ("LANG" in os.environ
|
||||||
|
and not os.environ['LANG'].startswith("en_US")):
|
||||||
|
lang = glocale.check_available_translations(os.environ['LANG'])
|
||||||
|
if lang:
|
||||||
|
language = [lang]
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
translations = mac_language_list()
|
||||||
if len(translations) > 0:
|
if len(translations) > 0:
|
||||||
language = translations
|
language = translations
|
||||||
elif (len(loc) > 0 and loc in available
|
elif (len(loc) > 0 and loc in available
|
||||||
and not loc.startswith("en")):
|
and not loc.startswith("en")):
|
||||||
language = [loc]
|
lang = glocale.check_available_translations(loc)
|
||||||
|
if lang:
|
||||||
|
language = [lang]
|
||||||
elif (collation and len(collation) > 0 and collation in available
|
elif (collation and len(collation) > 0 and collation in available
|
||||||
and not collation.startswith("en")):
|
and not collation.startswith("en")):
|
||||||
language = [collation]
|
lang = glocale.check_available_translations(collation)
|
||||||
glocale.language = language
|
if lang:
|
||||||
|
language = [lang]
|
||||||
|
|
||||||
|
glocale.language = language
|
||||||
|
|
||||||
if (currency and "LC_MONETARY" not in os.environ
|
if (currency and "LC_MONETARY" not in os.environ
|
||||||
and "LANG" not in os.environment):
|
and "LANG" not in os.environment):
|
||||||
@ -246,7 +252,7 @@ def mac_setup_localization(glocale, lang, language):
|
|||||||
elif "LC_MONETARY" in os.environ:
|
elif "LC_MONETARY" in os.environ:
|
||||||
glocale.currency = os.environ[LC_MONETARY]
|
glocale.currency = os.environ[LC_MONETARY]
|
||||||
else:
|
else:
|
||||||
glocale.currency = lang
|
glocale.currency = glocale.lang
|
||||||
|
|
||||||
if (calendar and "LC_TIME" not in os.environ
|
if (calendar and "LC_TIME" not in os.environ
|
||||||
and "LANG" not in os.environ):
|
and "LANG" not in os.environ):
|
||||||
@ -255,7 +261,7 @@ def mac_setup_localization(glocale, lang, language):
|
|||||||
elif "LC_TIME" in os.environ:
|
elif "LC_TIME" in os.environ:
|
||||||
glocale.calendar = os.environ["LC_TIME"]
|
glocale.calendar = os.environ["LC_TIME"]
|
||||||
else:
|
else:
|
||||||
glocale.calendar = lang
|
glocale.calendar = glocale.lang
|
||||||
|
|
||||||
if (collation and "LC_COLLATION" not in os.environ
|
if (collation and "LC_COLLATION" not in os.environ
|
||||||
and "LANG" not in os.environ):
|
and "LANG" not in os.environ):
|
||||||
@ -264,6 +270,6 @@ def mac_setup_localization(glocale, lang, language):
|
|||||||
elif "LC_COLLATION" in os.environ:
|
elif "LC_COLLATION" in os.environ:
|
||||||
glocale.collation = os.environ["LC_COLLATION"]
|
glocale.collation = os.environ["LC_COLLATION"]
|
||||||
else:
|
else:
|
||||||
glocale.collation = lang
|
glocale.collation = glocale.lang
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user