Merge pull request #345 from yast/review_171108_warning_text_changed

[Review] Request from 'schubi2' @ 'yast/yast-registration/review_171108_warning_text_changed'
yast · Nov 9, 2017 · 929d0a3 · 929d0a3
2 parents 98f877c + a2dfba4
commit 929d0a3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov  8 14:36:05 CET 2017 - schubi@suse.de
+
+- Changed warning text if user has skipped registration.
+  (bnc#1055023)
+- 4.0.12
+
 -------------------------------------------------------------------
 Fri Oct 27 12:44:58 UTC 2017 - lslezak@suse.cz
 

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

diff --git a/src/lib/registration/ui/base_system_registration_dialog.rb b/src/lib/registration/ui/base_system_registration_dialog.rb
@@ -359,10 +359,16 @@ def help_text
       # @return [Boolean] true when skipping has been confirmed
       def show_skipping_warning
         # Popup question: confirm skipping the registration
-        warning = _("If you do not register your system we will not be able\n" \
-            "to grant you access to the update repositories.\n\n" \
-            "You can register after the installation or visit our\n" \
-            "Customer Center for online registration.")
+        # TRANSLATORS:
+        # %{media_name} is the media name (e.g. SLE-15-Packages),
+        # %{download_url} is an URL link (e.g. https://download.suse.com)
+        warning = _("Without registration, update channels will not be\n" \
+          "configured. This disables updates and security fixes.\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.") %
+          { media_name: "SLE-15-Packages", download_url: "https://download.suse.com" }
         Yast::Popup.Warning(warning)
       end
 

diff --git a/test/base_system_registration_dialog_test.rb b/test/base_system_registration_dialog_test.rb
@@ -156,7 +156,7 @@
       context "when user skips registration" do
         it "does not try to register the system and close the dialog" do
           allow(Yast::UI).to receive(:UserInput).and_return(:skip_registration, :next)
-          expect(Yast::Popup).to receive(:Warning).with(/If you do not register/)
+          expect(Yast::Popup).to receive(:Warning).with(/Without registration/)
             .and_return(true)
           expect(subject.run).to eq(:skip)
         end