From c454606ada3990f174536a4dcb361620efb76d0f Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Mon, 10 Dec 2012 12:24:07 -0600 Subject: [PATCH] i18n raise Exception messages Provide i18n to some exceptions that were not provided before. Change-Id: Ia320ba5f12e82686c8ee7973a77f152eb4b02bd4 Signed-off-by: Chuck Short --- bin/nova-manage | 9 +++++---- bin/nova-novncproxy | 4 ++-- nova/network/quantumv2/api.py | 2 +- tools/db/schema_diff.py | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bin/nova-manage b/bin/nova-manage index 7121c6f50560..1d2e297d236e 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -523,15 +523,16 @@ class NetworkCommands(object): """Deletes a network""" if fixed_range is None and uuid is None: - raise Exception("Please specify either fixed_range or uuid") + raise Exception(_("Please specify either fixed_range or uuid")) net_manager = importutils.import_object(CONF.network_manager) if "QuantumManager" in CONF.network_manager: if uuid is None: - raise Exception("UUID is required to delete Quantum Networks") + raise Exception(_("UUID is required to delete " + "Quantum Networks")) if fixed_range: - raise Exception("Deleting by fixed_range is not supported " - "with the QuantumManager") + raise Exception(_("Deleting by fixed_range is not supported " + "with the QuantumManager")) # delete the network net_manager.delete_network(context.get_admin_context(), fixed_range, uuid) diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy index e774c01ed1d0..6c911af1eef2 100755 --- a/bin/nova-novncproxy +++ b/bin/nova-novncproxy @@ -91,7 +91,7 @@ class NovaWebSocketProxy(websockify.WebSocketProxy): if not connect_info: LOG.audit("Invalid Token: %s", token) - raise Exception("Invalid Token") + raise Exception(_("Invalid Token")) host = connect_info['host'] port = int(connect_info['port']) @@ -110,7 +110,7 @@ class NovaWebSocketProxy(websockify.WebSocketProxy): if data.find("\r\n\r\n") != -1: if not data.split("\r\n")[0].find("200"): LOG.audit("Invalid Connection Info %s", token) - raise Exception("Invalid Connection Info") + raise Exception(_("Invalid Connection Info")) tsock.recv(len(data)) break diff --git a/nova/network/quantumv2/api.py b/nova/network/quantumv2/api.py index 8c802b9fcb59..8a049512e0f9 100644 --- a/nova/network/quantumv2/api.py +++ b/nova/network/quantumv2/api.py @@ -147,7 +147,7 @@ class API(base.Base): for port_id in touched_port_ids: port_in_server = quantum.show_port(port_id).get('port') if not port_in_server: - raise Exception('Port have already lost') + raise Exception(_('Port not found')) port_req_body = {'port': {'device_id': None}} quantum.update_port(port_id, port_req_body) diff --git a/tools/db/schema_diff.py b/tools/db/schema_diff.py index 873f20543fe8..a4bcfeaa8c4a 100755 --- a/tools/db/schema_diff.py +++ b/tools/db/schema_diff.py @@ -107,7 +107,7 @@ def _get_db_driver_class(db_type): elif db_type == "postgres": return Postgres else: - raise Exception("database %s not supported" % db_type) + raise Exception(_("database %s not supported") % db_type) ### Migrate