diff --git a/gramps/gen/utils/grampslocale.py b/gramps/gen/utils/grampslocale.py index 39c73a83a..162bcb776 100644 --- a/gramps/gen/utils/grampslocale.py +++ b/gramps/gen/utils/grampslocale.py @@ -330,11 +330,6 @@ class GrampsLocale: else: self.numeric = self.lang - if 'LC_MONETARY' in os.environ: - self.currency = os.environ['LC_MONETARY'] - else: - self.currency = self.lang - def _init_from_environment(self): def _check_locale(locale): @@ -403,12 +398,6 @@ class GrampsLocale: else: self.numeric = self.lang - loc = locale.getlocale(locale.LC_MONETARY) - if loc and loc[0]: - self.currency = '.'.join(loc) - else: - self.currency = self.lang - # $LANGUAGE overrides $LANG, $LC_MESSAGES if "LANGUAGE" in os.environ: language = [x for x in [self.check_available_translations(l) @@ -468,7 +457,7 @@ class GrampsLocale: else: self._init_from_environment() else: - self.numeric = self.currency = self.calendar = self.collation = self.lang + self.numeric = self.calendar = self.collation = self.lang if not self.lang: self.lang = 'en_US.UTF-8' @@ -570,7 +559,7 @@ class GrampsLocale: if not self.language and _first.language: self.language = _first.language - self.numeric = self.currency = self.calendar = self.collation = self.lang + self.numeric = self.calendar = self.collation = self.lang self.rtl_locale = False if self.language[0] in _RTL_LOCALES: diff --git a/gramps/gen/utils/maclocale.py b/gramps/gen/utils/maclocale.py index e93fc24cd..076682efa 100644 --- a/gramps/gen/utils/maclocale.py +++ b/gramps/gen/utils/maclocale.py @@ -46,9 +46,8 @@ are the names of the controls in System Preferences; the names in the defaults system are AppleCollationOrder and AppleLocale, respectively.) -The user can override the currency and calendar, and those values are -appended to AppleLocale and parsed below. But Gramps makes no use of -currency and sets the calendar in its own preferences, so they're +The user can override the calendar, and thise value is appended to AppleLocale +and parsed below. But Gramps sets the calendar in its own preferences, so it is ignored. Where the mismatch becomes a problem is in date and number @@ -148,7 +147,6 @@ def mac_setup_localization(glocale): def _mac_check_locale(locale_string): locale = None calendar = None - currency = None div = locale_string.strip().split("@") LOG.debug("Checking Locale %s", ' '.join(div)) locale = glocale.check_available_translations(div[0]) @@ -158,10 +156,8 @@ def mac_setup_localization(glocale): (name, value) = phrase.split("=") if name == "calendar": calendar = glocale.check_available_translations(value) - elif name == "currency": - currency = value - return (locale, calendar, currency) + return (locale, calendar) def _mac_get_locale(): """ @@ -214,7 +210,6 @@ def mac_setup_localization(glocale): _locale = None _failure = False glocale.calendar = None - glocale.currency = None try: locale.setlocale(locale.LC_ALL, '') _locale = locale.getlocale() @@ -229,7 +224,7 @@ def mac_setup_localization(glocale): if not glocale.lang: LOG.debug("Setting from the environment didn't work out, checking defaults") - (glocale.lang, glocale.currency, glocale.calendar) = _mac_get_locale() + (glocale.lang, glocale.calendar) = _mac_get_locale() glocale.coll_qualifier = None glocale.collation = _mac_get_collation() @@ -294,7 +289,4 @@ def mac_setup_localization(glocale): else: glocale.calendar = glocale.lang[:5] - if not glocale.currency: - glocale.currency = locale.getlocale(locale.LC_MONETARY)[0] or glocale.lang - glocale.numeric = locale.getlocale(locale.LC_NUMERIC)[0] or glocale.lang diff --git a/gramps/grampsapp.py b/gramps/grampsapp.py index b9173c96e..cf957ec4f 100644 --- a/gramps/grampsapp.py +++ b/gramps/grampsapp.py @@ -581,7 +581,6 @@ def run(): LOG.debug("Translating Gramps to %s", glocale.language[0]) LOG.debug("Collation Locale: %s", glocale.collation) LOG.debug("Date/Time Locale: %s", glocale.calendar) - LOG.debug("Currency Locale: %s", glocale.currency) LOG.debug("Number-format Locale: %s", glocale.numeric) if 'LANG' in os.environ: