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

GrampsLocale: Don't try to set self.localedir to _first.localedir if the latter path doesn't exist.

Browse Source 
(cherry picked from commit 10921cee29)
This commit is contained in:
John Ralls 2014-04-20 14:28:30 -07:00
parent 02e43f971f
commit 0a61b8b4bd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -526,10 +526,11 @@ class GrampsLocale(object):
# _init_secondary_locale if this comes up empty.
if localedir and os.path.exists(os.path.abspath(localedir)):
self.localedir = localedir
elif _first and hasattr(_first, 'localedir'):
elif (_first and hasattr(_first, 'localedir') and
os.path.exists(os.path.abspath(_first.localedir))):
self.localedir = _first.localedir
else:
LOG.warn("No Localedir or localdir %s invalid", localedir)
LOG.warn('Missing or invalid localedir %s; no translations will be available.', repr(localedir))
self.lang = lang
self.localedomain = domain or 'gramps'
@ -540,7 +541,6 @@ class GrampsLocale(object):
else:
self.language = None
_first = self._GrampsLocale__first_instance
if self == _first:
self._GrampsLocale__init_first_instance()
else: