openstack/horizon
Code Issues Proposed changes

Correct odd exception message

Browse Source 
"Invalid service catalog service" looks odd.

This commit also fixes typo and unnecessary capitalizations.

TrivialFix

Change-Id: I356a2da683aa859b791890837dc6bfe060b5b670
This commit is contained in:
Akihiro Motoki 2018-01-29 05:56:07 +09:00
parent 6e09bfa700
commit 4b70f1d1b4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/exceptions.py
View File

@ -107,7 +107,7 @@ class ServiceCatalogException(HorizonException):
``ServiceCatalog`` is fetched from Keystone. ``ServiceCatalog`` is fetched from Keystone.
""" """
def __init__(self, service_name): def __init__(self, service_name):
message = _('Invalid service catalog service: %s') % service_name message = _('Invalid service catalog: %s') % service_name
super(ServiceCatalogException, self).__init__(message) super(ServiceCatalogException, self).__init__(message)

4
openstack_auth/plugin/k2k.py
View File

@ -75,13 +75,13 @@ class K2KAuthPlugin(base.BasePlugin):
idp_exception = idp_excp idp_exception = idp_excp
if not scoped_idp_auth or idp_exception: if not scoped_idp_auth or idp_exception:
msg = _('Identity provider authentication Failed.') msg = _('Identity provider authentication failed.')
raise exceptions.KeystoneAuthException(msg) raise exceptions.KeystoneAuthException(msg)
session = utils.get_session() session = utils.get_session()
if scoped_idp_auth.get_sp_auth_url(session, service_provider) is None: if scoped_idp_auth.get_sp_auth_url(session, service_provider) is None:
msg = _('Could not find service provider ID on Keystone.') msg = _('Could not find service provider ID on keystone.')
raise exceptions.KeystoneAuthException(msg) raise exceptions.KeystoneAuthException(msg)
unscoped_auth = v3_auth.Keystone2Keystone( unscoped_auth = v3_auth.Keystone2Keystone(

2
openstack_dashboard/dashboards/project/networks/templates/networks/ports/_edit_port_help.html
View File

@ -8,7 +8,7 @@
forward any packets on the port.{% endblocktrans %}</dd> forward any packets on the port.{% endblocktrans %}</dd>
{% block admin_fields %}{% endblock %} {% block admin_fields %}{% endblock %}
<dt>{% trans "Binding: VNIC Type" %}</dt> <dt>{% trans "Binding: VNIC Type" %}</dt>
<dd>{% blocktrans trimmed %}It specified the VNIC type bound to the <dd>{% blocktrans trimmed %}It specifies the VNIC type bound to the
networking port.{% endblocktrans %}</dd> networking port.{% endblocktrans %}</dd>
<dt>{% trans "Port Security" %}</dt> <dt>{% trans "Port Security" %}</dt>
<dd>{% blocktrans trimmed %} <dd>{% blocktrans trimmed %}