From 6aa560938aa052acb7682a1e1de891739d9fdf92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= Date: Thu, 19 Aug 2021 16:59:44 +0100 Subject: [PATCH 1/5] Use generic error message for unknonw repo URL --- src/include/add-on/add-on-workflow.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/include/add-on/add-on-workflow.rb b/src/include/add-on/add-on-workflow.rb index 4d23d2c..eae0640 100755 --- a/src/include/add-on/add-on-workflow.rb +++ b/src/include/add-on/add-on-workflow.rb @@ -1431,9 +1431,11 @@ def RedrawAddOnsOverviewTable log.info("Currently used add-ons: #{product_infos}") products = product_infos.map do |index, product_desc| - Item(Id("product_#{index}"), + Item( + Id("product_#{index}"), ui_product_name(product_desc["product"]), - product_desc["info"]["URLs"].first || _("Unknown URL")) + product_desc["info"]["URLs"].first || _("Not found in enabled repositories") + ) end UI.ChangeWidget(Id("list_of_addons"), :Items, products) From 2b717b56d6812d9d0fa6381f20fc8795d8a2f97a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= Date: Thu, 19 Aug 2021 17:03:48 +0100 Subject: [PATCH 2/5] Bump version and update changelog --- package/yast2-add-on.changes | 7 +++++++ package/yast2-add-on.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/yast2-add-on.changes b/package/yast2-add-on.changes index 9dae986..dc9b7c0 100644 --- a/package/yast2-add-on.changes +++ b/package/yast2-add-on.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 19 16:00:54 UTC 2021 - David Diaz + +- Improve UX by using a less misleading message when + repo URL is unknown (bsc#1188635). +- 4.4.1 + ------------------------------------------------------------------- Tue Apr 20 12:55:53 UTC 2021 - Ladislav Slezák diff --git a/package/yast2-add-on.spec b/package/yast2-add-on.spec index 5885767..99c5d66 100644 --- a/package/yast2-add-on.spec +++ b/package/yast2-add-on.spec @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 4.4.0 +Version: 4.4.1 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0-only From eec89422bc8a80bb8f5f0cbeca392be138501788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= Date: Mon, 23 Aug 2021 14:18:11 +0100 Subject: [PATCH 3/5] Do not show unkown Repository URL into details --- src/include/add-on/add-on-workflow.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/include/add-on/add-on-workflow.rb b/src/include/add-on/add-on-workflow.rb index eae0640..dea6f34 100755 --- a/src/include/add-on/add-on-workflow.rb +++ b/src/include/add-on/add-on-workflow.rb @@ -1189,17 +1189,17 @@ def AdjustInfoWidget _("Version: %1
"), version ), - Builtins.sformat( - _("Repository URL: %1
"), - if Ops.greater_than( - Builtins.size(Ops.get_list(pi, ["info", "URLs"], [])), - 0 + if Ops.greater_than( + Builtins.size(Ops.get_list(pi, ["info", "URLs"], [])), + 0 + ) + Builtins.sformat( + _("Repository URL: %1
"), + Builtins.mergestring(Ops.get_list(pi, ["info", "URLs"], []), ",") ) - Builtins.mergestring(Ops.get_list(pi, ["info", "URLs"], []), ",") - else - _("Unknown repository URL") - end - ), + else + "" + end, if Ops.greater_than( Builtins.size(Ops.get_list(pi, ["info", "aliases"], [])), 0 From 00664d46a2ee0de78c44578bd37fb969da34648b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= Date: Mon, 23 Aug 2021 17:56:46 +0100 Subject: [PATCH 4/5] Get rid of some legacy builtins --- src/include/add-on/add-on-workflow.rb | 56 +++++++++------------------ 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/src/include/add-on/add-on-workflow.rb b/src/include/add-on/add-on-workflow.rb index dea6f34..b8e7051 100755 --- a/src/include/add-on/add-on-workflow.rb +++ b/src/include/add-on/add-on-workflow.rb @@ -1171,49 +1171,29 @@ def ReturnCurrentlySelectedProductInfo end def AdjustInfoWidget - pi = ReturnCurrentlySelectedProductInfo() - if pi.nil? || pi == {} + product_info = ReturnCurrentlySelectedProductInfo() + + if product_info.to_h.empty? UI.ChangeWidget(Id("product_details"), :Value, "") + return end - vendor = pi["product"].vendor.empty? ? _("Unknown vendor") : pi["product"].vendor - version = pi["product"].version.empty? ? _("Unknown version") : pi["product"].version - rt_description = Builtins.sformat( - "

%1\n%2\n%3\n%4

", - Builtins.sformat( - _("Vendor: %1
"), - vendor - ), - Builtins.sformat( - _("Version: %1
"), - version - ), - if Ops.greater_than( - Builtins.size(Ops.get_list(pi, ["info", "URLs"], [])), - 0 - ) - Builtins.sformat( - _("Repository URL: %1
"), - Builtins.mergestring(Ops.get_list(pi, ["info", "URLs"], []), ",") - ) - else - "" - end, - if Ops.greater_than( - Builtins.size(Ops.get_list(pi, ["info", "aliases"], [])), - 0 - ) - Builtins.sformat( - _("Repository Alias: %1
"), - Builtins.mergestring(Ops.get_list(pi, ["info", "aliases"], []), ",") - ) - else - "" - end - ) + product = product_info["product"] + info = product_info["info"] || {} + + vendor = product.vendor.empty? ? _("Unknown vendor") : product.vendor + version = product.version.empty? ? _("unknown version") : product.version + urls = info.fetch("URLs", []).join(",") + aliases = info.fetch("aliases", []).join(",") + + details = [] + details << format(_("Vendor: %s
"), vendor) + details << format(_("Version: %s
"), version) + details << format(_("Repository URL: %s
"), urls) unless urls.empty? + details << format(_("Repository Alias: %s
"), aliases) unless aliases.empty? - UI.ChangeWidget(Id("product_details"), :Value, rt_description) + UI.ChangeWidget(Id("product_details"), :Value, "

#{details.join("\n")}

") nil end From 3b98b2a45cd43f2bfc96abbac8a649bd12683511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= Date: Tue, 24 Aug 2021 09:26:14 +0100 Subject: [PATCH 5/5] Add comment for translators MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ladislav Slezák --- src/include/add-on/add-on-workflow.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/include/add-on/add-on-workflow.rb b/src/include/add-on/add-on-workflow.rb index b8e7051..c24edf0 100755 --- a/src/include/add-on/add-on-workflow.rb +++ b/src/include/add-on/add-on-workflow.rb @@ -1411,10 +1411,13 @@ def RedrawAddOnsOverviewTable log.info("Currently used add-ons: #{product_infos}") products = product_infos.map do |index, product_desc| + # TRANSLATORS: Product status, the installed product was not found in any enabled repository + url = product_desc["info"]["URLs"].first || _("Not found in enabled repositories") + Item( Id("product_#{index}"), ui_product_name(product_desc["product"]), - product_desc["info"]["URLs"].first || _("Not found in enabled repositories") + url ) end