Hello community, here is the log from the commit of package yast2-fcoe-client for openSUSE:Factory checked in at 2014-06-18 10:59:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-fcoe-client (Old) and /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-fcoe-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-fcoe-client/yast2-fcoe-client.changes 2014-06-02 07:04:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new/yast2-fcoe-client.changes 2014-06-18 10:59:17.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 3 14:52:59 CEST 2014 - gs@suse.de + +- Mark configuration values for translation (bnc #877911) +- 3.1.10 + +------------------------------------------------------------------- Old: ---- yast2-fcoe-client-3.1.9.tar.bz2 New: ---- yast2-fcoe-client-3.1.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-fcoe-client.spec ++++++ --- /var/tmp/diff_new_pack.43cSSr/_old 2014-06-18 10:59:18.000000000 +0200 +++ /var/tmp/diff_new_pack.43cSSr/_new 2014-06-18 10:59:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-fcoe-client -Version: 3.1.9 +Version: 3.1.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-fcoe-client-3.1.9.tar.bz2 -> yast2-fcoe-client-3.1.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.9/package/yast2-fcoe-client.changes new/yast2-fcoe-client-3.1.10/package/yast2-fcoe-client.changes --- old/yast2-fcoe-client-3.1.9/package/yast2-fcoe-client.changes 2014-05-28 11:21:18.000000000 +0200 +++ new/yast2-fcoe-client-3.1.10/package/yast2-fcoe-client.changes 2014-06-04 10:45:27.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 3 14:52:59 CEST 2014 - gs@suse.de + +- Mark configuration values for translation (bnc #877911) +- 3.1.10 + +------------------------------------------------------------------- Tue May 27 10:07:50 CEST 2014 - gs@suse.de - Show driver and private flags for all interfaces (improve patch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.9/package/yast2-fcoe-client.spec new/yast2-fcoe-client-3.1.10/package/yast2-fcoe-client.spec --- old/yast2-fcoe-client-3.1.9/package/yast2-fcoe-client.spec 2014-05-28 11:21:18.000000000 +0200 +++ new/yast2-fcoe-client-3.1.10/package/yast2-fcoe-client.spec 2014-06-04 10:45:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-fcoe-client -Version: 3.1.9 +Version: 3.1.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.9/src/include/fcoe-client/complex.rb new/yast2-fcoe-client-3.1.10/src/include/fcoe-client/complex.rb --- old/yast2-fcoe-client-3.1.9/src/include/fcoe-client/complex.rb 2014-05-28 11:21:18.000000000 +0200 +++ new/yast2-fcoe-client-3.1.10/src/include/fcoe-client/complex.rb 2014-06-04 10:45:27.000000000 +0200 @@ -42,6 +42,14 @@ Yast.include include_target, "fcoe-client/helps.rb" Yast.include include_target, "fcoe-client/dialogs.rb" + + @yes_no_mapping = { + # setting of config value is 'yes' + "yes" => _("yes"), + # setting of config value is 'no' + "no" => _("no"), + nil => "" + } end # Show a popup on abort if data are modified and @@ -182,6 +190,22 @@ table_items = [] + fcoe_vlan_mapping = { + # FCoE is not available on the interface + @NOT_AVAILABLE => _("not available"), + # the interface is not configured for FCoE + @NOT_CONFIGURED => _("not configured"), + nil => "" + } + + flags_mapping = { + # the flag is 'true' + true => _("true"), + # the flag is 'false' + false => _("false"), + # the flag is not set at all + nil => _("not set") + } Builtins.foreach(netcards) do |card| table_items = Builtins.add( table_items, @@ -190,16 +214,16 @@ card["dev_name"] || "", card["mac_addr"] || "", card["device"] || "", - card["vlan_interface"] ||"", - card["fcoe_vlan"] || "", - card["fcoe_enable"] || "", - card["dcb_required"] || "", - card["auto_vlan"] || "", - card["dcb_capable"] || "", + card["vlan_interface"] || "", + fcoe_vlan_mapping[card["fcoe_vlan"]] || card["fcoe_vlan"], + @yes_no_mapping[card["fcoe_enable"]], + @yes_no_mapping[card["dcb_required"]], + @yes_no_mapping[card["auto_vlan"]], + @yes_no_mapping[card["dcb_capable"]], card["driver"] || "", - card["fcoe_flag"] || "", - card["iscsi_flag"] || "", - card["storage_only"] || "" + flags_mapping[card["fcoe_flag"]], + flags_mapping[card["iscsi_flag"]], + flags_mapping[card["storage_only"]] ) ) row = Ops.add(row, 1) @@ -537,17 +561,17 @@ UI.ChangeWidget( Id(:interfaces), Cell(FcoeClient.current_card, 5), - Ops.get_string(status_map, "FCOE_ENABLE", "") + @yes_no_mapping[status_map["FCOE_ENABLE"]] ) UI.ChangeWidget( Id(:interfaces), Cell(FcoeClient.current_card, 6), - Ops.get_string(status_map, "DCB_REQUIRED", "") + @yes_no_mapping[status_map["DCB_REQUIRED"]] ) UI.ChangeWidget( Id(:interfaces), Cell(FcoeClient.current_card, 7), - Ops.get_string(status_map, "AUTO_VLAN", "") + @yes_no_mapping[status_map["AUTO_VLAN"]] ) AdjustButtons() elsif action == :remove @@ -702,22 +726,22 @@ UI.ChangeWidget( Id(:interfaces), Cell(FcoeClient.current_card, 4), - Ops.get_string(card, "fcoe_vlan", "") + card["fcoe_vlan"] || "" ) UI.ChangeWidget( Id(:interfaces), Cell(FcoeClient.current_card, 5), - Ops.get_string(card, "fcoe_enable", "") + @yes_no_mapping[card["fcoe_enable"]] ) UI.ChangeWidget( Id(:interfaces), Cell(FcoeClient.current_card, 6), - Ops.get_string(card, "dcb_required", "") + @yes_no_mapping[card["dcb_required"]] ) UI.ChangeWidget( Id(:interfaces), Cell(FcoeClient.current_card, 7), - Ops.get_string(card, "auto_vlan", "") + @yes_no_mapping[card["auto_vlan"]] ) AdjustButtons() else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.9/src/modules/FcoeClient.rb new/yast2-fcoe-client-3.1.10/src/modules/FcoeClient.rb --- old/yast2-fcoe-client-3.1.9/src/modules/FcoeClient.rb 2014-05-28 11:21:18.000000000 +0200 +++ new/yast2-fcoe-client-3.1.10/src/modules/FcoeClient.rb 2014-06-04 10:45:27.000000000 +0200 @@ -1044,22 +1044,14 @@ dcb_capable = DCBCapable(device) # DCB capable flags_map = {} - if card["fcoeoffload"] == nil - # it's about a flag which is not set at all - flags_map["fcoe_flag"] = _("not set") - else - # also about setting of a flag - flags_map["fcoe_flag"] = card["fcoeoffload"]?_("true"):_("false") + if card["fcoeoffload"] != nil + flags_map["fcoe_flag"] = card["fcoeoffload"] end - if card["iscsioffload"] == nil - flags_map["iscsi_flag"] = _("not set") - else - flags_map["iscsi_flag"] = card["iscsioffload"]?_("true"):_("false") + if card["iscsioffload"] != nil + flags_map["iscsi_flag"] = card["iscsioffload"] end - if card["storageonly"] == nil - flags_map["storage_only"] = _("not set") - else - flags_map["storage_only"] = card["storageonly"]?_("true"):_("false") + if card["storageonly"] != nil + flags_map["storage_only"] = card["storageonly"] end if Ops.get(vlan_info, device, []).empty? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.9/test/DetectNetworkCards_spec.rb new/yast2-fcoe-client-3.1.10/test/DetectNetworkCards_spec.rb --- old/yast2-fcoe-client-3.1.9/test/DetectNetworkCards_spec.rb 2014-05-28 11:21:18.000000000 +0200 +++ new/yast2-fcoe-client-3.1.10/test/DetectNetworkCards_spec.rb 2014-06-04 10:45:27.000000000 +0200 @@ -70,10 +70,7 @@ "fcoe_enable" => "yes", "fcoe_vlan" => "not configured", "mac_addr" => "08:00:27:11:64:e4", - "vlan_interface" => "300", - "fcoe_flag" => "not set", - "iscsi_flag" => "not set", - "storage_only" => "not set" + "vlan_interface" => "300" }, { "auto_vlan" => "no", @@ -86,10 +83,7 @@ "fcoe_enable" => "yes", "fcoe_vlan" => "eth1.400", "mac_addr" => "08:00:27:11:64:e4", - "vlan_interface" => "400", - "fcoe_flag" => "not set", - "iscsi_flag" => "not set", - "storage_only" => "not set" + "vlan_interface" => "400" }, { "auto_vlan" => "yes", @@ -103,9 +97,9 @@ "fcoe_vlan" => "not configured", "mac_addr" => "08:23:27:99:64:78", "vlan_interface" => "200", - "fcoe_flag" => "true", - "iscsi_flag" => "false", - "storage_only" => "true" + "fcoe_flag" => true, + "iscsi_flag" => false, + "storage_only" => true } ]) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org