1ca0d56f57
* dozens of bugfixes, see NEWS for details * updated cipher lists for openssl wrapper, support openssl >= 1.1.0 * properly fix HTTPoxy (CVE-2016-1000110) * profile-opt build now applies PGO to modules as well - drop python-2.7.10-overflow_check.patch which is solved in upstream OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=199
24 lines
952 B
Diff
24 lines
952 B
Diff
Index: Python-2.7.13/Lib/gettext.py
|
|
===================================================================
|
|
--- Python-2.7.13.orig/Lib/gettext.py
|
|
+++ Python-2.7.13/Lib/gettext.py
|
|
@@ -58,6 +58,7 @@ __all__ = ['NullTranslations', 'GNUTrans
|
|
]
|
|
|
|
_default_localedir = os.path.join(sys.prefix, 'share', 'locale')
|
|
+_default_bundlelocaledir = os.path.join(sys.prefix, 'share', 'locale-bundle')
|
|
|
|
# Expression parsing for plural form selection.
|
|
#
|
|
@@ -496,6 +497,10 @@ class GNUTranslations(NullTranslations):
|
|
|
|
# Locate a .mo file using the gettext strategy
|
|
def find(domain, localedir=None, languages=None, all=0):
|
|
+ if localedir in [None, _default_localedir]:
|
|
+ bundle = find(domain, localedir=_default_bundlelocaledir, languages=languages, all=all)
|
|
+ if bundle:
|
|
+ return bundle
|
|
# Get some reasonable defaults for arguments that were not supplied
|
|
if localedir is None:
|
|
localedir = _default_localedir
|