From 2c9ac0982a91d03c437e55b15a6a8e003d8cc95a Mon Sep 17 00:00:00 2001 From: Florian Dupret Date: Sun, 24 May 2020 09:59:34 +0200 Subject: [PATCH] Fix minor typos --- public/v1/js/ff/import/status.js | 6 +++--- resources/views/v1/emails/confirm-email-change-html.twig | 2 +- resources/views/v1/emails/confirm-email-change-text.twig | 2 +- resources/views/v1/emails/error-html.twig | 4 ++-- resources/views/v1/emails/error-text.twig | 4 ++-- resources/views/v1/emails/undo-email-change-html.twig | 2 +- resources/views/v1/emails/undo-email-change-text.twig | 2 +- resources/views/v1/errors/FireflyException.twig | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/public/v1/js/ff/import/status.js b/public/v1/js/ff/import/status.js index 911a84063e..cb36bb8d89 100644 --- a/public/v1/js/ff/import/status.js +++ b/public/v1/js/ff/import/status.js @@ -282,10 +282,10 @@ function reportOnErrors(data) { if (data.errors.length === 1) { $('#import-status-error-intro').text(langImportSingleError); - //'An error has occured during the import. The import can continue, however.' + //'An error has occurred during the import. The import can continue, however.' } if (data.errors.length > 1) { - // 'Errors have occured during the import. The import can continue, however.' + // 'Errors have occurred during the import. The import can continue, however.' $('#import-status-error-intro').text(langImportMultiError); } $('.info_errors').show(); @@ -298,4 +298,4 @@ function reportOnErrors(data) { $('#import-status-error-list').append(item); } } -} \ No newline at end of file +} diff --git a/resources/views/v1/emails/confirm-email-change-html.twig b/resources/views/v1/emails/confirm-email-change-html.twig index aa946b88ea..0a5091e505 100644 --- a/resources/views/v1/emails/confirm-email-change-html.twig +++ b/resources/views/v1/emails/confirm-email-change-html.twig @@ -3,7 +3,7 @@ You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it.

- The old email addres was: {{ oldEmail }} + The old email address was: {{ oldEmail }}

The new email address is: {{ newEmail }} diff --git a/resources/views/v1/emails/confirm-email-change-text.twig b/resources/views/v1/emails/confirm-email-change-text.twig index cea4fd7c08..c2ddf3600a 100644 --- a/resources/views/v1/emails/confirm-email-change-text.twig +++ b/resources/views/v1/emails/confirm-email-change-text.twig @@ -1,7 +1,7 @@ {% include 'emails.header-text' %} You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it. -The old email addres was: {{ oldEmail }} +The old email address was: {{ oldEmail }} The new email address is: {{ newEmail }} diff --git a/resources/views/v1/emails/error-html.twig b/resources/views/v1/emails/error-html.twig index 402f5e0784..2017bad70a 100644 --- a/resources/views/v1/emails/error-html.twig +++ b/resources/views/v1/emails/error-html.twig @@ -8,11 +8,11 @@

- The error occured on/at: {{ time }}. + The error occurred on/at: {{ time }}.

- This error occured in file {{ file }} on line {{ line }} with code {{ code }}. + This error occurred in file {{ file }} on line {{ line }} with code {{ code }}.

diff --git a/resources/views/v1/emails/error-text.twig b/resources/views/v1/emails/error-text.twig index 4942b102ee..18df8c3696 100644 --- a/resources/views/v1/emails/error-text.twig +++ b/resources/views/v1/emails/error-text.twig @@ -3,9 +3,9 @@ Firefly III v{{ version }} ran into an error: {{ errorMessage }}. The error was of type "{{ class }}". -The error occured on/at: {{ time }}. +The error occurred on/at: {{ time }}. -This error occured in file "{{ file }}" on line {{ line }} with code {{ code }}. +This error occurred in file "{{ file }}" on line {{ line }} with code {{ code }}. {% if loggedIn %} The error was encountered by user #{{ user.id }}, {{ user.email }}. diff --git a/resources/views/v1/emails/undo-email-change-html.twig b/resources/views/v1/emails/undo-email-change-html.twig index 8d6021ee64..4f849ccc19 100644 --- a/resources/views/v1/emails/undo-email-change-html.twig +++ b/resources/views/v1/emails/undo-email-change-html.twig @@ -7,7 +7,7 @@ If you initiated this change, you may safely ignore this message.

- The old email addres was: {{ oldEmail }} + The old email address was: {{ oldEmail }}

The new email address is: {{ newEmail }} diff --git a/resources/views/v1/emails/undo-email-change-text.twig b/resources/views/v1/emails/undo-email-change-text.twig index 8bf398ca95..1ef2042ba4 100644 --- a/resources/views/v1/emails/undo-email-change-text.twig +++ b/resources/views/v1/emails/undo-email-change-text.twig @@ -4,7 +4,7 @@ you must follow the "undo"-link below to protect your account! If you initiated this change, you may safely ignore this message. -The old email addres was: {{ oldEmail }} +The old email address was: {{ oldEmail }} The new email address is: {{ newEmail }} diff --git a/resources/views/v1/errors/FireflyException.twig b/resources/views/v1/errors/FireflyException.twig index 50ce52bc2a..106cf8b11a 100644 --- a/resources/views/v1/errors/FireflyException.twig +++ b/resources/views/v1/errors/FireflyException.twig @@ -76,7 +76,7 @@ {% if debug %}

Error

-

This error occured in file {{ exception.getFile }} on line {{ exception.getLine }} with +

This error occurred in file {{ exception.getFile }} on line {{ exception.getLine }} with code {{ exception.getCode }}.

Stack trace