[PATCH 3/3] Defer translation of device_type_name

David Shea dshea at redhat.com
Wed Dec 4 14:52:58 UTC 2013


Translations cannot happen at the class level
---
 pyanaconda/ui/gui/spokes/network.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
index 6b3ebca..2ecc774 100644
--- a/pyanaconda/ui/gui/spokes/network.py
+++ b/pyanaconda/ui/gui/spokes/network.py
@@ -32,7 +32,7 @@
 from gi.repository import Gtk
 
 from pyanaconda.flags import can_touch_runtime_system
-from pyanaconda.i18n import _, C_, CN_
+from pyanaconda.i18n import _, N_, C_, CN_
 from pyanaconda import constants
 from pyanaconda.ui.communication import hubQ
 from pyanaconda.ui.gui import GUIObject
@@ -293,12 +293,12 @@ class NetworkControlBox(GObject.GObject):
     }
 
     device_type_name = {
-        NetworkManager.DeviceType.UNKNOWN: _("Unknown"),
-        NetworkManager.DeviceType.ETHERNET: _("Ethernet"),
-        NetworkManager.DeviceType.WIFI: _("Wireless"),
-        NetworkManager.DeviceType.BOND: _("Bond"),
-        NetworkManager.DeviceType.VLAN: _("Vlan"),
-        NetworkManager.DeviceType.TEAM: _("Team"),
+        NetworkManager.DeviceType.UNKNOWN: N_("Unknown"),
+        NetworkManager.DeviceType.ETHERNET: N_("Ethernet"),
+        NetworkManager.DeviceType.WIFI: N_("Wireless"),
+        NetworkManager.DeviceType.BOND: N_("Bond"),
+        NetworkManager.DeviceType.VLAN: N_("Vlan"),
+        NetworkManager.DeviceType.TEAM: N_("Team"),
     }
 
     def __init__(self, builder, spoke=None):
@@ -688,7 +688,7 @@ class NetworkControlBox(GObject.GObject):
                 # TRANSLATORS: ethernet cable is unplugged
                 unplugged = ', <i>%s</i>' % _("unplugged")
         title = '<span size="large">%s (%s%s)</span>' % \
-                 (escape_markup(self.device_type_name.get(dev_cfg.device_type, "")),
+                 (escape_markup(_(self.device_type_name.get(dev_cfg.device_type, ""))),
                   escape_markup(dev_cfg.get_iface()),
                   unplugged)
 
@@ -925,7 +925,7 @@ class NetworkControlBox(GObject.GObject):
             img.set_from_icon_name(self._dev_icon_name(dev_cfg), Gtk.IconSize.DIALOG)
 
         # TODO: is this necessary? Isn't it static from glade?
-        device_type_label = self.device_type_name.get(dev_cfg.device_type, "")
+        device_type_label = _(self.device_type_name.get(dev_cfg.device_type, ""))
         self.builder.get_object("label_%s_device" % dev_type_str).set_label(
             "%s (%s)" % (device_type_label, dev_cfg.get_iface()))
 
-- 
1.8.4.2



More information about the anaconda-patches mailing list