[PATCH] Reword the close button on the software spoke's error dialog. - anaconda-patches - Fedora mailing-lists

29 May 2014

If you hit a problem with your software selections (like file conflicts or
other packaging problems), you don't really want to cancel.  What does that
even mean in this context?  Likely, you want to close the dialog so you can
change software selections.  For instance, you might change from a desktop
to a minimal install so you at least have something installed.
Thus, change the wording on the button.  What the button actually does has
not changed.  While I was at it I moved the button to the right side (default
action goes on the right) and reworded the label to reflect all the buttons.
---
 pyanaconda/ui/gui/spokes/software.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py
index f1f0bdf..8325a57 100644
--- a/pyanaconda/ui/gui/spokes/software.py
+++ b/pyanaconda/ui/gui/spokes/software.py
@@ -464,13 +464,14 @@ class SoftwareSelectionSpoke(NormalSpoke):
         if not self._errorMsgs:
             return
-        label = _("The following software marked for installation has errors.  "
-                  "This is likely caused by an error with\nyour installation source.  "
-                  "You can change your installation source or quit the installer.")
+        label = _("The software marked for installation has the following errors.  "
+                  "This is likely caused by an error with your installation source.  "
+                  "You can quit the installer, change your software source, or change "
+                  "your software selections.")
         dialog = DetailedErrorDialog(self.data,
                 buttons=[C_("GUI|Software Selection|Error Dialog", "_Quit"),
-                         C_("GUI|Software Selection|Error Dialog", "_Cancel"),
-                         C_("GUI|Software Selection|Error Dialog", "_Modify Software Source")],
+                         C_("GUI|Software Selection|Error Dialog", "_Modify Software Source"),
+                         C_("GUI|Software Selection|Error Dialog", "Modify _Selections")],
                 label=label)
         with enlightbox(self.window, dialog.window):
             dialog.refresh(self._errorMsgs)
@@ -482,11 +483,11 @@ class SoftwareSelectionSpoke(NormalSpoke):
             # Quit.
             sys.exit(0)
         elif rc == 1:
-            # Close the dialog so the user can change selections.
-            pass
-        elif rc == 2:
             # Send the user to the installation source spoke.
             self.skipTo = "SourceSpoke"
             self.window.emit("button-clicked")
+        elif rc == 2:
+            # Close the dialog so the user can change selections.
+            pass
         else:
             pass
-- 
1.9.0


    