[Pkg-privacy-commits] [tails-installer] 68/70: Make dynamically built string properly translatable.

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

ulrike pushed a commit to annotated tag tails-installer_4.20
in repository tails-installer.

commit bffcbe62545f2f67e13833ed1d6b5ab6216d3ebf
Author: anonym <anonym at riseup.net>
Date:   Wed Sep 20 17:55:44 2017 +0200

    Make dynamically built string properly translatable.
---
 tails_installer/gui.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/tails_installer/gui.py b/tails_installer/gui.py
index b43c571..4a0fbbb 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -714,17 +714,18 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
                 # let's go on
                 self.confirmed = False
         else:
-            persistence_message = " "
+            description = _("%(vendor)s %(model)s device (%(device)s)") % {
+                'vendor': self.live.drive['vendor'],
+                'model':  self.live.drive['model'],
+                'device': self.live.drive['device'],
+            }
+            persistence_message = ""
             if self.device_with_persistence:
-                persistence_message = "The persistent storage on this USB stick will be preserved."
-            msg = (_("%(vendor)s %(model)s device (%(device)s)\n\n%(persistence_message)s") % {
-                         'vendor': self.live.drive['vendor'],
-                         'model':  self.live.drive['model'],
-                         'device': self.live.drive['device'],
-                         'parent_size': _format_bytes_in_gb(self.live.drive['parent_size']),
-                         'persistence_message': persistence_message
-                     }
-                  )
+                persistence_message = _("\n\nThe persistent storage on this USB stick will be preserved.")
+            msg = _("%(description)s%(persistence_message)s") % {
+                'description': description,
+                'persistence_message': persistence_message,
+            }
             if self.show_confirmation_dialog(_("Confirm the target USB stick"), msg, False):
                 # The user has confirmed that they wish to overwrite their
                 # existing Live OS.  Here we delete it first, in order to

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git