diff options
| author | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-15 18:11:54 -0400 |
|---|---|---|
| committer | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-15 18:11:54 -0400 |
| commit | 3cc78174e023b3f848b9c4b30468d356ee575ea6 (patch) | |
| tree | 096afbf7569d339e4c0f4400ede639b0fdf20141 | |
| parent | e9ef6e04786a40d20f8022bec5d23d2e4503ce3a (diff) | |
| download | nova-3cc78174e023b3f848b9c4b30468d356ee575ea6.tar.gz nova-3cc78174e023b3f848b9c4b30468d356ee575ea6.tar.xz nova-3cc78174e023b3f848b9c4b30468d356ee575ea6.zip | |
internationalization
| -rw-r--r-- | nova/api/openstack/servers.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 42fe13619..f618c31a0 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -221,15 +221,16 @@ class Controller(wsgi.Controller): path = item['path'] contents = item['contents'] except KeyError as key: - expl = 'Bad personality format: missing %s' % key + expl = _('Bad personality format: missing %s') % key raise exc.HTTPBadRequest(explanation=expl) except TypeError: - raise exc.HTTPBadRequest(explanation='Bad personality format') + expl = _('Bad personality format') + raise exc.HTTPBadRequest(explanation=expl) try: contents = base64.b64decode(contents) except TypeError: - msg = 'Personality content for %s cannot be decoded' % path - raise exc.HTTPBadRequest(explanation=msg) + expl = _('Personality content for %s cannot be decoded') % path + raise exc.HTTPBadRequest(explanation=expl) injected_files.append((path, contents)) return injected_files @@ -238,13 +239,13 @@ class Controller(wsgi.Controller): Reraise quota errors as api-specific http exceptions """ if error.code == "OnsetFileLimitExceeded": - expl = "Personality file limit exceeded" + expl = _("Personality file limit exceeded") raise exc.HTTPBadRequest(explanation=expl) if error.code == "OnsetFilePathLimitExceeded": - expl = "Personality file path too long" + expl = _("Personality file path too long") raise exc.HTTPBadRequest(explanation=expl) if error.code == "OnsetFileContentLimitExceeded": - expl = "Personality file content too long" + expl = _("Personality file content too long") raise exc.HTTPBadRequest(explanation=expl) # if the original error is okay, just reraise it raise error |