diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2014-10-27 10:54:48 -0500 |
|---|---|---|
| committer | Jamie Lennox <jamielennox@redhat.com> | 2014-10-28 20:33:19 +0000 |
| commit | fece74ca3e56342bee43f561404c19128a613628 (patch) | |
| tree | 7241c8dcb7f3176da3df660dbfb5006f9eb86fc1 /keystoneclient/_discover.py | |
| parent | 3b766c51438396a0ab0032de309c9d56e275e0cb (diff) | |
| download | python-keystoneclient-fece74ca3e56342bee43f561404c19128a613628.tar.gz | |
I18n
Keystoneclient didn't provide translated messages. With this
change, the messages are marked for translation.
DocImpact
Implements: blueprint keystoneclient-i18n
Change-Id: I85263a71671a1dffed524185266e6bb7ae559630
Diffstat (limited to 'keystoneclient/_discover.py')
| -rw-r--r-- | keystoneclient/_discover.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/keystoneclient/_discover.py b/keystoneclient/_discover.py index 8816209..9ecf616 100644 --- a/keystoneclient/_discover.py +++ b/keystoneclient/_discover.py @@ -25,6 +25,7 @@ import logging import re from keystoneclient import exceptions +from keystoneclient.i18n import _, _LI, _LW from keystoneclient import utils @@ -65,7 +66,7 @@ def get_version_data(session, url, authenticated=None): pass err_text = resp.text[:50] + '...' if len(resp.text) > 50 else resp.text - msg = 'Invalid Response - Bad version data returned: %s' % err_text + msg = _('Invalid Response - Bad version data returned: %s') % err_text raise exceptions.DiscoveryFailure(msg) @@ -99,7 +100,7 @@ def normalize_version_number(version): except Exception: pass - raise TypeError('Invalid version specified: %s' % version) + raise TypeError(_('Invalid version specified: %s') % version) def version_match(required, candidate): @@ -159,8 +160,8 @@ class Discover(object): try: status = v['status'] except KeyError: - _LOGGER.warning('Skipping over invalid version data. ' - 'No stability status in version.') + _LOGGER.warning(_LW('Skipping over invalid version data. ' + 'No stability status in version.')) continue status = status.lower() @@ -198,13 +199,14 @@ class Discover(object): try: version_str = v['id'] except KeyError: - _LOGGER.info('Skipping invalid version data. Missing ID.') + _LOGGER.info(_LI('Skipping invalid version data. Missing ID.')) continue try: links = v['links'] except KeyError: - _LOGGER.info('Skipping invalid version data. Missing links') + _LOGGER.info( + _LI('Skipping invalid version data. Missing links')) continue version_number = normalize_version_number(version_str) @@ -214,15 +216,15 @@ class Discover(object): rel = link['rel'] url = link['href'] except (KeyError, TypeError): - _LOGGER.info('Skipping invalid version link. ' - 'Missing link URL or relationship.') + _LOGGER.info(_LI('Skipping invalid version link. ' + 'Missing link URL or relationship.')) continue if rel.lower() == 'self': break else: - _LOGGER.info('Skipping invalid version data. ' - 'Missing link to endpoint.') + _LOGGER.info(_LI('Skipping invalid version data. ' + 'Missing link to endpoint.')) continue versions.append({'version': version_number, |