more code review fixes

yast · Jul 1, 2015 · c56c5b7 · c56c5b7
1 parent 776ea5d
commit c56c5b7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/lib/registration/ui/migration_repos_selection_dialog.rb b/src/lib/registration/ui/migration_repos_selection_dialog.rb
@@ -47,8 +47,9 @@ def run
           _("Migration Repositories"),
           dialog_content,
           # TRANSLATORS: help text
-          # FIXME: help text
-          _("FIXME"),
+          _("<p>In this dialog you can manually select which repositories will" \
+            "be used for online migration. The packages will be upgraded to the" \
+            "highest version found in the selected repositories.</p>"),
           true,
           true
         )

diff --git a/src/lib/registration/ui/migration_repos_workflow.rb b/src/lib/registration/ui/migration_repos_workflow.rb
@@ -207,8 +207,8 @@ def register_migration_products
           Yast::Popup.Feedback(RegistrationUI::CONTACTING_MESSAGE,
             # TRANSLATORS: Progress label
             _("Registering Migration Products...")) do
-            selected_migration.each do |product|
-              return :abort unless register_migration_product(product)
+            if !selected_migration.all? { |product| register_migration_product(product) }
+              return :abort
             end
           end
         ensure

diff --git a/src/lib/registration/ui/migration_selection_dialog.rb b/src/lib/registration/ui/migration_selection_dialog.rb
@@ -52,9 +52,14 @@ def run
           # TRANSLATORS: dialog title
           _("Select the Migration Target"),
           dialog_content,
-          # TRANSLATORS: help text
-          # FIXME: help text
-          _("FIXME"),
+          # TRANSLATORS: help text (1/3)
+          _("<p>Here you can select the migration target products. The registration" \
+              "server may offer several possible migration to new products.</p>") +
+          # TRANSLATORS: help text (2/3)
+          _("<p>Only one migration target from the list can be selected.</p>") +
+            # TRANSLATORS: help text (3/3), %s is replaced by the (translated) check box label
+            (_("<p>Use the <b>%s</b> check box to manually select the migration " \
+                  "repositories later.</p>") % _("Manually Select Migration Repositories")),
           true,
           true
         )
@@ -88,7 +93,7 @@ def dialog_content
 
           VSpacing(Yast::UI.TextMode ? 0 : 1),
           # TRANSLATORS: check button label
-          CheckBox(Id(:manual_repos), _("Manually Select Migration Repositoreis")),
+          CheckBox(Id(:manual_repos), _("Manually Select Migration Repositories")),
           VSpacing(1)
         )
       end