diff --git a/openstackclient/network/client.py b/openstackclient/network/client.py index be06d2b552..d711f4fcf5 100644 --- a/openstackclient/network/client.py +++ b/openstackclient/network/client.py @@ -17,6 +17,7 @@ from openstack import connection from openstack import profile from openstackclient.common import utils +from openstackclient.i18n import _ LOG = logging.getLogger(__name__) @@ -51,7 +52,7 @@ def build_option_parser(parser): '--os-network-api-version', metavar='<network-api-version>', default=utils.env('OS_NETWORK_API_VERSION'), - help='Network API version, default=' + - DEFAULT_API_VERSION + - ' (Env: OS_NETWORK_API_VERSION)') + help=_("Network API version, default=%s " + "(Env: OS_NETWORK_API_VERSION)") % DEFAULT_API_VERSION + ) return parser diff --git a/openstackclient/network/common.py b/openstackclient/network/common.py index a3047d84ba..4028ac0db2 100644 --- a/openstackclient/network/common.py +++ b/openstackclient/network/common.py @@ -16,6 +16,7 @@ import six from openstackclient.common import command from openstackclient.common import exceptions +from openstackclient.i18n import _ @six.add_metaclass(abc.ABCMeta) @@ -94,14 +95,22 @@ class NetworkAndComputeDelete(NetworkAndComputeCommand): self.take_action_compute(self.app.client_manager.compute, parsed_args) except Exception as e: - self.app.log.error("Failed to delete %s with name or ID " - "'%s': %s" % (self.resource, r, e)) + msg = _("Failed to delete %(resource)s with name or ID " + "'%(name_or_id)s': %(e)s") % { + "resource": self.resource, + "name_or_id": r, + "e": e, + } + self.app.log.error(msg) ret += 1 if ret: total = len(resources) - msg = "%s of %s %ss failed to delete." % (ret, total, - self.resource) + msg = _("%(num)s of %(total)s %(resource)s failed to delete.") % { + "num": ret, + "total": total, + "resource": self.resource, + } raise exceptions.CommandError(msg)