[master] [PATCH] Encode unicode strings from XklWrapper (#873762)

Vratislav Podzimek vpodzime at redhat.com
Thu Nov 8 12:32:58 UTC 2012


Before concatenating byte string (output from gettext) with unicode
string (from XklWrapper), we have to encode the unicode string as utf-8.

Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 pyanaconda/ui/gui/spokes/keyboard.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py
index 81d59e2..07548f5 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.py
+++ b/pyanaconda/ui/gui/spokes/keyboard.py
@@ -363,7 +363,8 @@ class KeyboardSpoke(NormalSpoke):
             first_option = self.data.keyboard.switch_options[0]
             desc = self._xkl_wrapper.switch_to_show_str[first_option]
 
-            self._layoutSwitchLabel.set_text(_(LAYOUT_SWITCHING_INFO) % desc)
+            self._layoutSwitchLabel.set_text(_(LAYOUT_SWITCHING_INFO) % \
+                                                 desc.encode("utf-8"))
         else:
             self._layoutSwitchLabel.set_text(_("Layout switching not "
                                                "configured."))
-- 
1.7.11.7



More information about the anaconda-patches mailing list