Merge pull request #35 from imobachgs/i18n-fixes-configured

Fix "not configured" and "not available" translations

VERSION

@@ -1 +1 @@
-2.17.27
+2.17.28

package/yast2-fcoe-client.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct  6 14:27:50 UTC 2016 - igonzalezsosa@suse.com
+
+- Fixed more translation issues related to bug
+  bsc#928909
+- 2.17.28
+
 -------------------------------------------------------------------
 Mon Oct  3 15:22:52 UTC 2016 - igonzalezsosa@suse.com
 

src/FcoeClient.ycp

@@ -729,7 +729,7 @@ global boolean DetectNetworkCards()
 	    if ( vlan_info[card["dev_name"]:""]:"" == "" )
 	    {
 		// Interface down or FCoE not enabled on the switch - we can't do anything here.
-		fcoe_vlan_interface = _("not available");
+		fcoe_vlan_interface = NOT_AVAILABLE;
 	    }
 	    else
 	    {

src/complex.ycp

@@ -179,6 +179,15 @@ void AdjustButtons()
     }
 }
 
+// Helper function to translate the FCOE VLAN interface in case it's needed.
+string humanized_interface(string interface) {
+  if (interface == FcoeClient::NOT_AVAILABLE)
+    return _("not available");
+  else if (interface == FcoeClient::NOT_CONFIGURED)
+    return _("not configured");
+  else
+    return interface;
+}
 
 void InitInterfacesDialog (string id) {
     y2milestone( "Init interfaces dialog" );
@@ -192,7 +201,7 @@ void InitInterfacesDialog (string id) {
 
     foreach ( map card, (list<map>)netcards, {
 	    table_items = add( table_items,
-			       `item(`id(row), card["dev_name"]:"", card["mac_addr"]:"", card["device"]:"", card["fcoe_vlan"]:"",
+			       `item(`id(row), card["dev_name"]:"", card["mac_addr"]:"", card["device"]:"", humanized_interface(card["fcoe_vlan"]:""),
 				     card["fcoe_enable"]:"", card["dcb_required"]:"", card["auto_vlan"]:"", card["dcb_capable"]:"" )
 			       );
 	    row = row + 1;