[PATCH] Correct doing string substitution for encryption.

Chris Lumens clumens at redhat.com
Fri Nov 30 19:05:20 UTC 2012


---
 pyanaconda/ui/gui/spokes/lib/passphrase.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.py b/pyanaconda/ui/gui/spokes/lib/passphrase.py
index 63be728..ecf2484 100644
--- a/pyanaconda/ui/gui/spokes/lib/passphrase.py
+++ b/pyanaconda/ui/gui/spokes/lib/passphrase.py
@@ -81,8 +81,8 @@ class PassphraseDialog(GUIObject):
         # update the warning label with the currently selected keymap
         xkl_wrapper = keyboard.XklWrapper.get_instance()
         keymap_name = xkl_wrapper.get_current_layout_name()
-        warning_label_text = warning_label_template % keymap_name
-        self._warning_label.set_markup(_(warning_label_text))
+        warning_label_text = _(warning_label_template) % keymap_name
+        self._warning_label.set_markup(warning_label_text)
 
         # initialize with the previously set passphrase
         self.passphrase = self.data.autopart.passphrase
@@ -147,9 +147,9 @@ class PassphraseDialog(GUIObject):
         sensitive = True
         if self._pwq_error:
             icon = "gtk-dialog-error"
-            msg = ERROR_WEAK % self._pwq_error
+            msg = _(ERROR_WEAK) % self._pwq_error
             sensitive = False
-            self._set_entry_icon(entry, icon, _(msg))
+            self._set_entry_icon(entry, icon, msg)
 
         self._confirm_entry.set_sensitive(sensitive)
         if sensitive:
-- 
1.7.11.2



More information about the anaconda-patches mailing list