Merge pull request #204 from yast/popup_question

Better popup question
yast · Aug 26, 2015 · 5a11a9a · 5a11a9a
2 parents aca768a + b0202c0
commit 5a11a9a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 26 07:33:14 UTC 2015 - lslezak@suse.cz
+
+- Better wording in the "install updates" popup (bsc#942843)
+- 3.1.145
+
 -------------------------------------------------------------------
 Tue Aug 25 13:54:46 UTC 2015 - lslezak@suse.cz
 

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

diff --git a/src/lib/registration/registration_ui.rb b/src/lib/registration/registration_ui.rb
@@ -199,14 +199,19 @@ def install_updates?
 
       # not set yet?
       if options.install_updates.nil?
-        msg = _("Registration added some update repositories.") + "\n\n"
+        # TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
+        msg = _("The registration server offers update repositories.\n\n")
+
         if Yast::Mode.installation
-          msg += _("Do you want to install the latest available\n" \
-                    "on-line updates during installation?")
+          # TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
+          msg += _("Would you like to enable these repositories during installation\n" /
+              "in order to receive the latest updates?")
         else # Yast::Mode.update
-          msg += _("Do you want to install the latest available\n" \
-                    "on-line updates during update?")
+          # TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
+          msg += _("Would you like to enable these repositories during upgrade\n" /
+              "in order to receive the latest updates?")
         end
+
         options.install_updates = Yast::Popup.YesNo(msg)
       end
 

diff --git a/src/lib/registration/ui/migration_repos_workflow.rb b/src/lib/registration/ui/migration_repos_workflow.rb
@@ -43,6 +43,14 @@ def self.run
       def initialize
         textdomain "registration"
 
+        # a dummy message which will be used later, just make sure we have it
+        # before the translation deadline...
+        # TRANSLATORS: popup question, confirm installing the available
+        # updates now
+        _("Online updates are available for installation.\n" \
+            "It is recommended to install all updates before proceeding.\n\n" \
+            "Would you like to install the updates now?")
+
         url = UrlHelpers.registration_url
         self.registration = Registration.new(url)
         self.registration_ui = RegistrationUI.new(registration)