I18n

Keystoneclient didn't provide translated messages. With this
change, the messages are marked for translation.

DocImpact

Implements: blueprint keystoneclient-i18n

Change-Id: I85263a71671a1dffed524185266e6bb7ae559630

2 files changed, 13 insertions, 10 deletions

diff --git a/keystoneclient/generic/client.py b/keystoneclient/generic/client.py
index 3c81268..7892739 100644
--- a/keystoneclient/generic/client.py
+++ b/keystoneclient/generic/client.py
@@ -19,6 +19,7 @@ from six.moves.urllib import parse as urlparse
 
 from keystoneclient import exceptions
 from keystoneclient import httpclient
+from keystoneclient.i18n import _
 
 
 _logger = logging.getLogger(__name__)
@@ -94,7 +95,7 @@ class Client(httpclient.HTTPClient):
                 try:
                     results = {}
                     if 'version' in body:
-                        results['message'] = "Keystone found at %s" % url
+                        results['message'] = _("Keystone found at %s") % url
                         version = body['version']
                         # Stable/diablo incorrect format
                         id, status, version_url = (
@@ -105,7 +106,7 @@ class Client(httpclient.HTTPClient):
                         return results
                     elif 'versions' in body:
                         # Correct format
-                        results['message'] = "Keystone found at %s" % url
+                        results['message'] = _("Keystone found at %s") % url
                         for version in body['versions']['values']:
                             id, status, version_url = (
                                 self._get_version_info(version, url))
@@ -114,8 +115,8 @@ class Client(httpclient.HTTPClient):
                                                 "url": version_url}
                         return results
                     else:
-                        results['message'] = ("Unrecognized response from %s"
-                                              % url)
+                        results['message'] = (
+                            _("Unrecognized response from %s") % url)
                     return results
                 except KeyError:
                     raise exceptions.AuthorizationFailure()
@@ -159,7 +160,7 @@ class Client(httpclient.HTTPClient):
                     extensions = body['extensions']
                 else:
                     return dict(message=(
-                        'Unrecognized extensions response from %s' % url))
+                        _('Unrecognized extensions response from %s') % url))
 
                 return dict(self._get_extension_info(e) for e in extensions)
             elif resp.status_code == 305:
diff --git a/keystoneclient/generic/shell.py b/keystoneclient/generic/shell.py
index 4f9bd33..e5330a5 100644
--- a/keystoneclient/generic/shell.py
+++ b/keystoneclient/generic/shell.py
@@ -16,6 +16,7 @@
 import six
 
 from keystoneclient.generic import client
+from keystoneclient.i18n import _
 from keystoneclient import utils
 
 
@@ -37,13 +38,14 @@ def do_discover(cs, args):
             print(versions['message'])
         for key, version in six.iteritems(versions):
             if key != 'message':
-                print("    - supports version %s (%s) here %s" %
-                      (version['id'], version['status'], version['url']))
+                print(_("    - supports version %(id)s (%(status)s) here "
+                        "%(url)s") %
+                      version)
                 extensions = cs.discover_extensions(version['url'])
                 if extensions:
                     for key, extension in six.iteritems(extensions):
                         if key != 'message':
-                            print("        - and %s: %s" %
-                                  (key, extension))
+                            print(_("        - and %(key)s: %(extension)s") %
+                                  {'key': key, 'extension': extension})
     else:
-        print("No Keystone-compatible endpoint found")
+        print(_("No Keystone-compatible endpoint found"))