[PATCH rhel7-branch 2/2] Fix problems discovered by the glade tests.

Chris Lumens clumens at redhat.com
Mon Jun 8 20:11:32 UTC 2015


Related: rhbz#1196721
---
 pyanaconda/ui/gui/spokes/advstorage/dasd.glade  | 2 +-
 pyanaconda/ui/gui/spokes/advstorage/iscsi.glade | 2 +-
 pyanaconda/ui/gui/spokes/advstorage/iscsi.py    | 2 +-
 pyanaconda/ui/gui/spokes/filter.glade           | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/advstorage/dasd.glade b/pyanaconda/ui/gui/spokes/advstorage/dasd.glade
index 791af79..048c59f 100644
--- a/pyanaconda/ui/gui/spokes/advstorage/dasd.glade
+++ b/pyanaconda/ui/gui/spokes/advstorage/dasd.glade
@@ -208,7 +208,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="xalign">1</property>
-                                <property name="icon_name">gtk-dialog-error</property>
+                                <property name="icon_name">dialog-error</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
index bbb540f..6592022 100644
--- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
+++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
@@ -648,7 +648,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">The following nodes have been discovered using the iSCSI initiator &lt;b&gt;%(initiatorName)s&lt;/b&gt; using the target IP address &lt;b&gt;%(targetAddress)s&lt;/b&gt;.  Please select which nodes you wish to log into:</property>
+                        <property name="label">The following nodes have been discovered using the iSCSI initiator &lt;b&gt;%(initiatorName)s&lt;/b&gt; using the target IP address &lt;b&gt;%(targetAddress)s&lt;/b&gt;.  Please select which nodes you wish to log into:</property>
                         <property name="use_markup">True</property>
                         <property name="wrap">True</property>
                       </object>
diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
index 0969951..dad0577 100644
--- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
+++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
@@ -267,7 +267,7 @@ class ISCSIDialog(GUIObject):
         # Now get the node discovery credentials.
         credentials = discoverMap[self._authNotebook.get_current_page()](self.builder)
 
-        discoveredLabelText = _("The following nodes were discovered using the iSCSI initiator "\
+        discoveredLabelText = _("The following nodes have been discovered using the iSCSI initiator "\
                                 "<b>%(initiatorName)s</b> using the target IP address "\
                                 "<b>%(targetAddress)s</b>.  Please select which nodes you "\
                                 "wish to log into:") % \
diff --git a/pyanaconda/ui/gui/spokes/filter.glade b/pyanaconda/ui/gui/spokes/filter.glade
index 947f21f..eff5efc 100644
--- a/pyanaconda/ui/gui/spokes/filter.glade
+++ b/pyanaconda/ui/gui/spokes/filter.glade
@@ -235,6 +235,7 @@
                                       <object class="GtkLabel" id="searchLUNLabel">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
+                                        <!-- check_accelerators: refresh -->
                                         <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Search|Port Target LUN">_LUN:</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">searchLUNEntry</property>
@@ -1333,6 +1334,7 @@
                                       <object class="GtkLabel" id="zLUNLabel">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
+                                        <!-- check_accelerators: refresh -->
                                         <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|zSeries|LUN">_LUN:</property>
                                         <property name="use_underline">True</property>
                                         <property name="mnemonic_widget">zLUNEntry</property>
-- 
2.2.2



More information about the anaconda-patches mailing list