Merge pull request #94 from jsrain/master

add explanation to extension regcode dialog (bnc#881466)
yast · Jun 6, 2014 · 67c42b3 · 67c42b3
2 parents 5ca90d0 + c1a0428
commit 67c42b3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun  5 12:43:27 UTC 2014 - jsrain@suse.cz
+
+- add explanation to extension regcode dialog (bnc#881466)
+- 3.1.65
+
 -------------------------------------------------------------------
 Tue Jun  3 16:08:38 UTC 2014 - 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.64
+Version:        3.1.65
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/clients/inst_scc.rb b/src/clients/inst_scc.rb
@@ -43,7 +43,7 @@ class InstSccClient < Client
 
     # the maximum number of reg. codes displayed vertically,
     # this is the limit for 80x25 textmode UI
-    MAX_REGCODES_PER_COLUMN = 9
+    MAX_REGCODES_PER_COLUMN = 8
 
     # width of reg code input field widget
     REG_CODE_WIDTH = 33
@@ -507,8 +507,25 @@ def addon_regcodes_dialog_content(addons)
 
       HBox(
         HSpacing(Opt(:hstretch), 3),
-        box1,
-        box2 ? box2 : Empty(),
+        VBox(
+          VStretch(),
+          Left(Label(n_(
+            "The extension you selected needs a separate registration code.",
+            "The extensions you selected need separate registration codes.",
+            addons.size
+          ))),
+          Left(Label(n_(
+            "Enter the registration code into the field below.",
+            "Enter the registration codes into the fields below.",
+            addons.size
+          ))),
+          VStretch(),
+          HBox(
+            box1,
+            box2 ? box2 : Empty()
+          ),
+          VStretch()
+        ),
         HSpacing(Opt(:hstretch), 3)
       )
     end