tequilaOS/platform_external_selinux
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gettext: handle unsupported languages properly

Browse source 
With "fallback=True" gettext.translation behaves the same as
gettext.install and uses NullTranslations in case the
translation file for given language was not found (as opposed to
throwing an exception).

Fixes:
  # LANG is set to any "unsupported" language, e.g. en_US.UTF-8
  $ chcat --help
  Traceback (most recent call last):
  File "/usr/bin/chcat", line 39, in <module>
    t = gettext.translation(PROGNAME,
  File "/usr/lib64/python3.9/gettext.py", line 592, in translation
    raise FileNotFoundError(ENOENT,
  FileNotFoundError: [Errno 2] No translation file found for domain: 'selinux-python'

Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
Reviewed-by: Daniel Burgener <dburgener@linux.microsoft.com>
Acked-by: Petr Lautrbach <plautrba@redhat.com>
This commit is contained in:
Vit Mojzis 2022-06-24 16:24:25 +02:00 committed by Petr Lautrbach
parent 25e9c91a8b
commit 344463076b
21 changed files with 44 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gui/booleansPage.py
View file

@ -46,7 +46,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
gui/domainsPage.py
View file

@ -38,7 +38,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
gui/fcontextPage.py
View file

@ -55,7 +55,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
gui/loginsPage.py
View file

@ -37,7 +37,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
gui/modulesPage.py
View file

@ -38,7 +38,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
gui/polgengui.py
View file

@ -71,7 +71,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
gui/portsPage.py
View file

@ -43,7 +43,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
gui/semanagePage.py
View file

@ -30,7 +30,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
gui/statusPage.py
View file

@ -43,7 +43,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
gui/system-config-selinux.py
View file

@ -53,7 +53,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
gui/usersPage.py
View file

@ -37,7 +37,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

5
python/chcat/chcat
View file

@ -38,9 +38,10 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except ImportError:
except:
try:
import builtins
builtins.__dict__['_'] = str

3
python/semanage/semanage
View file

@ -38,7 +38,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
python/semanage/seobject.py
View file

@ -42,7 +42,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

4
python/sepolgen/src/sepolgen/sepolgeni18n.py
View file

@ -19,7 +19,9 @@
try:
import gettext
t = gettext.translation( 'selinux-python' )
t = gettext.translation("selinux-python",
localedir="/usr/share/locale",
fallback=True)
_ = t.gettext
except:
def _(str):

3
python/sepolicy/sepolicy.py
View file

@ -36,7 +36,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
python/sepolicy/sepolicy/__init__.py
View file

@ -31,7 +31,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
python/sepolicy/sepolicy/generate.py
View file

@ -56,7 +56,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
python/sepolicy/sepolicy/gui.py
View file

@ -49,7 +49,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
python/sepolicy/sepolicy/interface.py
View file

@ -38,7 +38,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try:

3
sandbox/sandbox
View file

@ -45,7 +45,8 @@ try:
kwargs['unicode'] = True
t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
**kwargs)
**kwargs,
fallback=True)
_ = t.gettext
except:
try: