Merge pull request #1040 from shundhammer/huha-retranslate-help

Retranslate wizard help button in NCurses (bsc#1167224)
yast · Apr 7, 2020 · ec094fe · ec094fe
2 parents 18c0e49 + 226ccc8
commit ec094fe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/library/wizard/src/modules/Wizard.rb b/library/wizard/src/modules/Wizard.rb
@@ -1351,19 +1351,21 @@ def HideReleaseNotesButton
     # Retranslate the wizard buttons.
     #
     # This will revert button labels and IDs
-    # to the default that were used upon Wizard::CreateDialog(),
+    # to the defaults that were used upon Wizard::CreateDialog(),
     # Wizard::OpenNextBackDialog(), or Wizard::OpenAcceptDialog().
     #
     def RetranslateButtons
-      if UI.WidgetExists(Id(:WizardDialog)) == true
+      textdomain "base" # Reload translations
+      if UI.WidgetExists(Id(:WizardDialog)) == true # NCurses wizard
+        UI.ChangeWidget(Id(:help), :Label, Label.HelpButton) if UI.WidgetExists(Id(:help))
         ReplaceButtonBox(
           if UI.WidgetExists(Id(:accept))
             AbortAcceptButtonBox()
           else
             BackAbortNextButtonBox()
           end
-        ) # Qt wizard
-      else
+        )
+      else # Qt wizard
         UI.WizardCommand(term(:RetranslateInternalButtons))
 
         if UI.WidgetExists(:accept)

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr  7 08:33:55 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Retranslate wizard help button in NCurses UI (bsc#1167224)
+- 4.2.81
+
 -------------------------------------------------------------------
 Fri Apr  3 09:55:17 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.2.80
+Version:        4.2.81
 Release:        0
 Summary:        YaST2 Main Package
 License:        GPL-2.0-only