From 4bf104b52c8831ea0b4e018b10f8b54c2b92a568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 25 Aug 2016 15:37:39 +0200 Subject: [PATCH] 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 --- package/yast2-installation.changes | 6 ++++++ package/yast2-installation.spec | 2 +- src/lib/installation/select_system_role.rb | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index 0a96ebc49..4bb36ed20 100644 --- 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 index 52985f68f..f795a4026 100644 --- 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 index 3f1b7f362..b93fe499b 100644 --- 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