Skip to content

Commit bb71df9

Browse files
author
Steve Martinelli
committed
Mark identity v2 resources for translation
mark v2 catalog, ec2, endpoint, project, role, service and token Change-Id: I14a5852bfee4ca9e25130d001fdadd7778ad0996
1 parent 0cb204e commit bb71df9

7 files changed

Lines changed: 64 additions & 60 deletions

File tree

‎openstackclient/identity/v2_0/catalog.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
from cliff import show
2121

2222
from openstackclient.common import utils
23+
from openstackclient.i18n import _ # noqa
2324

2425

2526
def _format_endpoints(eps=None):
@@ -67,7 +68,7 @@ def get_parser(self, prog_name):
6768
parser.add_argument(
6869
'service',
6970
metavar='<service>',
70-
help='Service to display (type, name or ID)',
71+
help=_('Service to display (type, name or ID)'),
7172
)
7273
return parser
7374

‎openstackclient/identity/v2_0/ec2creds.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from cliff import show
2525

2626
from openstackclient.common import utils
27+
from openstackclient.i18n import _ # noqa
2728

2829

2930
class CreateEC2Creds(show.ShowOne):
@@ -36,12 +37,12 @@ def get_parser(self, prog_name):
3637
parser.add_argument(
3738
'--project',
3839
metavar='<project>',
39-
help='Specify a project [admin only]',
40+
help=_('Specify a project [admin only]'),
4041
)
4142
parser.add_argument(
4243
'--user',
4344
metavar='<user>',
44-
help='Specify a user [admin only]',
45+
help=_('Specify a user [admin only]'),
4546
)
4647
return parser
4748

@@ -83,12 +84,12 @@ def get_parser(self, prog_name):
8384
parser.add_argument(
8485
'access_key',
8586
metavar='<access-key>',
86-
help='Credentials access key',
87+
help=_('Credentials access key'),
8788
)
8889
parser.add_argument(
8990
'--user',
9091
metavar='<user>',
91-
help='Specify a user [admin only]',
92+
help=_('Specify a user [admin only]'),
9293
)
9394
return parser
9495

@@ -118,7 +119,7 @@ def get_parser(self, prog_name):
118119
parser.add_argument(
119120
'--user',
120121
metavar='<user>',
121-
help='Specify a user [admin only]',
122+
help=_('Specify a user [admin only]'),
122123
)
123124
return parser
124125

@@ -156,12 +157,12 @@ def get_parser(self, prog_name):
156157
parser.add_argument(
157158
'access_key',
158159
metavar='<access-key>',
159-
help='Credentials access key',
160+
help=_('Credentials access key'),
160161
)
161162
parser.add_argument(
162163
'--user',
163164
metavar='<user>',
164-
help='Specify a user [admin only]',
165+
help=_('Specify a user [admin only]'),
165166
)
166167
return parser
167168

‎openstackclient/identity/v2_0/endpoint.py‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from cliff import show
2424

2525
from openstackclient.common import utils
26+
from openstackclient.i18n import _ # noqa
2627
from openstackclient.identity import common
2728

2829

@@ -36,24 +37,24 @@ def get_parser(self, prog_name):
3637
parser.add_argument(
3738
'service',
3839
metavar='<endpoint-service>',
39-
help='New endpoint service')
40+
help=_('New endpoint service'))
4041
parser.add_argument(
4142
'--region',
4243
metavar='<region>',
43-
help='New endpoint region')
44+
help=_('New endpoint region'))
4445
parser.add_argument(
4546
'--publicurl',
4647
metavar='<public-url>',
4748
required=True,
48-
help='New endpoint public URL')
49+
help=_('New endpoint public URL'))
4950
parser.add_argument(
5051
'--adminurl',
5152
metavar='<admin-url>',
52-
help='New endpoint admin URL')
53+
help=_('New endpoint admin URL'))
5354
parser.add_argument(
5455
'--internalurl',
5556
metavar='<internal-url>',
56-
help='New endpoint internal URL')
57+
help=_('New endpoint internal URL'))
5758
return parser
5859

5960
def take_action(self, parsed_args):
@@ -84,7 +85,7 @@ def get_parser(self, prog_name):
8485
parser.add_argument(
8586
'endpoint',
8687
metavar='<endpoint-id>',
87-
help='ID of endpoint to delete')
88+
help=_('ID of endpoint to delete'))
8889
return parser
8990

9091
def take_action(self, parsed_args):
@@ -105,7 +106,7 @@ def get_parser(self, prog_name):
105106
'--long',
106107
action='store_true',
107108
default=False,
108-
help='List additional fields in output')
109+
help=_('List additional fields in output'))
109110
return parser
110111

111112
def take_action(self, parsed_args):
@@ -139,7 +140,7 @@ def get_parser(self, prog_name):
139140
parser.add_argument(
140141
'endpoint_or_service',
141142
metavar='<endpoint_or_service>',
142-
help='Endpoint ID or name, type or ID of service to display')
143+
help=_('Endpoint ID or name, type or ID of service to display'))
143144
return parser
144145

145146
def take_action(self, parsed_args):

‎openstackclient/identity/v2_0/project.py‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
from cliff import command
2222
from cliff import lister
2323
from cliff import show
24-
2524
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
25+
2626
from openstackclient.common import parseractions
2727
from openstackclient.common import utils
28+
from openstackclient.i18n import _ # noqa
2829

2930

3031
class CreateProject(show.ShowOne):
@@ -37,30 +38,30 @@ def get_parser(self, prog_name):
3738
parser.add_argument(
3839
'name',
3940
metavar='<project-name>',
40-
help='New project name',
41+
help=_('New project name'),
4142
)
4243
parser.add_argument(
4344
'--description',
4445
metavar='<project-description>',
45-
help='New project description',
46+
help=_('New project description'),
4647
)
4748
enable_group = parser.add_mutually_exclusive_group()
4849
enable_group.add_argument(
4950
'--enable',
5051
action='store_true',
51-
help='Enable project (default)',
52+
help=_('Enable project (default)'),
5253
)
5354
enable_group.add_argument(
5455
'--disable',
5556
action='store_true',
56-
help='Disable project',
57+
help=_('Disable project'),
5758
)
5859
parser.add_argument(
5960
'--property',
6061
metavar='<key=value>',
6162
action=parseractions.KeyValueAction,
62-
help='Property to add for this project '
63-
'(repeat option to set multiple properties)',
63+
help=_('Property to add for this project '
64+
'(repeat option to set multiple properties)'),
6465
)
6566
return parser
6667

@@ -97,7 +98,7 @@ def get_parser(self, prog_name):
9798
parser.add_argument(
9899
'project',
99100
metavar='<project>',
100-
help='Project to delete (name or ID)',
101+
help=_('Project to delete (name or ID)'),
101102
)
102103
return parser
103104

@@ -125,7 +126,7 @@ def get_parser(self, prog_name):
125126
'--long',
126127
action='store_true',
127128
default=False,
128-
help='List additional fields in output',
129+
help=_('List additional fields in output'),
129130
)
130131
return parser
131132

@@ -153,35 +154,35 @@ def get_parser(self, prog_name):
153154
parser.add_argument(
154155
'project',
155156
metavar='<project>',
156-
help='Project to change (name or ID)',
157+
help=_('Project to change (name or ID)'),
157158
)
158159
parser.add_argument(
159160
'--name',
160161
metavar='<new-project-name>',
161-
help='New project name',
162+
help=_('New project name'),
162163
)
163164
parser.add_argument(
164165
'--description',
165166
metavar='<project-description>',
166-
help='New project description',
167+
help=_('New project description'),
167168
)
168169
enable_group = parser.add_mutually_exclusive_group()
169170
enable_group.add_argument(
170171
'--enable',
171172
action='store_true',
172-
help='Enable project',
173+
help=_('Enable project'),
173174
)
174175
enable_group.add_argument(
175176
'--disable',
176177
action='store_true',
177-
help='Disable project',
178+
help=_('Disable project'),
178179
)
179180
parser.add_argument(
180181
'--property',
181182
metavar='<key=value>',
182183
action=parseractions.KeyValueAction,
183-
help='Property to add for this project '
184-
'(repeat option to set multiple properties)',
184+
help=_('Property to add for this project '
185+
'(repeat option to set multiple properties)'),
185186
)
186187
return parser
187188

@@ -233,7 +234,7 @@ def get_parser(self, prog_name):
233234
parser.add_argument(
234235
'project',
235236
metavar='<project>',
236-
help='Project to display (name or ID)')
237+
help=_('Project to display (name or ID)'))
237238
return parser
238239

239240
def take_action(self, parsed_args):

‎openstackclient/identity/v2_0/role.py‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
from openstackclient.common import exceptions
2626
from openstackclient.common import utils
27+
from openstackclient.i18n import _ # noqa
2728

2829

2930
class AddRole(show.ShowOne):
@@ -36,18 +37,17 @@ def get_parser(self, prog_name):
3637
parser.add_argument(
3738
'role',
3839
metavar='<role>',
39-
help='Role name or ID to add to user')
40+
help=_('Role name or ID to add to user'))
4041
parser.add_argument(
4142
'--project',
4243
metavar='<project>',
4344
required=True,
44-
help='Include project (name or ID)',
45-
)
45+
help=_('Include project (name or ID)'))
4646
parser.add_argument(
4747
'--user',
4848
metavar='<user>',
4949
required=True,
50-
help='Name or ID of user to include')
50+
help=_('Name or ID of user to include'))
5151
return parser
5252

5353
def take_action(self, parsed_args):
@@ -80,7 +80,7 @@ def get_parser(self, prog_name):
8080
parser.add_argument(
8181
'role_name',
8282
metavar='<role-name>',
83-
help='New role name')
83+
help=_('New role name'))
8484
return parser
8585

8686
def take_action(self, parsed_args):
@@ -103,8 +103,7 @@ def get_parser(self, prog_name):
103103
parser.add_argument(
104104
'role',
105105
metavar='<role>',
106-
help='Name or ID of role to delete',
107-
)
106+
help=_('Name or ID of role to delete'))
108107
return parser
109108

110109
def take_action(self, parsed_args):
@@ -147,12 +146,11 @@ def get_parser(self, prog_name):
147146
'user',
148147
metavar='<user>',
149148
nargs='?',
150-
help='Name or ID of user to include')
149+
help=_('Name or ID of user to include'))
151150
parser.add_argument(
152151
'--project',
153152
metavar='<project>',
154-
help='Include project (name or ID)',
155-
)
153+
help=_('Include project (name or ID)'))
156154
return parser
157155

158156
def take_action(self, parsed_args):
@@ -167,13 +165,13 @@ def take_action(self, parsed_args):
167165
if self.app.client_manager.auth_ref:
168166
parsed_args.project = auth_ref.project_id
169167
else:
170-
msg = "Project must be specified"
168+
msg = _("Project must be specified")
171169
raise exceptions.CommandError(msg)
172170
if not parsed_args.user:
173171
if self.app.client_manager.auth_ref:
174172
parsed_args.user = auth_ref.user_id
175173
else:
176-
msg = "User must be specified"
174+
msg = _("User must be specified")
177175
raise exceptions.CommandError(msg)
178176

179177
project = utils.find_resource(
@@ -213,18 +211,17 @@ def get_parser(self, prog_name):
213211
parser.add_argument(
214212
'role',
215213
metavar='<role>',
216-
help='Role name or ID to remove from user')
214+
help=_('Role name or ID to remove from user'))
217215
parser.add_argument(
218216
'--project',
219217
metavar='<project>',
220218
required=True,
221-
help='Project to include (name or ID)',
222-
)
219+
help=_('Project to include (name or ID)'))
223220
parser.add_argument(
224221
'--user',
225222
metavar='<user>',
226223
required=True,
227-
help='Name or ID of user')
224+
help=_('Name or ID of user'))
228225
return parser
229226

230227
def take_action(self, parsed_args):
@@ -252,7 +249,7 @@ def get_parser(self, prog_name):
252249
parser.add_argument(
253250
'role',
254251
metavar='<role>',
255-
help='Name or ID of role to display')
252+
help=_('Name or ID of role to display'))
256253
return parser
257254

258255
def take_action(self, parsed_args):

0 commit comments

Comments
 (0)