MacLocale: Allow $LANG to override defaults settings

For currency, calendar, and collation

svn: r21490
This commit is contained in:
John Ralls 2013-02-28 18:57:31 +00:00
parent 991447264a
commit 1e41e76682

View File

@ -265,7 +265,8 @@ def mac_setup_localization(glocale, lang, language):
glocale.language = language 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):
glocale.currency = currency glocale.currency = currency
os.environ["LC_MONETARY"] = currency os.environ["LC_MONETARY"] = currency
elif "LC_MONETARY" in os.environ: elif "LC_MONETARY" in os.environ:
@ -273,7 +274,8 @@ def mac_setup_localization(glocale, lang, language):
else: else:
glocale.currency = lang glocale.currency = 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):
glocale.calendar = calendar glocale.calendar = calendar
os.environ["LC_TIME"] = calendar os.environ["LC_TIME"] = calendar
elif "LC_TIME" in os.environ: elif "LC_TIME" in os.environ:
@ -281,7 +283,8 @@ def mac_setup_localization(glocale, lang, language):
else: else:
glocale.calendar = lang glocale.calendar = 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):
glocale.collation = collation glocale.collation = collation
os.environ["LC_COLLATION"] = calendar os.environ["LC_COLLATION"] = calendar
elif "LC_COLLATION" in os.environ: elif "LC_COLLATION" in os.environ: