diff --git a/app/Http/Controllers/LinkController.php b/app/Http/Controllers/LinkController.php index 9837fa7f6..e33574740 100644 --- a/app/Http/Controllers/LinkController.php +++ b/app/Http/Controllers/LinkController.php @@ -72,7 +72,7 @@ public function performRedirect(Request $request, $short_url, $secret_key=false) $link_secret_key = $link->secret_key; if ($link_secret_key) { if (!$secret_key) { - // if we do not receieve a secret key + // if we do not receive a secret key // when we are expecting one, return a 403 return abort(403); } diff --git a/docs/developer-guide/api.md b/docs/developer-guide/api.md index bcd192716..4fd986793 100644 --- a/docs/developer-guide/api.md +++ b/docs/developer-guide/api.md @@ -232,7 +232,7 @@ Response: ``` ## HTTP Error Codes -The API will return an error code if your request was malformed or another error occured while processing your request. +The API will return an error code if your request was malformed or another error occurred while processing your request. ### HTTP 400 Bad Request This status code is returned in the following circumstances: diff --git a/docs/developer-guide/api_errors.md b/docs/developer-guide/api_errors.md index 7346b6603..759fff15e 100644 --- a/docs/developer-guide/api_errors.md +++ b/docs/developer-guide/api_errors.md @@ -2,7 +2,7 @@ To diagnose an unexpected or unhandled error, turn on the `APP_DEBUG` flag by setting it to `true` in `.env` -`SERVER_ERROR`: A generic, unhandled error has occured. +`SERVER_ERROR`: A generic, unhandled error has occurred. `JSON_ONLY`: Only JSON-encoded data is available for this endpoint. @@ -18,7 +18,7 @@ it to `true` in `.env` `CREATION_ERROR`: An error occurred while creating the object. -`AUTH_ERROR`: An error occured while attempting to authenticate the user to the API. +`AUTH_ERROR`: An error occurred while attempting to authenticate the user to the API. `QUOTA_EXCEEDED`: User's API usage has exceeded alloted quota. diff --git a/public/js/AdminCtrl.js b/public/js/AdminCtrl.js index 01145017a..ca25130e4 100644 --- a/public/js/AdminCtrl.js +++ b/public/js/AdminCtrl.js @@ -261,7 +261,7 @@ polr.controller('AdminCtrl', function($scope, $compile, $timeout) { $('#new-user-form').clearForm(); $scope.datatables['admin_users_table'].ajax.reload(); }, function () { - toastr.error("An error occured while creating the user.", "Error"); + toastr.error("An error occurred while creating the user.", "Error"); }); } diff --git a/public/js/index.js b/public/js/index.js index 813f44ade..fa69d5be6 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -30,12 +30,12 @@ $(function() { } else if (msg == 'invalid') { $('#link-availability-status').html(' Invalid Custom URL Ending'); } else { - $('#link-availability-status').html(' An error occured. Try again' + msg); + $('#link-availability-status').html(' An error occurred. Try again' + msg); } }); request.fail(function(jqXHR, textStatus) { - $('#link-availability-status').html(' An error occured. Try again' + textstatus); + $('#link-availability-status').html(' An error occurred. Try again' + textstatus); }); }); min = 1; diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php index 5d1a2165d..7cd1128d7 100644 --- a/resources/views/about.blade.php +++ b/resources/views/about.blade.php @@ -22,7 +22,7 @@ @endif

{{env('APP_NAME')}} is powered by Polr 2, an open source, minimalist link shortening platform. The Polr Project is in no way associated with this site. - Learn more at its Github page or its project site. + Learn more at its GitHub page or its project site.
Polr is licensed under the GNU GPL License.

diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php index d19f03283..bbdac2cb1 100644 --- a/resources/views/setup.blade.php +++ b/resources/views/setup.blade.php @@ -223,7 +223,7 @@

@@ -281,7 +281,7 @@

Polr Version {{env('VERSION')}} released {{env('VERSION_RELMONTH')}} {{env('VERSION_RELDAY')}}, {{env('VERSION_RELYEAR')}} - - Github + GitHub
© Copyright {{env('VERSION_RELYEAR')}} diff --git a/tests/LinkControllerTest.php b/tests/LinkControllerTest.php index d04c66d85..5ae1a964a 100644 --- a/tests/LinkControllerTest.php +++ b/tests/LinkControllerTest.php @@ -8,7 +8,7 @@ class LinkControllerTest extends TestCase * @return void */ public function testRequestGetNotExistShortUrl() { - $response = $this->call('GET', '/notexist'); + $response = $this->call('GET', '/nonexistent'); $this->assertTrue($response->isRedirection()); $this->assertRedirectedTo(env('SETTING_INDEX_REDIRECT')); } diff --git a/util/version.py b/util/version.py index 18d133ec7..300c1f1ad 100644 --- a/util/version.py +++ b/util/version.py @@ -20,7 +20,7 @@ setup_env_lines = re.sub(r'(?is)VERSION_RELDAY=\w+', 'VERSION_RELDAY={}'.format(now.day), setup_env_lines) setup_env_lines = re.sub(r'(?is)VERSION_RELYEAR=\w+', 'VERSION_RELYEAR={}'.format(now.year), setup_env_lines) - # Overwite existing file + # Overwrite existing file setup_env.seek(0) setup_env.write(setup_env_lines) setup_env.truncate()