Fix i18n support problems in identity

Change-Id: I3b48d17850343051239b5b69e8b890dba32d3ac8
Partial-bug: #1574965

5 files changed, 14 insertions, 11 deletions

diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py
index 53a6fe34..c8f48cb6 100644
--- a/openstackclient/identity/v2_0/catalog.py
+++ b/openstackclient/identity/v2_0/catalog.py
@@ -89,7 +89,7 @@ class ShowCatalog(command.ShowOne):
                 break
 
         if not data:
-            self.app.log.error('service %s not found\n' %
+            self.app.log.error(_('service %s not found\n') %
                                parsed_args.service)
             return ([], [])
 
diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py
index fcb82eb7..09ea738f 100644
--- a/openstackclient/identity/v2_0/endpoint.py
+++ b/openstackclient/identity/v2_0/endpoint.py
@@ -81,7 +81,8 @@ class DeleteEndpoint(command.Command):
         parser.add_argument(
             'endpoint',
             metavar='<endpoint-id>',
-            help=_('Endpoint ID to delete'))
+            help=_('Endpoint ID to delete'),
+        )
         return parser
 
     def take_action(self, parsed_args):
diff --git a/openstackclient/identity/v2_0/project.py b/openstackclient/identity/v2_0/project.py
index d90162c9..80f88d73 100644
--- a/openstackclient/identity/v2_0/project.py
+++ b/openstackclient/identity/v2_0/project.py
@@ -88,7 +88,7 @@ class CreateProject(command.ShowOne):
                     identity_client.tenants,
                     parsed_args.name,
                 )
-                self.log.info('Returning existing project %s', project.name)
+                self.log.info(_('Returning existing project %s'), project.name)
             else:
                 raise e
 
@@ -231,7 +231,8 @@ class ShowProject(command.ShowOne):
         parser.add_argument(
             'project',
             metavar='<project>',
-            help=_('Project to display (name or ID)'))
+            help=_('Project to display (name or ID)'),
+        )
         return parser
 
     def take_action(self, parsed_args):
@@ -295,9 +296,9 @@ class UnsetProject(command.Command):
             metavar='<key>',
             action='append',
             default=[],
+            required=True,
             help=_('Unset a project property '
                    '(repeat option to unset multiple properties)'),
-            required=True,
         )
         return parser
 
@@ -308,7 +309,7 @@ class UnsetProject(command.Command):
             parsed_args.project,
         )
         if not parsed_args.property:
-            self.app.log.error("No changes requested\n")
+            self.app.log.error(_("No changes requested\n"))
         else:
             kwargs = project._info
             for key in parsed_args.property:
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index 1fcee15f..6b014d86 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -95,7 +95,7 @@ class CreateRole(command.ShowOne):
                     identity_client.roles,
                     parsed_args.role_name,
                 )
-                self.log.info('Returning existing role %s', role.name)
+                self.log.info(_('Returning existing role %s'), role.name)
             else:
                 raise e
 
@@ -136,12 +136,12 @@ class ListRole(command.Lister):
         parser.add_argument(
             '--project',
             metavar='<project>',
-            help='Filter roles by <project> (name or ID)',
+            help=_('Filter roles by <project> (name or ID)'),
         )
         parser.add_argument(
             '--user',
             metavar='<user>',
-            help='Filter roles by <user> (name or ID)',
+            help=_('Filter roles by <user> (name or ID)'),
         )
         return parser
 
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index bc9bf837..f8f5df29 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -104,7 +104,7 @@ class CreateUser(command.ShowOne):
                     identity_client.users,
                     parsed_args.name,
                 )
-                self.log.info('Returning existing user %s', user.name)
+                self.log.info(_('Returning existing user %s'), user.name)
             else:
                 raise e
 
@@ -159,7 +159,8 @@ class ListUser(command.Lister):
             '--long',
             action='store_true',
             default=False,
-            help=_('List additional fields in output'))
+            help=_('List additional fields in output'),
+        )
         return parser
 
     def take_action(self, parsed_args):