Skip to content

Commit 086c3ab

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Fix i18n support for help and error messages in compute"
2 parents 5ae8f1b + 5398c96 commit 086c3ab

11 files changed

Lines changed: 184 additions & 133 deletions

File tree

‎openstackclient/compute/v2/agent.py‎

Lines changed: 26 additions & 13 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 CreateAgent(command.ShowOne):
@@ -29,28 +30,34 @@ def get_parser(self, prog_name):
2930
parser.add_argument(
3031
"os",
3132
metavar="<os>",
32-
help="Type of OS")
33+
help=_("Type of OS")
34+
)
3335
parser.add_argument(
3436
"architecture",
3537
metavar="<architecture>",
36-
help="Type of architecture")
38+
help=_("Type of architecture")
39+
)
3740
parser.add_argument(
3841
"version",
3942
metavar="<version>",
40-
help="Version")
43+
help=_("Version")
44+
)
4145
parser.add_argument(
4246
"url",
4347
metavar="<url>",
44-
help="URL")
48+
help=_("URL")
49+
)
4550
parser.add_argument(
4651
"md5hash",
4752
metavar="<md5hash>",
48-
help="MD5 hash")
53+
help=_("MD5 hash")
54+
)
4955
parser.add_argument(
5056
"hypervisor",
5157
metavar="<hypervisor>",
52-
help="Type of hypervisor",
53-
default="xen")
58+
default="xen",
59+
help=_("Type of hypervisor")
60+
)
5461
return parser
5562

5663
def take_action(self, parsed_args):
@@ -75,7 +82,8 @@ def get_parser(self, prog_name):
7582
parser.add_argument(
7683
"id",
7784
metavar="<id>",
78-
help="ID of agent to delete")
85+
help=_("ID of agent to delete")
86+
)
7987
return parser
8088

8189
def take_action(self, parsed_args):
@@ -91,7 +99,8 @@ def get_parser(self, prog_name):
9199
parser.add_argument(
92100
"--hypervisor",
93101
metavar="<hypervisor>",
94-
help="Type of hypervisor")
102+
help=_("Type of hypervisor")
103+
)
95104
return parser
96105

97106
def take_action(self, parsed_args):
@@ -120,19 +129,23 @@ def get_parser(self, prog_name):
120129
parser.add_argument(
121130
"id",
122131
metavar="<id>",
123-
help="ID of the agent")
132+
help=_("ID of the agent")
133+
)
124134
parser.add_argument(
125135
"version",
126136
metavar="<version>",
127-
help="Version of the agent")
137+
help=_("Version of the agent")
138+
)
128139
parser.add_argument(
129140
"url",
130141
metavar="<url>",
131-
help="URL")
142+
help=_("URL")
143+
)
132144
parser.add_argument(
133145
"md5hash",
134146
metavar="<md5hash>",
135-
help="MD5 hash")
147+
help=_("MD5 hash")
148+
)
136149
return parser
137150

138151
def take_action(self, parsed_args):

‎openstackclient/compute/v2/aggregate.py‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from openstackclient.common import command
2222
from openstackclient.common import parseractions
2323
from openstackclient.common import utils
24+
from openstackclient.i18n import _
2425

2526

2627
class AddAggregateHost(command.ShowOne):
@@ -31,12 +32,12 @@ def get_parser(self, prog_name):
3132
parser.add_argument(
3233
'aggregate',
3334
metavar='<aggregate>',
34-
help='Aggregate (name or ID)',
35+
help=_("Aggregate (name or ID)")
3536
)
3637
parser.add_argument(
3738
'host',
3839
metavar='<host>',
39-
help='Host to add to <aggregate>',
40+
help=_("Host to add to <aggregate>")
4041
)
4142
return parser
4243

@@ -62,19 +63,19 @@ def get_parser(self, prog_name):
6263
parser.add_argument(
6364
"name",
6465
metavar="<name>",
65-
help="New aggregate name",
66+
help=_("New aggregate name")
6667
)
6768
parser.add_argument(
6869
"--zone",
6970
metavar="<availability-zone>",
70-
help="Availability zone name",
71+
help=_("Availability zone name")
7172
)
7273
parser.add_argument(
7374
"--property",
7475
metavar="<key=value>",
7576
action=parseractions.KeyValueAction,
76-
help='Property to add to this aggregate '
77-
'(repeat option to set multiple properties)',
77+
help=_("Property to add to this aggregate "
78+
"(repeat option to set multiple properties)")
7879
)
7980
return parser
8081

@@ -105,7 +106,7 @@ def get_parser(self, prog_name):
105106
parser.add_argument(
106107
'aggregate',
107108
metavar='<aggregate>',
108-
help='Aggregate to delete (name or ID)',
109+
help=_("Aggregate to delete (name or ID)")
109110
)
110111
return parser
111112

@@ -128,7 +129,8 @@ def get_parser(self, prog_name):
128129
'--long',
129130
action='store_true',
130131
default=False,
131-
help='List additional fields in output')
132+
help=_("List additional fields in output")
133+
)
132134
return parser
133135

134136
def take_action(self, parsed_args):
@@ -175,12 +177,12 @@ def get_parser(self, prog_name):
175177
parser.add_argument(
176178
'aggregate',
177179
metavar='<aggregate>',
178-
help='Aggregate (name or ID)',
180+
help=_("Aggregate (name or ID)")
179181
)
180182
parser.add_argument(
181183
'host',
182184
metavar='<host>',
183-
help='Host to remove from <aggregate>',
185+
help=_("Host to remove from <aggregate>")
184186
)
185187
return parser
186188

@@ -209,24 +211,24 @@ def get_parser(self, prog_name):
209211
parser.add_argument(
210212
'aggregate',
211213
metavar='<aggregate>',
212-
help='Aggregate to modify (name or ID)',
214+
help=_("Aggregate to modify (name or ID)")
213215
)
214216
parser.add_argument(
215217
'--name',
216218
metavar='<name>',
217-
help='Set aggregate name',
219+
help=_("Set aggregate name")
218220
)
219221
parser.add_argument(
220222
"--zone",
221223
metavar="<availability-zone>",
222-
help="Set availability zone name",
224+
help=_("Set availability zone name")
223225
)
224226
parser.add_argument(
225227
"--property",
226228
metavar="<key=value>",
227229
action=parseractions.KeyValueAction,
228-
help='Property to set on <aggregate> '
229-
'(repeat option to set multiple properties)',
230+
help=_("Property to set on <aggregate> "
231+
"(repeat option to set multiple properties)")
230232
)
231233
return parser
232234

@@ -264,7 +266,7 @@ def get_parser(self, prog_name):
264266
parser.add_argument(
265267
'aggregate',
266268
metavar='<aggregate>',
267-
help='Aggregate to display (name or ID)',
269+
help=_("Aggregate to display (name or ID)")
268270
)
269271
return parser
270272

@@ -300,15 +302,15 @@ def get_parser(self, prog_name):
300302
parser.add_argument(
301303
"aggregate",
302304
metavar="<aggregate>",
303-
help="Aggregate to modify (name or ID)",
305+
help=_("Aggregate to modify (name or ID)")
304306
)
305307
parser.add_argument(
306308
"--property",
307309
metavar="<key>",
308310
action='append',
309-
help='Property to remove from aggregate '
310-
'(repeat option to remove multiple properties)',
311311
required=True,
312+
help=_("Property to remove from aggregate "
313+
"(repeat option to remove multiple properties)")
312314
)
313315
return parser
314316

‎openstackclient/compute/v2/console.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from openstackclient.common import command
2222
from openstackclient.common import parseractions
2323
from openstackclient.common import utils
24+
from openstackclient.i18n import _
2425

2526

2627
class ShowConsoleLog(command.Command):
@@ -31,16 +32,16 @@ def get_parser(self, prog_name):
3132
parser.add_argument(
3233
'server',
3334
metavar='<server>',
34-
help='Server to show console log (name or ID)',
35+
help=_("Server to show console log (name or ID)")
3536
)
3637
parser.add_argument(
3738
'--lines',
3839
metavar='<num-lines>',
3940
type=int,
4041
default=None,
4142
action=parseractions.NonNegativeAction,
42-
help='Number of lines to display from the end of the log '
43-
'(default=all)',
43+
help=_("Number of lines to display from the end of the log "
44+
"(default=all)")
4445
)
4546
return parser
4647

@@ -69,7 +70,7 @@ def get_parser(self, prog_name):
6970
parser.add_argument(
7071
'server',
7172
metavar='<server>',
72-
help='Server to show URL (name or ID)',
73+
help=_("Server to show URL (name or ID)")
7374
)
7475
type_group = parser.add_mutually_exclusive_group()
7576
type_group.add_argument(
@@ -78,21 +79,21 @@ def get_parser(self, prog_name):
7879
action='store_const',
7980
const='novnc',
8081
default='novnc',
81-
help='Show noVNC console URL (default)',
82+
help=_("Show noVNC console URL (default)")
8283
)
8384
type_group.add_argument(
8485
'--xvpvnc',
8586
dest='url_type',
8687
action='store_const',
8788
const='xvpvnc',
88-
help='Show xpvnc console URL',
89+
help=_("Show xpvnc console URL")
8990
)
9091
type_group.add_argument(
9192
'--spice',
9293
dest='url_type',
9394
action='store_const',
9495
const='spice',
95-
help='Show SPICE console URL',
96+
help=_("Show SPICE console URL")
9697
)
9798
return parser
9899

0 commit comments

Comments
 (0)