diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-05 21:21:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-05 21:21:39 +0000 |
| commit | 7978bb271bf0e978a095aa088e4bb2bdb1d684f8 (patch) | |
| tree | 8b988564f8f7c2f66c36702d10d9c5b39a2176a2 /keystone/catalog | |
| parent | 3583946d933b989b14c25daa9d6c462142eb400f (diff) | |
| parent | 84a0b2df5932fabb0cdaaaddeb86d1f55a7ac06e (diff) | |
| download | keystone-7978bb271bf0e978a095aa088e4bb2bdb1d684f8.tar.gz keystone-7978bb271bf0e978a095aa088e4bb2bdb1d684f8.tar.xz keystone-7978bb271bf0e978a095aa088e4bb2bdb1d684f8.zip | |
Merge "Bug 1075090 -- Fixing log messages in python source code to support internationalization."
Diffstat (limited to 'keystone/catalog')
| -rw-r--r-- | keystone/catalog/backends/templated.py | 2 | ||||
| -rw-r--r-- | keystone/catalog/core.py | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/keystone/catalog/backends/templated.py b/keystone/catalog/backends/templated.py index acd20ae3..a96902d3 100644 --- a/keystone/catalog/backends/templated.py +++ b/keystone/catalog/backends/templated.py @@ -106,7 +106,7 @@ class TemplatedCatalog(kvs.Catalog): try: self.templates = parse_templates(open(template_file)) except IOError: - LOG.critical('Unable to open template file %s' % template_file) + LOG.critical(_('Unable to open template file %s') % template_file) raise def get_catalog(self, user_id, tenant_id, metadata=None): diff --git a/keystone/catalog/core.py b/keystone/catalog/core.py index df100d74..7a8e8be7 100644 --- a/keystone/catalog/core.py +++ b/keystone/catalog/core.py @@ -34,17 +34,19 @@ def format_url(url, data): except AttributeError: return None except KeyError as e: - LOG.error("Malformed endpoint %s - unknown key %s" % - (url, str(e))) + LOG.error(_("Malformed endpoint %(url)s - unknown key %(keyerror)s") % + {"url": url, + "keyerror": str(e)}) raise exception.MalformedEndpoint(endpoint=url) except TypeError as e: - LOG.error("Malformed endpoint %s - type mismatch %s \ - (are you missing brackets ?)" % - (url, str(e))) + LOG.error(_("Malformed endpoint %(url)s - unknown key %(keyerror)s" + "(are you missing brackets ?)") % + {"url": url, + "keyerror": str(e)}) raise exception.MalformedEndpoint(endpoint=url) except ValueError as e: - LOG.error("Malformed endpoint %s - incomplete format \ - (are you missing a type notifier ?)" % url) + LOG.error(_("Malformed endpoint %s - incomplete format \ + (are you missing a type notifier ?)") % url) raise exception.MalformedEndpoint(endpoint=url) return result |