i18n support for help and error messages in cinder

Change-Id: I98fbc959034fe0530966291643b381855801de20

1 files changed, 35 insertions, 34 deletions

diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py
index 29c197ef..11e42f83 100644
--- a/openstackclient/volume/v1/volume.py
+++ b/openstackclient/volume/v1/volume.py
@@ -21,6 +21,7 @@ import six
 from openstackclient.common import command
 from openstackclient.common import parseractions
 from openstackclient.common import utils
+from openstackclient.i18n import _
 
 
 class CreateVolume(command.ShowOne):
@@ -31,30 +32,30 @@ class CreateVolume(command.ShowOne):
         parser.add_argument(
             'name',
             metavar='<name>',
-            help='Volume name',
+            help=_('Volume name'),
         )
         parser.add_argument(
             '--size',
             metavar='<size>',
             required=True,
             type=int,
-            help='Volume size in GB',
+            help=_('Volume size in GB'),
         )
         parser.add_argument(
             '--type',
             metavar='<volume-type>',
-            help="Set the type of volume",
+            help=_("Set the type of volume"),
         )
         parser.add_argument(
             '--image',
             metavar='<image>',
-            help='Use <image> as source of volume (name or ID)',
+            help=_('Use <image> as source of volume (name or ID)'),
         )
         snapshot_group = parser.add_mutually_exclusive_group()
         snapshot_group.add_argument(
             '--snapshot',
             metavar='<snapshot>',
-            help='Use <snapshot> as source of volume (name or ID)',
+            help=_('Use <snapshot> as source of volume (name or ID)'),
         )
         snapshot_group.add_argument(
             '--snapshot-id',
@@ -64,34 +65,34 @@ class CreateVolume(command.ShowOne):
         parser.add_argument(
             '--source',
             metavar='<volume>',
-            help='Volume to clone (name or ID)',
+            help=_('Volume to clone (name or ID)'),
         )
         parser.add_argument(
             '--description',
             metavar='<description>',
-            help='Volume description',
+            help=_('Volume description'),
         )
         parser.add_argument(
             '--user',
             metavar='<user>',
-            help='Specify an alternate user (name or ID)',
+            help=_('Specify an alternate user (name or ID)'),
         )
         parser.add_argument(
             '--project',
             metavar='<project>',
-            help='Specify an alternate project (name or ID)',
+            help=_('Specify an alternate project (name or ID)'),
         )
         parser.add_argument(
             '--availability-zone',
             metavar='<availability-zone>',
-            help='Create volume in <availability-zone>',
+            help=_('Create volume in <availability-zone>'),
         )
         parser.add_argument(
             '--property',
             metavar='<key=value>',
             action=parseractions.KeyValueAction,
-            help='Set a property on this volume '
-                 '(repeat option to set multiple properties)',
+            help=_('Set a property on this volume '
+                   '(repeat option to set multiple properties)'),
         )
 
         return parser
@@ -165,15 +166,15 @@ class DeleteVolume(command.Command):
             'volumes',
             metavar='<volume>',
             nargs="+",
-            help='Volume(s) to delete (name or ID)',
+            help=_('Volume(s) to delete (name or ID)'),
         )
         parser.add_argument(
             '--force',
             dest='force',
             action='store_true',
             default=False,
-            help='Attempt forced removal of volume(s), regardless of state '
-                 '(defaults to False)',
+            help=_('Attempt forced removal of volume(s), regardless of state '
+                   '(defaults to False)'),
         )
         return parser
 
@@ -196,24 +197,24 @@ class ListVolume(command.Lister):
         parser.add_argument(
             '--name',
             metavar='<name>',
-            help='Filter results by volume name',
+            help=_('Filter results by volume name'),
         )
         parser.add_argument(
             '--status',
             metavar='<status>',
-            help='Filter results by status',
+            help=_('Filter results by status'),
         )
         parser.add_argument(
             '--all-projects',
             action='store_true',
             default=False,
-            help='Include all projects (admin only)',
+            help=_('Include all projects (admin only)'),
         )
         parser.add_argument(
             '--long',
             action='store_true',
             default=False,
-            help='List additional fields in output',
+            help=_('List additional fields in output'),
         )
         return parser
 
@@ -308,30 +309,30 @@ class SetVolume(command.Command):
         parser.add_argument(
             'volume',
             metavar='<volume>',
-            help='Volume to modify (name or ID)',
+            help=_('Volume to modify (name or ID)'),
         )
         parser.add_argument(
             '--name',
             metavar='<name>',
-            help='New volume name',
+            help=_('New volume name'),
         )
         parser.add_argument(
             '--description',
             metavar='<description>',
-            help='New volume description',
+            help=_('New volume description'),
         )
         parser.add_argument(
             '--size',
             metavar='<size>',
             type=int,
-            help='Extend volume size in GB',
+            help=_('Extend volume size in GB'),
         )
         parser.add_argument(
             '--property',
             metavar='<key=value>',
             action=parseractions.KeyValueAction,
-            help='Set a property on this volume '
-                 '(repeat option to set multiple properties)',
+            help=_('Set a property on this volume '
+                   '(repeat option to set multiple properties)'),
         )
         return parser
 
@@ -341,12 +342,12 @@ class SetVolume(command.Command):
 
         if parsed_args.size:
             if volume.status != 'available':
-                self.app.log.error("Volume is in %s state, it must be "
-                                   "available before size can be extended" %
+                self.app.log.error(_("Volume is in %s state, it must be "
+                                   "available before size can be extended") %
                                    volume.status)
                 return
             if parsed_args.size <= volume.size:
-                self.app.log.error("New size must be greater than %s GB" %
+                self.app.log.error(_("New size must be greater than %s GB") %
                                    volume.size)
                 return
             volume_client.volumes.extend(volume.id, parsed_args.size)
@@ -363,7 +364,7 @@ class SetVolume(command.Command):
             volume_client.volumes.update(volume.id, **kwargs)
 
         if not kwargs and not parsed_args.property and not parsed_args.size:
-            self.app.log.error("No changes requested\n")
+            self.app.log.error(_("No changes requested\n"))
 
 
 class ShowVolume(command.ShowOne):
@@ -374,7 +375,7 @@ class ShowVolume(command.ShowOne):
         parser.add_argument(
             'volume',
             metavar='<volume>',
-            help='Volume to display (name or ID)',
+            help=_('Volume to display (name or ID)'),
         )
         return parser
 
@@ -404,15 +405,15 @@ class UnsetVolume(command.Command):
         parser.add_argument(
             'volume',
             metavar='<volume>',
-            help='Volume to modify (name or ID)',
+            help=_('Volume to modify (name or ID)'),
         )
         parser.add_argument(
             '--property',
             metavar='<key>',
             action='append',
             default=[],
-            help='Remove a property from volume '
-                 '(repeat option to remove multiple properties)',
+            help=_('Remove a property from volume '
+                   '(repeat option to remove multiple properties)'),
             required=True,
         )
         return parser
@@ -428,4 +429,4 @@ class UnsetVolume(command.Command):
                 parsed_args.property,
             )
         else:
-            self.app.log.error("No changes requested\n")
+            self.app.log.error(_("No changes requested\n"))