From 026cbeb018d8f3424093b3d6717903564eb49ef5 Mon Sep 17 00:00:00 2001 From: John Eismeier Date: Fri, 2 Feb 2018 10:49:55 -0500 Subject: [PATCH] Propose small spelling changes --- awx/api/views.py | 2 +- awx/main/tests/unit/api/test_views.py | 2 +- awx/sso/conf.py | 2 +- awx/ui/conf.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index 4a87204248..ad57324823 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -2295,7 +2295,7 @@ class HostInsights(GenericAPIView): except requests.exceptions.Timeout: return (dict(error=_('Request to {} timed out.').format(url)), status.HTTP_504_GATEWAY_TIMEOUT) except requests.exceptions.RequestException as e: - return (dict(error=_('Unkown exception {} while trying to GET {}').format(e, url)), status.HTTP_502_BAD_GATEWAY) + return (dict(error=_('Unknown exception {} while trying to GET {}').format(e, url)), status.HTTP_502_BAD_GATEWAY) if res.status_code == 401: return (dict(error=_('Unauthorized access. Please check your Insights Credential username and password.')), status.HTTP_502_BAD_GATEWAY) diff --git a/awx/main/tests/unit/api/test_views.py b/awx/main/tests/unit/api/test_views.py index add4ebac77..e2e6cde794 100644 --- a/awx/main/tests/unit/api/test_views.py +++ b/awx/main/tests/unit/api/test_views.py @@ -130,7 +130,7 @@ class TestHostInsights(): @pytest.mark.parametrize("status_code, exception, error, message", [ (502, requests.exceptions.SSLError, 'SSLError while trying to connect to https://myexample.com/whocares/me/', None,), (504, requests.exceptions.Timeout, 'Request to https://myexample.com/whocares/me/ timed out.', None,), - (502, requests.exceptions.RequestException, 'booo!', 'Unkown exception booo! while trying to GET https://myexample.com/whocares/me/'), + (502, requests.exceptions.RequestException, 'booo!', 'Unknown exception booo! while trying to GET https://myexample.com/whocares/me/'), ]) def test_get_insights_request_exception(self, patch_parent, mocker, status_code, exception, error, message): view = HostInsights() diff --git a/awx/sso/conf.py b/awx/sso/conf.py index 2fdf412d82..15db4f2cd8 100644 --- a/awx/sso/conf.py +++ b/awx/sso/conf.py @@ -255,7 +255,7 @@ def _register_ldap(append=None): help_text=_('Mapping of LDAP user schema to Tower API user attributes. The default' ' setting is valid for ActiveDirectory but users with other LDAP' ' configurations may need to change the values. Refer to the Ansible' - ' Tower documentation for additonal details.'), + ' Tower documentation for additional details.'), category=_('LDAP'), category_slug='ldap', placeholder=collections.OrderedDict([ diff --git a/awx/ui/conf.py b/awx/ui/conf.py index 0d626c28f0..f83458d1cc 100644 --- a/awx/ui/conf.py +++ b/awx/ui/conf.py @@ -57,8 +57,8 @@ register( 'MAX_UI_JOB_EVENTS', field_class=fields.IntegerField, min_value=100, - label=_('Max Job Events Retreived by UI'), - help_text=_('Maximum number of job events for the UI to retreive within a ' + label=_('Max Job Events Retrieved by UI'), + help_text=_('Maximum number of job events for the UI to retrieve within a ' 'single request.'), category=_('UI'), category_slug='ui',