From 4b70f1d1b42eb2d989cfa02bf2fa4f9cc5b9b60d Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Mon, 29 Jan 2018 05:56:07 +0900
Subject: [PATCH] Correct odd exception message
"Invalid service catalog service" looks odd.
This commit also fixes typo and unnecessary capitalizations.
TrivialFix
Change-Id: I356a2da683aa859b791890837dc6bfe060b5b670
---
horizon/exceptions.py | 2 +-
openstack_auth/plugin/k2k.py | 4 ++--
.../networks/templates/networks/ports/_edit_port_help.html | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/horizon/exceptions.py b/horizon/exceptions.py
index d4fe352488..2b8820ddc1 100644
--- a/horizon/exceptions.py
+++ b/horizon/exceptions.py
@@ -107,7 +107,7 @@ class ServiceCatalogException(HorizonException):
``ServiceCatalog`` is fetched from Keystone.
"""
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)
diff --git a/openstack_auth/plugin/k2k.py b/openstack_auth/plugin/k2k.py
index 94b10bf3f1..65afd62a8d 100644
--- a/openstack_auth/plugin/k2k.py
+++ b/openstack_auth/plugin/k2k.py
@@ -75,13 +75,13 @@ class K2KAuthPlugin(base.BasePlugin):
idp_exception = idp_excp
if not scoped_idp_auth or idp_exception:
- msg = _('Identity provider authentication Failed.')
+ msg = _('Identity provider authentication failed.')
raise exceptions.KeystoneAuthException(msg)
session = utils.get_session()
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)
unscoped_auth = v3_auth.Keystone2Keystone(
diff --git a/openstack_dashboard/dashboards/project/networks/templates/networks/ports/_edit_port_help.html b/openstack_dashboard/dashboards/project/networks/templates/networks/ports/_edit_port_help.html
index 1b249f8e30..cf3027b80e 100644
--- a/openstack_dashboard/dashboards/project/networks/templates/networks/ports/_edit_port_help.html
+++ b/openstack_dashboard/dashboards/project/networks/templates/networks/ports/_edit_port_help.html
@@ -8,7 +8,7 @@
forward any packets on the port.{% endblocktrans %}</dd>
{% block admin_fields %}{% endblock %}
<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>
<dt>{% trans "Port Security" %}</dt>
<dd>{% blocktrans trimmed %}