summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan <alan@boum.org>2019-04-05 18:08:27 +0000
committerAlan <alan@boum.org>2019-04-05 18:08:31 +0000
commit8d52449d22437e04d220dbd220f7ef99592fcb84 (patch)
treee995576e554207943e5859eda1054a127d95d96e
parentd71b9fabd45d74eb5b60350aae59f063d25ba36c (diff)
ASP: fix tranlsationbugfix/16601-fix-translations
Assigning _ to gettext.gettext in the module to make syntax checkers happy was rendering the version provided by gettext.install inaccessible. Will-fix: #16601
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tails-additional-software-config2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/tails-additional-software-notify2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/tails-additional-software2
3 files changed, 0 insertions, 6 deletions
diff --git a/config/chroot_local-includes/usr/local/bin/tails-additional-software-config b/config/chroot_local-includes/usr/local/bin/tails-additional-software-config
index 41e0031..24cff1d 100755
--- a/config/chroot_local-includes/usr/local/bin/tails-additional-software-config
+++ b/config/chroot_local-includes/usr/local/bin/tails-additional-software-config
@@ -25,8 +25,6 @@ from tailslib.additionalsoftware import ( # NOQA: E402
get_packages_list_path,
filter_package_details)
-_ = gettext.gettext
-
UI_FILE = "/usr/share/tails/additional-software/configuration-window.ui"
diff --git a/config/chroot_local-includes/usr/local/lib/tails-additional-software-notify b/config/chroot_local-includes/usr/local/lib/tails-additional-software-notify
index 90b36b9..e31e020 100755
--- a/config/chroot_local-includes/usr/local/lib/tails-additional-software-notify
+++ b/config/chroot_local-includes/usr/local/lib/tails-additional-software-notify
@@ -15,8 +15,6 @@ from gi.repository import GLib
gi.require_version('Notify', '0.7')
from gi.repository import Notify # NOQA: E402
-_ = gettext.gettext
-
class ASPNotifier(object):
"""Display a notification and exit with a meaningful code."""
diff --git a/config/chroot_local-includes/usr/local/sbin/tails-additional-software b/config/chroot_local-includes/usr/local/sbin/tails-additional-software
index 4c3379e..4b60049 100755
--- a/config/chroot_local-includes/usr/local/sbin/tails-additional-software
+++ b/config/chroot_local-includes/usr/local/sbin/tails-additional-software
@@ -32,8 +32,6 @@ from tailslib.persistence import (
from tailslib.utils import launch_x_application
-_ = gettext.gettext
-
ASP_STATE_DIR = "/run/live-additional-software"
ASP_STATE_PACKAGES = os.path.join(ASP_STATE_DIR, "packages")
ASP_STATE_INSTALLER_ASKED = os.path.join(ASP_STATE_DIR, "installer-asked")