Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Locale: Fix unused variables.

Browse Source
This commit is contained in:
John Ralls 2023-07-11 15:08:05 -07:00 committed by Nick Hall
parent e4ece434d1
commit 5dff2a65df
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gramps/gen/utils/grampslocale.py
View File

@ -267,7 +267,8 @@ class GrampsLocale:
LOG.debug("%%LANG%% value %s not usable", os.environ['LANG']) LOG.debug("%%LANG%% value %s not usable", os.environ['LANG'])
if not self.lang: if not self.lang:
locale.setlocale(locale.LC_ALL, '') locale.setlocale(locale.LC_ALL, '')
(lang, encoding) = locale.getlocale() locale_tuple = locale.getlocale()
lang = locale_tuple[0]
loc = _check_mswin_locale_reverse(lang) loc = _check_mswin_locale_reverse(lang)
if loc[0]: if loc[0]:
self.lang = loc[0] self.lang = loc[0]
@ -373,7 +374,8 @@ class GrampsLocale:
_failure = True _failure = True
#LC_MESSAGES #LC_MESSAGES
(loc, enc) = locale.getlocale(locale.LC_MESSAGES) loc_tuple = locale.getlocale(locale.LC_MESSAGES)
loc = loc_tuple[0]
if loc: if loc:
language = self.check_available_translations(loc) language = self.check_available_translations(loc)
if language: if language:
@ -588,7 +590,7 @@ class GrampsLocale:
_first = self._GrampsLocale__first_instance _first = self._GrampsLocale__first_instance
self.localedir = None self.localedir = None
# Everything breaks without localedir, so get that set up # Everything breaks without localedir, so get that set up
# first. Warnings are logged in _init_first_instance or # first. Warnings are logged in __init_first_instance or
# _init_secondary_locale if this comes up empty. # _init_secondary_locale if this comes up empty.
if localedir and os.path.exists(os.path.abspath(localedir)): if localedir and os.path.exists(os.path.abspath(localedir)):
self.localedir = localedir self.localedir = localedir
@ -694,7 +696,7 @@ class GrampsLocale:
except KeyError: except KeyError:
LOG.debug("Gramps has no translation for %s", lang_code) LOG.debug("Gramps has no translation for %s", lang_code)
lang = None lang = None
except IndexError as err: except IndexError:
LOG.debug("Bad Index for tuple %s\n" % _LOCALE_NAMES[lang_code][0]) LOG.debug("Bad Index for tuple %s\n" % _LOCALE_NAMES[lang_code][0])
lang = None lang = None

1
gramps/gen/utils/maclocale.py
View File

@ -212,7 +212,6 @@ def mac_setup_localization(glocale):
#The action starts here #The action starts here
_locale = None _locale = None
_failure = False
glocale.calendar = None glocale.calendar = None
try: try:
locale.setlocale(locale.LC_ALL, '') locale.setlocale(locale.LC_ALL, '')