From 92760f1121ad02957b40a59801077e8fb56512b9 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Tue, 4 Dec 2018 17:52:41 +0100 Subject: [PATCH 1/2] Fix user facing typos --- pgweb/account/oauthclient.py | 2 +- templates/errors/csrf_failure.html | 2 +- templates/pages/about/policies/coc/_translations.html | 2 +- templates/pages/developer/summerofcode2011.html | 2 +- templates/pages/developer/summerofcode2012.html | 2 +- templates/pages/developer/summerofcode2013.html | 2 +- templates/pages/developer/summerofcode2014.html | 2 +- templates/pages/developer/summerofcode2016.html | 2 +- templates/pages/download/linux/linux_openscg.inc | 2 +- templates/pages/support/security/faq/2013-04-04.html | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pgweb/account/oauthclient.py b/pgweb/account/oauthclient.py index 67dc4d9..194bf2e 100644 --- a/pgweb/account/oauthclient.py +++ b/pgweb/account/oauthclient.py @@ -195,4 +195,4 @@ def login_oauth(request, provider): return HttpResponse(e) except Exception, e: log.error('Excpetion during OAuth: %s' % e) - return HttpResponse('An unhandled exception occured during the authentication process') + return HttpResponse('An unhandled exception occurred during the authentication process') diff --git a/templates/errors/csrf_failure.html b/templates/errors/csrf_failure.html index 3dd65ad..9b7eceb 100644 --- a/templates/errors/csrf_failure.html +++ b/templates/errors/csrf_failure.html @@ -9,7 +9,7 @@ inject data, or by your system not being configured to allow validation of the request.

-The most common reason for tihs error is that your browser +The most common reason for this error is that your browser does not allow cookies on this request. Cookies are required for the cross site protection to work.

diff --git a/templates/pages/about/policies/coc/_translations.html b/templates/pages/about/policies/coc/_translations.html index ff74f8a..885a708 100644 --- a/templates/pages/about/policies/coc/_translations.html +++ b/templates/pages/about/policies/coc/_translations.html @@ -1,6 +1,6 @@

Translations of the Code of Conduct

The Code of Conduct has been translated into multiple languages. Each - translation was verified independently by at least one aditional party.

+ translation was verified independently by at least one additional party.

If there are any discrepancies in language between a translation and the Code of Conduct written in English, the English language Code of Conduct will take precedence.

diff --git a/templates/pages/developer/summerofcode2011.html b/templates/pages/developer/summerofcode2011.html index b6750b6..d0afdc5 100644 --- a/templates/pages/developer/summerofcode2011.html +++ b/templates/pages/developer/summerofcode2011.html @@ -25,7 +25,7 @@ href="http://socghop.appspot.com/">Summer of Code 2011 program. This program

The PostgreSQL Project has a wide range of opinions on what it feels are acceptable GSoC projects. The examples listed here are meant only as a suggestion of things we would likely find useful, but you should not feel obligated to pick from this list by any means. If you have just discovered a new algorithm as part of your thesis work, we would love to see a proposal implementing that in PostgreSQL. The point is that all proposals will be evaluated on their own merits, so be creative.