Resolve conflicts in PR#426 (#428)

* Replace unicode bullet char by asterisk for ncurses (bsc#995082) * Version bump & changelog * Make Rubocop happy * Fix the versino in .spec file
yast · Aug 25, 2016 · 4bf104b · 4bf104b
1 parent fb24142
commit 4bf104b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 25 12:51:45 UTC 2016 - cwh@suse.com
+
+- Replace unicode bullet char by asterisk for ncurses (bsc#995082)
+- 3.1.212
+
 -------------------------------------------------------------------
 Thu Aug 25 07:33:10 UTC 2016 - jreidinger@suse.com
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.211
+Version:        3.1.212
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/installation/select_system_role.rb b/src/lib/installation/select_system_role.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 # Copyright (c) 2016 SUSE LLC.
 #  All Rights Reserved.
 
@@ -94,10 +95,12 @@ def clear_role
 
     def role_buttons
       ui_roles = role_attributes.each_with_object(VBox()) do |r, vbox|
+        # bsc#995082: System role descriptions use a character that is missing in console font
+        description = Yast::UI.TextMode ? r[:description].tr("•", "*") : r[:description]
         vbox << Left(RadioButton(Id(r[:id]), r[:label]))
         vbox << HBox(
           HSpacing(Yast::UI.TextMode ? 4 : 2),
-          Left(Label(r[:description]))
+          Left(Label(description))
         )
         vbox << VSpacing(2)
       end