From 93927c5ff00835e6e3363ea939e17b0e3716f461 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Thu, 15 Aug 2013 12:02:46 -0500 Subject: [PATCH] Translate user-facing exception messages Exception messages should be translated because they can be visible to users. Also convert these strings to use named format parameters in case translation reorders them. Change-Id: Ife6de17890ba153b8124e91edce6e6d540da3cac --- heat/engine/resources/instance.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py index 11d99de8..995d7659 100644 --- a/heat/engine/resources/instance.py +++ b/heat/engine/resources/instance.py @@ -328,13 +328,18 @@ class Instance(resource.Resource): code = fault.get('code', 500) delete = scheduler.TaskRunner(self._delete_server, server) delete(wait_time=0.2) - exc = exception.Error("Build of server %s failed: %s (%s)" % - (server.name, message, code)) + exc = exception.Error(_("Build of server %(server)s failed: " + "%(message)s (%(code)s)") % + dict(server=server.name, + message=message, + code=code)) raise exc else: - exc = exception.Error('%s instance[%s] status[%s]' % - ('nova reported unexpected', - self.name, server.status)) + exc = exception.Error(_('Nova reported unexpected ' + 'instance[%(name)s] ' + 'status[%(status)s]') % + dict(name=self.name, + status=server.status)) raise exc else: return volume_attach.step() @@ -374,8 +379,8 @@ class Instance(resource.Resource): server.confirm_resize() else: raise exception.Error( - "Resizing to '%s' failed, status '%s'" % ( - flavor, server.status)) + _("Resizing to '%(flavor)s' failed, status '%(status)s'") % + dict(flavor=flavor, status=server.status)) def metadata_update(self, new_metadata=None): ''' -- 2.45.2