Skip to content

Commit 5293bb1

Browse files
author
Tang Chen
committed
Fix i18n support problems in identity
Change-Id: I3b48d17850343051239b5b69e8b890dba32d3ac8 Partial-bug: #1574965
1 parent dd0fe3d commit 5293bb1

25 files changed

Lines changed: 364 additions & 319 deletions

‎openstackclient/identity/v2_0/catalog.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def take_action(self, parsed_args):
8989
break
9090

9191
if not data:
92-
self.app.log.error('service %s not found\n' %
92+
self.app.log.error(_('service %s not found\n') %
9393
parsed_args.service)
9494
return ([], [])
9595

‎openstackclient/identity/v2_0/endpoint.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ def get_parser(self, prog_name):
8181
parser.add_argument(
8282
'endpoint',
8383
metavar='<endpoint-id>',
84-
help=_('Endpoint ID to delete'))
84+
help=_('Endpoint ID to delete'),
85+
)
8586
return parser
8687

8788
def take_action(self, parsed_args):

‎openstackclient/identity/v2_0/project.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def take_action(self, parsed_args):
8888
identity_client.tenants,
8989
parsed_args.name,
9090
)
91-
self.log.info('Returning existing project %s', project.name)
91+
self.log.info(_('Returning existing project %s'), project.name)
9292
else:
9393
raise e
9494

@@ -231,7 +231,8 @@ def get_parser(self, prog_name):
231231
parser.add_argument(
232232
'project',
233233
metavar='<project>',
234-
help=_('Project to display (name or ID)'))
234+
help=_('Project to display (name or ID)'),
235+
)
235236
return parser
236237

237238
def take_action(self, parsed_args):
@@ -295,9 +296,9 @@ def get_parser(self, prog_name):
295296
metavar='<key>',
296297
action='append',
297298
default=[],
299+
required=True,
298300
help=_('Unset a project property '
299301
'(repeat option to unset multiple properties)'),
300-
required=True,
301302
)
302303
return parser
303304

@@ -308,7 +309,7 @@ def take_action(self, parsed_args):
308309
parsed_args.project,
309310
)
310311
if not parsed_args.property:
311-
self.app.log.error("No changes requested\n")
312+
self.app.log.error(_("No changes requested\n"))
312313
else:
313314
kwargs = project._info
314315
for key in parsed_args.property:

‎openstackclient/identity/v2_0/role.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def take_action(self, parsed_args):
9595
identity_client.roles,
9696
parsed_args.role_name,
9797
)
98-
self.log.info('Returning existing role %s', role.name)
98+
self.log.info(_('Returning existing role %s'), role.name)
9999
else:
100100
raise e
101101

@@ -136,12 +136,12 @@ def get_parser(self, prog_name):
136136
parser.add_argument(
137137
'--project',
138138
metavar='<project>',
139-
help='Filter roles by <project> (name or ID)',
139+
help=_('Filter roles by <project> (name or ID)'),
140140
)
141141
parser.add_argument(
142142
'--user',
143143
metavar='<user>',
144-
help='Filter roles by <user> (name or ID)',
144+
help=_('Filter roles by <user> (name or ID)'),
145145
)
146146
return parser
147147

‎openstackclient/identity/v2_0/user.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def take_action(self, parsed_args):
104104
identity_client.users,
105105
parsed_args.name,
106106
)
107-
self.log.info('Returning existing user %s', user.name)
107+
self.log.info(_('Returning existing user %s'), user.name)
108108
else:
109109
raise e
110110

@@ -159,7 +159,8 @@ def get_parser(self, prog_name):
159159
'--long',
160160
action='store_true',
161161
default=False,
162-
help=_('List additional fields in output'))
162+
help=_('List additional fields in output'),
163+
)
163164
return parser
164165

165166
def take_action(self, parsed_args):

‎openstackclient/identity/v3/catalog.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def take_action(self, parsed_args):
8484
break
8585

8686
if not data:
87-
self.app.log.error('service %s not found\n' %
87+
self.app.log.error(_('service %s not found\n') %
8888
parsed_args.service)
8989
return ([], [])
9090

‎openstackclient/identity/v3/consumer.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
from openstackclient.common import command
2222
from openstackclient.common import utils
23+
from openstackclient.i18n import _
2324

2425

2526
class CreateConsumer(command.ShowOne):
@@ -30,7 +31,7 @@ def get_parser(self, prog_name):
3031
parser.add_argument(
3132
'--description',
3233
metavar='<description>',
33-
help='New consumer description',
34+
help=_('New consumer description'),
3435
)
3536
return parser
3637

@@ -51,7 +52,7 @@ def get_parser(self, prog_name):
5152
parser.add_argument(
5253
'consumer',
5354
metavar='<consumer>',
54-
help='Consumer to delete',
55+
help=_('Consumer to delete'),
5556
)
5657
return parser
5758

@@ -83,12 +84,12 @@ def get_parser(self, prog_name):
8384
parser.add_argument(
8485
'consumer',
8586
metavar='<consumer>',
86-
help='Consumer to modify',
87+
help=_('Consumer to modify'),
8788
)
8889
parser.add_argument(
8990
'--description',
9091
metavar='<description>',
91-
help='New consumer description',
92+
help=_('New consumer description'),
9293
)
9394
return parser
9495

@@ -101,7 +102,7 @@ def take_action(self, parsed_args):
101102
kwargs['description'] = parsed_args.description
102103

103104
if not len(kwargs):
104-
sys.stdout.write('Consumer not updated, no arguments present\n')
105+
sys.stdout.write(_('Consumer not updated, no arguments present\n'))
105106
return
106107

107108
consumer = identity_client.oauth1.consumers.update(
@@ -116,7 +117,7 @@ def get_parser(self, prog_name):
116117
parser.add_argument(
117118
'consumer',
118119
metavar='<consumer>',
119-
help='Consumer to display',
120+
help=_('Consumer to display'),
120121
)
121122
return parser
122123

‎openstackclient/identity/v3/credential.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
from openstackclient.common import command
2121
from openstackclient.common import utils
22+
from openstackclient.i18n import _
2223

2324

2425
class CreateCredential(command.ShowOne):
@@ -29,24 +30,25 @@ def get_parser(self, prog_name):
2930
parser.add_argument(
3031
'user',
3132
metavar='<user>',
32-
help='Name or ID of user that owns the credential',
33+
help=_('Name or ID of user that owns the credential'),
3334
)
3435
parser.add_argument(
3536
'--type',
3637
default="cert",
3738
metavar='<type>',
3839
choices=['ec2', 'cert'],
39-
help='New credential type',
40+
help=_('New credential type'),
4041
)
4142
parser.add_argument(
4243
'data',
4344
metavar='<data>',
44-
help='New credential data',
45+
help=_('New credential data'),
4546
)
4647
parser.add_argument(
4748
'--project',
4849
metavar='<project>',
49-
help='Project name or ID which limits the scope of the credential',
50+
help=_('Project name or ID which limits the '
51+
'scope of the credential'),
5052
)
5153
return parser
5254

@@ -77,7 +79,7 @@ def get_parser(self, prog_name):
7779
parser.add_argument(
7880
'credential',
7981
metavar='<credential-id>',
80-
help='ID of credential to delete',
82+
help=_('ID of credential to delete'),
8183
)
8284
return parser
8385

@@ -108,31 +110,32 @@ def get_parser(self, prog_name):
108110
parser.add_argument(
109111
'credential',
110112
metavar='<credential-id>',
111-
help='ID of credential to change',
113+
help=_('ID of credential to change'),
112114
)
113115
parser.add_argument(
114116
'--user',
115117
metavar='<user>',
116118
required=True,
117-
help='Name or ID of user that owns the credential',
119+
help=_('Name or ID of user that owns the credential'),
118120
)
119121
parser.add_argument(
120122
'--type',
121123
metavar='<type>',
122124
choices=['ec2', 'cert'],
123125
required=True,
124-
help='New credential type',
126+
help=_('New credential type'),
125127
)
126128
parser.add_argument(
127129
'--data',
128130
metavar='<data>',
129131
required=True,
130-
help='New credential data',
132+
help=_('New credential data'),
131133
)
132134
parser.add_argument(
133135
'--project',
134136
metavar='<project>',
135-
help='Project name or ID which limits the scope of the credential',
137+
help=_('Project name or ID which limits the '
138+
'scope of the credential'),
136139
)
137140
return parser
138141

@@ -163,7 +166,7 @@ def get_parser(self, prog_name):
163166
parser.add_argument(
164167
'credential',
165168
metavar='<credential-id>',
166-
help='ID of credential to display',
169+
help=_('ID of credential to display'),
167170
)
168171
return parser
169172

‎openstackclient/identity/v3/domain.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ def get_parser(self, prog_name):
3333
parser.add_argument(
3434
'name',
3535
metavar='<domain-name>',
36-
help='New domain name',
36+
help=_('New domain name'),
3737
)
3838
parser.add_argument(
3939
'--description',
4040
metavar='<description>',
41-
help='New domain description',
41+
help=_('New domain description'),
4242
)
4343
enable_group = parser.add_mutually_exclusive_group()
4444
enable_group.add_argument(
4545
'--enable',
4646
action='store_true',
47-
help='Enable domain (default)',
47+
help=_('Enable domain (default)'),
4848
)
4949
enable_group.add_argument(
5050
'--disable',
5151
action='store_true',
52-
help='Disable domain',
52+
help=_('Disable domain'),
5353
)
5454
parser.add_argument(
5555
'--or-show',
@@ -75,7 +75,7 @@ def take_action(self, parsed_args):
7575
if parsed_args.or_show:
7676
domain = utils.find_resource(identity_client.domains,
7777
parsed_args.name)
78-
self.log.info('Returning existing domain %s', domain.name)
78+
self.log.info(_('Returning existing domain %s'), domain.name)
7979
else:
8080
raise e
8181

@@ -91,7 +91,7 @@ def get_parser(self, prog_name):
9191
parser.add_argument(
9292
'domain',
9393
metavar='<domain>',
94-
help='Domain to delete (name or ID)',
94+
help=_('Domain to delete (name or ID)'),
9595
)
9696
return parser
9797

@@ -123,28 +123,28 @@ def get_parser(self, prog_name):
123123
parser.add_argument(
124124
'domain',
125125
metavar='<domain>',
126-
help='Domain to modify (name or ID)',
126+
help=_('Domain to modify (name or ID)'),
127127
)
128128
parser.add_argument(
129129
'--name',
130130
metavar='<name>',
131-
help='New domain name',
131+
help=_('New domain name'),
132132
)
133133
parser.add_argument(
134134
'--description',
135135
metavar='<description>',
136-
help='New domain description',
136+
help=_('New domain description'),
137137
)
138138
enable_group = parser.add_mutually_exclusive_group()
139139
enable_group.add_argument(
140140
'--enable',
141141
action='store_true',
142-
help='Enable domain',
142+
help=_('Enable domain'),
143143
)
144144
enable_group.add_argument(
145145
'--disable',
146146
action='store_true',
147-
help='Disable domain',
147+
help=_('Disable domain'),
148148
)
149149
return parser
150150

@@ -164,7 +164,7 @@ def take_action(self, parsed_args):
164164
kwargs['enabled'] = False
165165

166166
if not kwargs:
167-
sys.stdout.write("Domain not updated, no arguments present\n")
167+
sys.stdout.write(_("Domain not updated, no arguments present\n"))
168168
return
169169
identity_client.domains.update(domain.id, **kwargs)
170170

@@ -177,7 +177,7 @@ def get_parser(self, prog_name):
177177
parser.add_argument(
178178
'domain',
179179
metavar='<domain>',
180-
help='Domain to display (name or ID)',
180+
help=_('Domain to display (name or ID)'),
181181
)
182182
return parser
183183

‎openstackclient/identity/v3/ec2creds.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,14 @@ def get_parser(self, prog_name):
5656
parser.add_argument(
5757
'--project',
5858
metavar='<project>',
59-
help=_(
60-
'Create credentials in project '
61-
'(name or ID; default: current authenticated project)'
62-
),
59+
help=_('Create credentials in project '
60+
'(name or ID; default: current authenticated project)'),
6361
)
6462
parser.add_argument(
6563
'--user',
6664
metavar='<user>',
67-
help=_(
68-
'Create credentials for user '
69-
'(name or ID; default: current authenticated user)'
70-
),
65+
help=_('Create credentials for user '
66+
'(name or ID; default: current authenticated user)'),
7167
)
7268
common.add_user_domain_option_to_parser(parser)
7369
common.add_project_domain_option_to_parser(parser)

0 commit comments

Comments
 (0)