Merge "Use oslo.i18n"

doc/source/devref/il8n.rst

@@ -21,4 +21,4 @@ in nova/tests/test_localization.py.
 
 The ``_()`` function is found by doing::
 
-    from nova.openstack.common.gettextutils import _
+    from nova.i18n import _

nova/api/auth.py

@@ -21,7 +21,7 @@
 import webob.exc
 
 from nova import context
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova.openstack.common.middleware import request_id

nova/api/ec2/__init__.py

@@ -32,8 +32,8 @@
 from nova.api import validator
 from nova import context
 from nova import exception
-from nova.openstack.common.gettextutils import _
-from nova.openstack.common.gettextutils import _LE
+from nova.i18n import _
+from nova.i18n import _LE
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging

nova/api/ec2/cloud.py

@@ -38,12 +38,12 @@
 from nova.compute import vm_states
 from nova import db
 from nova import exception
+from nova.i18n import _
 from nova.image import s3
 from nova import network
 from nova.network.security_group import neutron_driver
 from nova import objects
 from nova.objects import base as obj_base
-from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import quota

nova/api/ec2/ec2utils.py

@@ -21,10 +21,10 @@
 from nova import context
 from nova import db
 from nova import exception
+from nova.i18n import _
 from nova.network import model as network_model
 from nova import objects
 from nova.objects import base as obj_base
-from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import memorycache
 from nova.openstack.common import timeutils

nova/api/metadata/handler.py

@@ -27,7 +27,7 @@
 from nova.api.metadata import base
 from nova import conductor
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import memorycache
 from nova import utils

nova/api/metadata/password.py

@@ -16,8 +16,8 @@
 from webob import exc
 
 from nova import context
+from nova.i18n import _
 from nova import objects
-from nova.openstack.common.gettextutils import _
 from nova import utils
 
 

nova/api/metadata/vendordata_json.py

@@ -20,7 +20,7 @@
 from oslo.config import cfg
 
 from nova.api.metadata import base
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 

nova/api/openstack/__init__.py

@@ -27,9 +27,9 @@
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import exception
+from nova.i18n import _
+from nova.i18n import translate
 from nova import notifications
-from nova.openstack.common import gettextutils
-from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova import utils
 from nova import wsgi as base_wsgi
@@ -107,12 +107,8 @@ def _error(self, inner, req):
         # inconsistent with the EC2 API to hide every exception,
         # including those that are safe to expose, see bug 1021373
         if safe:
-            if isinstance(inner.msg_fmt, gettextutils.Message):
-                user_locale = req.best_match_language()
-                inner_msg = gettextutils.translate(
-                        inner.msg_fmt, user_locale)
-            else:
-                inner_msg = unicode(inner)
+            user_locale = req.best_match_language()
+            inner_msg = translate(inner.message, user_locale)
             outer.explanation = '%s: %s' % (inner.__class__.__name__,
                                             inner_msg)
 

nova/api/openstack/common.py

@@ -29,7 +29,7 @@
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova.openstack.common import log as logging
 from nova import quota
 

nova/api/openstack/compute/contrib/admin_actions.py

@@ -24,7 +24,7 @@
 from nova import compute
 from nova.compute import vm_states
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import strutils
 

nova/api/openstack/compute/contrib/aggregates.py

@@ -22,7 +22,7 @@
 from nova.api.openstack import extensions
 from nova.compute import api as compute_api
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova.openstack.common import log as logging
 from nova import utils
 

nova/api/openstack/compute/contrib/assisted_volume_snapshots.py

@@ -19,7 +19,7 @@
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 

nova/api/openstack/compute/contrib/attach_interfaces.py

@@ -21,8 +21,8 @@
 from nova.api.openstack import extensions
 from nova import compute
 from nova import exception
+from nova.i18n import _
 from nova import network
-from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 

nova/api/openstack/compute/contrib/baremetal_nodes.py

@@ -22,7 +22,7 @@
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova.virt.baremetal import db
 
 authorize = extensions.extension_authorizer('compute', 'baremetal_nodes')

nova/api/openstack/compute/contrib/cells.py

@@ -28,7 +28,7 @@
 from nova.cells import rpcapi as cells_rpcapi
 from nova.compute import api as compute
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import strutils
 from nova.openstack.common import timeutils

nova/api/openstack/compute/contrib/certificates.py

@@ -18,7 +18,7 @@
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 import nova.cert.rpcapi
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 
 authorize = extensions.extension_authorizer('compute', 'certificates')
 

nova/api/openstack/compute/contrib/cloudpipe.py

@@ -25,9 +25,9 @@
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
 from nova import exception
+from nova.i18n import _
 from nova import network
 from nova.openstack.common import fileutils
-from nova.openstack.common.gettextutils import _
 from nova.openstack.common import timeutils
 from nova import utils
 

nova/api/openstack/compute/contrib/cloudpipe_update.py

@@ -17,8 +17,8 @@
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
+from nova.i18n import _
 from nova import objects
-from nova.openstack.common.gettextutils import _
 
 authorize = extensions.extension_authorizer('compute', 'cloudpipe_update')
 

nova/api/openstack/compute/contrib/console_auth_tokens.py

@@ -18,7 +18,7 @@
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.consoleauth import rpcapi as consoleauth_rpcapi
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 
 
 authorize = extensions.extension_authorizer('compute', 'console_auth_tokens')

nova/api/openstack/compute/contrib/console_output.py

@@ -22,7 +22,7 @@
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 
 
 authorize = extensions.extension_authorizer('compute', 'console_output')

nova/api/openstack/compute/contrib/consoles.py

@@ -18,7 +18,7 @@
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 
 
 authorize = extensions.extension_authorizer('compute', 'consoles')

nova/api/openstack/compute/contrib/disk_config.py

@@ -19,7 +19,7 @@
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova.openstack.common import strutils
 
 ALIAS = 'OS-DCF'

nova/api/openstack/compute/contrib/evacuate.py

@@ -20,7 +20,7 @@
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova.openstack.common import strutils
 from nova import utils
 

nova/api/openstack/compute/contrib/fixed_ips.py

@@ -16,8 +16,8 @@
 
 from nova.api.openstack import extensions
 from nova import exception
+from nova.i18n import _
 from nova import objects
-from nova.openstack.common.gettextutils import _
 
 authorize = extensions.extension_authorizer('compute', 'fixed_ips')
 

nova/api/openstack/compute/contrib/flavor_access.py

@@ -21,8 +21,8 @@
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
+from nova.i18n import _
 from nova import objects
-from nova.openstack.common.gettextutils import _
 
 
 soft_authorize = extensions.soft_extension_authorizer('compute',

nova/api/openstack/compute/contrib/flavorextraspecs.py

@@ -22,8 +22,8 @@
 from nova.api.openstack import xmlutil
 from nova.compute import flavors
 from nova import exception
+from nova.i18n import _
 from nova import objects
-from nova.openstack.common.gettextutils import _
 from nova import utils
 
 authorize = extensions.extension_authorizer('compute', 'flavorextraspecs')

nova/api/openstack/compute/contrib/flavormanage.py

@@ -18,7 +18,7 @@
 from nova.api.openstack import wsgi
 from nova.compute import flavors
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 
 
 authorize = extensions.extension_authorizer('compute', 'flavormanage')

nova/api/openstack/compute/contrib/floating_ip_dns.py

@@ -20,8 +20,8 @@
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import exception
+from nova.i18n import _
 from nova import network
-from nova.openstack.common.gettextutils import _
 from nova import utils
 
 

nova/api/openstack/compute/contrib/floating_ips.py

@@ -24,8 +24,8 @@
 from nova import compute
 from nova.compute import utils as compute_utils
 from nova import exception
+from nova.i18n import _
 from nova import network
-from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova.openstack.common import uuidutils
 

nova/api/openstack/compute/contrib/floating_ips_bulk.py

@@ -18,8 +18,8 @@
 
 from nova.api.openstack import extensions
 from nova import exception
+from nova.i18n import _
 from nova import objects
-from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 CONF = cfg.CONF

nova/api/openstack/compute/contrib/fping.py

@@ -24,7 +24,7 @@
 from nova.api.openstack import extensions
 from nova import compute
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova import utils
 
 authorize = extensions.extension_authorizer('compute', 'fping')

nova/api/openstack/compute/contrib/hosts.py

@@ -22,7 +22,7 @@
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/hypervisors.py

@@ -22,7 +22,7 @@
 from nova.api.openstack import xmlutil
 from nova import compute
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 
 
 authorize = extensions.extension_authorizer('compute', 'hypervisors')

nova/api/openstack/compute/contrib/instance_usage_audit_log.py

@@ -21,7 +21,7 @@
 
 from nova.api.openstack import extensions
 from nova import compute
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova import utils
 
 CONF = cfg.CONF

nova/api/openstack/compute/contrib/keypairs.py

@@ -24,7 +24,7 @@
 from nova.api.openstack import xmlutil
 from nova.compute import api as compute_api
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 
 
 authorize = extensions.extension_authorizer('compute', 'keypairs')

nova/api/openstack/compute/contrib/multinic.py

@@ -22,7 +22,7 @@
 from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
-from nova.openstack.common.gettextutils import _
+from nova.i18n import _
 from nova.openstack.common import log as logging
 
 

nova/api/openstack/compute/contrib/networks_associate.py

@@ -15,8 +15,8 @@
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import exception
+from nova.i18n import _
 from nova import network
-from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/os_networks.py

@@ -21,8 +21,8 @@
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import exception
+from nova.i18n import _
 from nova import network
-from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/os_tenant_networks.py

@@ -22,8 +22,8 @@
 from nova.api.openstack import extensions
 from nova import context as nova_context
 from nova import exception
+from nova.i18n import _
 import nova.network
-from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
 from nova import quota