From 5677a670a989b5bf5691b3724a4c4ec5d16f8078 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sun, 28 Feb 2021 17:03:44 +0000 Subject: [PATCH] langpack-gettext # DP: Description: support alternative gettext tree in # DP: /usr/share/locale-langpack; if a file is present in both trees, # DP: prefer the newer one # DP: Upstream status: Ubuntu-Specific # DP: Description: support alternative gettext tree in # DP: /usr/share/locale-langpack; if a file is present in both trees, # DP: prefer the newer one # DP: Upstream status: Ubuntu-Specific Gbp-Pq: Name langpack-gettext.diff --- Lib/gettext.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Lib/gettext.py b/Lib/gettext.py index 77b67ae..c869b83 100644 --- a/Lib/gettext.py +++ b/Lib/gettext.py @@ -567,11 +567,26 @@ def find(domain, localedir=None, languages=None, all=False): if lang == 'C': break mofile = os.path.join(localedir, lang, 'LC_MESSAGES', '%s.mo' % domain) + mofile_lp = os.path.join("/usr/share/locale-langpack", lang, + 'LC_MESSAGES', '%s.mo' % domain) + + # first look into the standard locale dir, then into the + # langpack locale dir + + # standard mo file if os.path.exists(mofile): if all: result.append(mofile) else: return mofile + + # langpack mofile -> use it + if os.path.exists(mofile_lp): + if all: + result.append(mofile_lp) + else: + return mofile_lp + return result -- 2.30.2