State i18() changes and help messages improved

Add _() to wrap help message in network commands.
And also some improvement for help message.

Change-Id: Ib3e498f5976ba98c44fd4eec2d1623263b3db53e
Partial-bug: 1570924

Author: Tang Chen

doc/source/command-objects/network.rst

@@ -59,7 +59,7 @@ Create new network
 .. option:: --availability-zone-hint <availability-zone>
 
     Availability Zone in which to create this network
-    (requires the Network Availability Zone extension,
+    (Network Availability Zone extension required,
     repeat option to set multiple availability zones)
 
     *Network version 2 only*
@@ -72,8 +72,8 @@ Create new network
 
 .. option:: --external
 
-    Set this network as an external network.
-    Requires the "external-net" extension to be enabled.
+    Set this network as an external network
+    (external-net extension required)
 
     *Network version 2 only*
 
@@ -92,8 +92,8 @@ Create new network
 
 .. option:: --no-default
 
-    Do not use the network as the default external network.
-    By default, no network is set as an external network.
+    Do not use the network as the default external network
+    (default)
 
     *Network version 2 only*
 
@@ -197,16 +197,15 @@ Set network properties
 .. option:: --external
 
     Set this network as an external network.
-    Requires the "external-net" extension to be enabled.
+    (external-net extension required)
 
 .. option:: --internal
 
     Set this network as an internal network
 
 .. option:: --default
 
-    Specify if this network should be used as
-    the default external network
+    Set the network as the default external network
 
 .. option:: --no-default
 

doc/source/command-objects/port.rst

@@ -45,8 +45,8 @@ Create new port
 
 .. option:: --vnic-type <vnic-type>
 
-    VNIC type for this port (direct | direct-physical | macvtap | normal | baremetal).
-    If unspecified during port creation, default value will be 'normal'.
+    VNIC type for this port (direct | direct-physical | macvtap | normal | baremetal,
+    default: normal)
 
 .. option:: --binding-profile <binding-profile>
 
@@ -141,7 +141,7 @@ Set port properties
 
 .. option:: --no-fixed-ip
 
-    Clear existing information of fixed-ips
+    Clear existing information of fixed IP addresses
 
 .. option:: --device <device-id>
 
@@ -153,8 +153,8 @@ Set port properties
 
 .. option:: --vnic-type <vnic-type>
 
-    VNIC type for this port (direct | direct-physical | macvtap | normal | baremetal).
-    If unspecified during port creation, default value will be 'normal'.
+    VNIC type for this port (direct | direct-physical | macvtap | normal | baremetal,
+    default: normal)
 
 .. option:: --binding-profile <binding-profile>
 

doc/source/command-objects/router.rst

@@ -87,7 +87,7 @@ Create new router
 .. option:: --availability-zone-hint <availability-zone>
 
     Availability Zone in which to create this router
-    (requires the Router Availability Zone extension,
+    (Router Availability Zone extension required,
     repeat option to set multiple availability zones)
 
 .. _router_create-name:

doc/source/command-objects/subnet-pool.rst

@@ -49,8 +49,8 @@ Create subnet pool
 
 .. option:: --address-scope <address-scope>
 
-    Set address scope associated with the subnet pool (name or ID).
-    Prefixes must be unique across address scopes.
+    Set address scope associated with the subnet pool (name or ID),
+    prefixes must be unique across address scopes
 
 .. _subnet_pool_create-name:
 .. describe:: <name>
@@ -128,8 +128,8 @@ Set subnet pool properties
 
 .. option:: --address-scope <address-scope>
 
-    Set address scope associated with the subnet pool (name or ID).
-    Prefixes must be unique across address scopes.
+    Set address scope associated with the subnet pool (name or ID),
+    prefixes must be unique across address scopes
 
 .. option:: --no-address-scope
 

doc/source/command-objects/subnet.rst

@@ -206,7 +206,7 @@ Set subnet properties
 subnet show
 -----------
 
-Show subnet details
+Display subnet details
 
 .. program:: subnet show
 .. code:: bash
@@ -217,4 +217,4 @@ Show subnet details
 .. _subnet_show-subnet:
 .. describe:: <subnet>
 
-    Subnet to show (name or ID)
+    Subnet to display (name or ID)

openstackclient/network/v2/floating_ip.py

@@ -14,6 +14,7 @@
 """IP Floating action implementations"""
 
 from openstackclient.common import utils
+from openstackclient.i18n import _
 from openstackclient.network import common
 
 
@@ -63,34 +64,34 @@ def update_parser_common(self, parser):
         parser.add_argument(
             'network',
             metavar='<network>',
-            help='Network to allocate floating IP from (name or ID)',
+            help=_("Network to allocate floating IP from (name or ID)")
         )
         return parser
 
     def update_parser_network(self, parser):
         parser.add_argument(
             '--subnet',
             metavar='<subnet>',
-            help="Subnet on which you want to create the floating IP "
-                 "(name or ID)"
+            help=_("Subnet on which you want to create the floating IP "
+                   "(name or ID)")
         )
         parser.add_argument(
             '--port',
             metavar='<port>',
-            help="Port to be associated with the floating IP "
-                 "(name or ID)"
+            help=_("Port to be associated with the floating IP "
+                   "(name or ID)")
         )
         parser.add_argument(
             '--floating-ip-address',
             metavar='<floating-ip-address>',
             dest='floating_ip_address',
-            help="Floating IP address"
+            help=_("Floating IP address")
         )
         parser.add_argument(
             '--fixed-ip-address',
             metavar='<fixed-ip-address>',
             dest='fixed_ip_address',
-            help="Fixed IP address mapped to the floating IP"
+            help=_("Fixed IP address mapped to the floating IP")
         )
         return parser
 
@@ -115,7 +116,7 @@ def update_parser_common(self, parser):
         parser.add_argument(
             'floating_ip',
             metavar="<floating-ip>",
-            help=("Floating IP to delete (IP address or ID)")
+            help=_("Floating IP to delete (IP address or ID)")
         )
         return parser
 
@@ -189,7 +190,7 @@ def update_parser_common(self, parser):
         parser.add_argument(
             'floating_ip',
             metavar="<floating-ip>",
-            help=("Floating IP to display (IP address or ID)")
+            help=_("Floating IP to display (IP address or ID)")
         )
         return parser