summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2018-02-22 14:22:33 +0100
committerbertagaz <bertagaz@ptitcanardnoir.org>2018-02-22 14:22:33 +0100
commitd74a61e1bf2a5d2fa31e5690038f468cc95d945f (patch)
tree9c48411e89f1e0db42e6c4fff1868e41ff2b7186
parent6b9737adde3a8d3c669400c548af8fa24a2dab09 (diff)
Import diff for bugfix/15233-locale-fixes as a quilt patch.tails/bugfix/15233-locale-fixes
-rw-r--r--debian/patches/15233-locale-fixes.diff11
1 files changed, 10 insertions, 1 deletions
diff --git a/debian/patches/15233-locale-fixes.diff b/debian/patches/15233-locale-fixes.diff
index 351fc1e..9da7b27 100644
--- a/debian/patches/15233-locale-fixes.diff
+++ b/debian/patches/15233-locale-fixes.diff
@@ -22,7 +22,7 @@ index 33ce357..86ccf7b 100644
from tails_installer.creator import TailsInstallerError
diff --git a/tails_installer/gui.py b/tails_installer/gui.py
-index b5c6f3d..7216b96 100755
+index b5c6f3d..6baf633 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -417,14 +417,14 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
@@ -76,3 +76,12 @@ index b5c6f3d..7216b96 100755
def enable_widgets(self, enabled=True):
if enabled:
+@@ -828,7 +835,7 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
+ return False
+
+ self.live.log.info(_("%(filename)s selected")
+- % {'filename': os.path.basename(self.live.source.path)})
++ % {'filename': str(os.path.basename(self.live.source.path))})
+ self.source_available = True
+ self.live.log.debug("Calling populate_devices()"
+ " from select_source_iso")