From: Vit Mojzis <vmojzis@redhat.com>
To: selinux@vger.kernel.org
Subject: [PATCH] gettext: set _ on module level instead of builtins namespace
Date: Fri, 6 May 2022 16:06:23 +0200 [thread overview]
Message-ID: <20220506140623.736036-1-vmojzis@redhat.com> (raw)
Some calls to "_" where unsuccessful because the function was
initialized with a different translation domain than the string.
e.g. selinux-polgengui calls functions from sepolicy.generate, which end
up printing untranslated strings because polgengui uses selinux-gui
domain while sepolicy uses selinux-python
- Set "_" in module namespace instead of "builtins"
- Set the whole "sepolicy.generate()" confirmation as translatable
- Drop "codeset" parameter since it is deprecated
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
---
gui/booleansPage.py | 4 ++--
gui/domainsPage.py | 4 ++--
gui/fcontextPage.py | 4 ++--
gui/loginsPage.py | 4 ++--
gui/modulesPage.py | 4 ++--
gui/polgengui.py | 4 ++--
gui/portsPage.py | 4 ++--
gui/semanagePage.py | 4 ++--
gui/statusPage.py | 4 ++--
gui/system-config-selinux.py | 4 ++--
gui/usersPage.py | 4 ++--
python/chcat/chcat | 4 ++--
python/semanage/semanage | 4 ++--
python/semanage/seobject.py | 4 ++--
python/sepolicy/sepolicy.py | 4 ++--
python/sepolicy/sepolicy/__init__.py | 4 ++--
python/sepolicy/sepolicy/generate.py | 6 +++---
python/sepolicy/sepolicy/gui.py | 4 ++--
python/sepolicy/sepolicy/interface.py | 4 ++--
sandbox/sandbox | 4 ++--
20 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/gui/booleansPage.py b/gui/booleansPage.py
index dd12b6d6..5beec58b 100644
--- a/gui/booleansPage.py
+++ b/gui/booleansPage.py
@@ -44,10 +44,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/gui/domainsPage.py b/gui/domainsPage.py
index 6bbe4de5..e08f34b4 100644
--- a/gui/domainsPage.py
+++ b/gui/domainsPage.py
@@ -36,10 +36,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/gui/fcontextPage.py b/gui/fcontextPage.py
index 52292cae..bac2bec3 100644
--- a/gui/fcontextPage.py
+++ b/gui/fcontextPage.py
@@ -53,10 +53,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/gui/loginsPage.py b/gui/loginsPage.py
index cbfb0cc2..18b93d8c 100644
--- a/gui/loginsPage.py
+++ b/gui/loginsPage.py
@@ -35,10 +35,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/gui/modulesPage.py b/gui/modulesPage.py
index 35a0129b..c546d455 100644
--- a/gui/modulesPage.py
+++ b/gui/modulesPage.py
@@ -36,10 +36,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/gui/polgengui.py b/gui/polgengui.py
index 01f541ba..a18f1cba 100644
--- a/gui/polgengui.py
+++ b/gui/polgengui.py
@@ -69,10 +69,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/gui/portsPage.py b/gui/portsPage.py
index a537ecc8..54aa80de 100644
--- a/gui/portsPage.py
+++ b/gui/portsPage.py
@@ -41,10 +41,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/gui/semanagePage.py b/gui/semanagePage.py
index 5361d69c..1371d4e7 100644
--- a/gui/semanagePage.py
+++ b/gui/semanagePage.py
@@ -28,10 +28,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/gui/statusPage.py b/gui/statusPage.py
index a8f079b9..c241ef83 100644
--- a/gui/statusPage.py
+++ b/gui/statusPage.py
@@ -41,10 +41,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/gui/system-config-selinux.py b/gui/system-config-selinux.py
index 8c46c987..1b460c99 100644
--- a/gui/system-config-selinux.py
+++ b/gui/system-config-selinux.py
@@ -51,10 +51,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/gui/usersPage.py b/gui/usersPage.py
index d15d4c5a..d51bd968 100644
--- a/gui/usersPage.py
+++ b/gui/usersPage.py
@@ -35,10 +35,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/python/chcat/chcat b/python/chcat/chcat
index 839ddd3b..e779fcc6 100755
--- a/python/chcat/chcat
+++ b/python/chcat/chcat
@@ -36,10 +36,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except ImportError:
try:
import builtins
diff --git a/python/semanage/semanage b/python/semanage/semanage
index 12bb159e..8f4e44a7 100644
--- a/python/semanage/semanage
+++ b/python/semanage/semanage
@@ -36,10 +36,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
index 69e60db8..ff8f4e9c 100644
--- a/python/semanage/seobject.py
+++ b/python/semanage/seobject.py
@@ -40,10 +40,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/python/sepolicy/sepolicy.py b/python/sepolicy/sepolicy.py
index 32956e58..7ebe0efa 100755
--- a/python/sepolicy/sepolicy.py
+++ b/python/sepolicy/sepolicy.py
@@ -34,10 +34,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
index 203ca25f..7208234b 100644
--- a/python/sepolicy/sepolicy/__init__.py
+++ b/python/sepolicy/sepolicy/__init__.py
@@ -29,10 +29,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/python/sepolicy/sepolicy/generate.py b/python/sepolicy/sepolicy/generate.py
index 43180ca6..67189fc3 100644
--- a/python/sepolicy/sepolicy/generate.py
+++ b/python/sepolicy/sepolicy/generate.py
@@ -54,10 +54,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
@@ -1372,7 +1372,7 @@ Warning %s does not exist
fd.close()
def generate(self, out_dir=os.getcwd()):
- out = "Created the following files:\n"
+ out = _("Created the following files:\n")
out += "%s # %s\n" % (self.write_te(out_dir), _("Type Enforcement file"))
out += "%s # %s\n" % (self.write_if(out_dir), _("Interface file"))
out += "%s # %s\n" % (self.write_fc(out_dir), _("File Contexts file"))
diff --git a/python/sepolicy/sepolicy/gui.py b/python/sepolicy/sepolicy/gui.py
index 4f892f82..b0263740 100644
--- a/python/sepolicy/sepolicy/gui.py
+++ b/python/sepolicy/sepolicy/gui.py
@@ -47,10 +47,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/python/sepolicy/sepolicy/interface.py b/python/sepolicy/sepolicy/interface.py
index 9d40aea1..599f97fd 100644
--- a/python/sepolicy/sepolicy/interface.py
+++ b/python/sepolicy/sepolicy/interface.py
@@ -36,10 +36,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
diff --git a/sandbox/sandbox b/sandbox/sandbox
index 16c43b51..cd5709fb 100644
--- a/sandbox/sandbox
+++ b/sandbox/sandbox
@@ -43,10 +43,10 @@ try:
kwargs = {}
if sys.version_info < (3,):
kwargs['unicode'] = True
- gettext.install(PROGNAME,
+ t = gettext.translation(PROGNAME,
localedir="/usr/share/locale",
- codeset='utf-8',
**kwargs)
+ _ = t.gettext
except:
try:
import builtins
--
2.35.1
next reply other threads:[~2022-05-06 14:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-06 14:06 Vit Mojzis [this message]
2022-05-12 19:37 ` [PATCH] gettext: set _ on module level instead of builtins namespace James Carter
2022-05-16 17:08 ` James Carter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220506140623.736036-1-vmojzis@redhat.com \
--to=vmojzis@redhat.com \
--cc=selinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.