Update the warning message (bsc#1122608)

- 4.1.16
yast · Feb 4, 2019 · cd216ed · cd216ed
1 parent a8f67e8
commit cd216ed
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 17 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb  1 12:18:35 UTC 2019 - lslezak@suse.cz
+
+- Improved the message in the registration skipping dialog
+  (bsc#1122608)
+- 4.1.16
+
 -------------------------------------------------------------------
 Fri Jan 25 10:52:15 CET 2019 - schubi@suse.de
 

diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-registration
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,12 @@
 
 
 Name:           yast2-registration
-Version:        4.1.15
+Version:        4.1.16
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2
 
-Group:          System/YaST
-License:        GPL-2.0-only
-
 # Y2Packager::ProductLicense
 Requires:       yast2 >= 4.0.63
 # "dupAllowVendorChange" option in Pkg.SetSolverFlags()
@@ -42,20 +39,20 @@ Requires:       rubygem(suse-connect) >= 0.2.37
 # suse-connect gem.
 Requires:       SUSEConnect >= 0.2.37
 
-Requires:       yast2-slp >= 3.1.9
 Requires:       yast2-add-on >= 3.1.8
+Requires:       yast2-slp >= 3.1.9
 # packager/product_patterns.rb
 Requires:       yast2-packager >= 3.1.95
 Requires:       yast2-update >= 3.1.36
 
 # Y2Packager::ProductLicense
-BuildRequires:  yast2 >= 4.0.63
 BuildRequires:  update-desktop-files
+BuildRequires:  yast2 >= 4.0.63
 BuildRequires:  yast2-devtools >= 3.1.39
-BuildRequires:  rubygem(yast-rake) >= 0.2.5
+BuildRequires:  yast2-slp >= 3.1.9
 BuildRequires:  rubygem(rspec)
 BuildRequires:  rubygem(suse-connect) >= 0.3.11
-BuildRequires:  yast2-slp >= 3.1.9
+BuildRequires:  rubygem(yast-rake) >= 0.2.5
 # updated product renames
 BuildRequires:  yast2-packager >= 4.0.40
 BuildRequires:  yast2-update >= 3.1.36
@@ -69,10 +66,12 @@ ExcludeArch:    %ix86 s390
 # installed into the chroot, the build fails...
 %bcond_with yast_run_ci_tests
 %if %{with yast_run_ci_tests}
-BuildRequires: rubygem(yast-rake-ci)
+BuildRequires:  rubygem(yast-rake-ci)
 %endif
 
 Summary:        YaST2 - Registration Module
+License:        GPL-2.0-only
+Group:          System/YaST
 Url:            https://github.com/yast/yast-registration
 
 %description

diff --git a/src/lib/registration/ui/base_system_registration_dialog.rb b/src/lib/registration/ui/base_system_registration_dialog.rb
@@ -373,20 +373,28 @@ def show_skipping_warning
           "full_system_download_url"
         )
 
-        warning = _("Without registration, update channels will not be\n" \
-          "configured. This disables updates and security fixes.")
+        # TRANSLATORS:
+        # Popup question (1/1): confirm skipping the registration
+        warning = _("You are skipping registration.\n"\
+          "Please configure access to packages medium in the next step.\n"\
+          "\n"\
+          "Without registration update-channels will not be configured.\n"\
+          "This will disable the updates and security fixes.")
 
-        # Popup question: confirm skipping the registration
         # TRANSLATORS:
+        # Popup question (2/2): confirm skipping the registration
         # %{media_name} is the media name (e.g. SLE-15-Packages),
         # %{download_url} is an URL link (e.g. https://download.suse.com)
         if !media_name.empty? && # cannot be nil
             !download_url.empty? # cannot be nil
           warning += "\n\n" +
-            _("A full system can be installed using the\n" \
-              "%{media_name} media from %{download_url}.\n" \
-              "Without these media only a minimum system is available\n" \
-             "in this installation.") %
+            _("If you do not register AND do not use the %{media_name}\n"\
+              "medium from %{download_url}\n"\
+              "then only an installation system is installed.\n"\
+              "\n"\
+              "The installation system is not intended to be used as\n"\
+              "an operational system. The installation system can only\n"\
+              "be used to install a working system.") %
             { media_name: media_name, download_url: download_url }
         end