Merge remote-tracking branch 'origin/SLE-15-GA' into fix_no_disks_15

package/yast2-installation.changes

@@ -3,6 +3,13 @@ Wed Apr 25 10:43:58 UTC 2018 - jreidinger@suse.com
 
 - fix regression to show again iscsi configuration for disk-less
   setup  (bsc#1090753)
+- 4.0.53
+
+-------------------------------------------------------------------
+Wed Apr 25 06:03:53 UTC 2018 - igonzalezsosa@suse.com
+
+- Fix text direction for RTL languages in the installer settings
+  screen (bsc#1089846).
 - 4.0.52
 
 -------------------------------------------------------------------

package/yast2-installation.spec

@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.0.52
+Version:        4.0.53
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -42,17 +42,17 @@ BuildRequires:  yast2-xml
 BuildRequires:  rubygem(rspec)
 BuildRequires:  rubygem(yast-rake)
 
-# Mandatory language in Product#release_notes
-BuildRequires:  yast2 >= 4.0.49
+# TextHelpers#div_with_direction
+BuildRequires:  yast2 >= 4.0.72
 # Yast::Packages.check_remote_installation_packages
 BuildRequires:	yast2-packager >= 4.0.9
 
 # Y2Storage::StorageManager#activate and #probe as boolean
 BuildRequires: yast2-storage-ng >= 4.0.114
 Requires:      yast2-storage-ng >= 4.0.114
 
-# Mandatory language in Product#release_notes
-Requires:       yast2 >= 4.0.49
+# TextHelpers#div_with_direction
+Requires:       yast2 >= 4.0.72
 
 # Language::GetLanguageItems and other API
 # Language::Set (handles downloading the translation extensions)

src/lib/installation/proposal_runner.rb

@@ -268,7 +268,7 @@ def switch_to_tab(input)
       @submodules_presentation.each do |mod|
         @proposal << (@html[mod] || "")
       end
-      display_proposal(@proposal)
+      display_proposal(div_with_direction(@proposal))
       submod_descriptions_and_build_menu
     end
 
@@ -478,7 +478,7 @@ def make_proposal(force_reset, language_changed)
           proposal = presentation_modules.reduce("") do |res, mod|
             res << (@html[mod] || "")
           end
-          display_proposal(proposal)
+          display_proposal(div_with_direction(proposal))
         end
       end
 

src/lib/installation/select_system_role.rb

@@ -22,6 +22,7 @@
 require "ui/installation_dialog"
 require "installation/services"
 require "installation/system_role"
+require "ui/text_helpers"
 
 Yast.import "GetInstArgs"
 Yast.import "Packages"
@@ -32,6 +33,8 @@
 
 module Installation
   class SelectSystemRole < ::UI::InstallationDialog
+    include UI::TextHelpers
+
     class << self
       # once the user selects a role, remember it in case they come back
       attr_accessor :original_role_id
@@ -254,7 +257,7 @@ def role_buttons(selected_role_id:)
       VBox(
         Left(Label(intro_text)),
         VSpacing(2),
-        RichText(Id(:roles_richtext), role_rt_radios.join("\n"))
+        RichText(Id(:roles_richtext), div_with_direction(role_rt_radios.join("\n")))
       )
     end
 
@@ -283,7 +286,10 @@ def richtext_radiobutton_gui(id:, label:, selected:)
       installation = ENV["Y2STYLE"] == "installation.qss"
       if installation
         image = selected ? "inst_radio-button-checked.png" : "inst_radio-button-unchecked.png"
-        bullet = "<img src=\"#{IMAGE_DIR}/#{image}\"></img>"
+        # NOTE: due to a Qt bug, the first image does not get rendered properly. So we are
+        # rendering it twice (one with height and width set to "0").
+        bullet = "<img src=\"#{IMAGE_DIR}/#{image}\" height=\"0\" width=\"0\"></img>" \
+                 "<img src=\"#{IMAGE_DIR}/#{image}\"></img>"
       else
         bullet = selected ? BUTTON_ON : BUTTON_OFF
       end

test/select_system_role_test.rb

@@ -14,6 +14,7 @@
     end
 
     allow(Yast::UI).to receive(:ChangeWidget)
+    allow(Yast::Language).to receive(:language).and_return("en_US")
 
     Installation::SystemRole.clear # Clear system roles cache
   end