diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2014-01-14 10:12:55 -0600 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2014-01-14 10:16:54 -0600 |
| commit | 0a3218b17a8102ea8a51758930842e86623bbf85 (patch) | |
| tree | f1fe5901edab68f87016194c0b285bd9868df4a4 | |
| parent | 01d26314d316d61443ee3a4c55f6d06bac477600 (diff) | |
| download | keystone-0a3218b17a8102ea8a51758930842e86623bbf85.tar.gz | |
Do not append to messages with +
Some code was appending to translated messages using +, which
oslo-incubator's new gettextutils doesn't support.
The code was changed to use a substitution value in the message
instead.
Part of bp user-locale-api
Change-Id: If2bc1821d0057c4cd53ead7eac1712284464b9bf
| -rw-r--r-- | keystone/common/ldap/core.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/keystone/common/ldap/core.py b/keystone/common/ldap/core.py index bc9c85b4f..ed6f2f83c 100644 --- a/keystone/common/ldap/core.py +++ b/keystone/common/ldap/core.py @@ -74,8 +74,10 @@ def parse_deref(opt): try: return LDAP_DEREF[opt] except KeyError: - raise ValueError((_('Invalid LDAP deref option: %s. Choose one of: ') % - opt) + ', '.join(LDAP_DEREF.keys())) + raise ValueError(_('Invalid LDAP deref option: %(option)s. ' + 'Choose one of: %(options)s') % + {'option': opt, + 'options': ', '.join(LDAP_DEREF.keys()), }) def parse_tls_cert(opt): |