IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-24 23:36:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3390 from sephrat/master

Browse Source 
Fix typos and minor text inconsistency
This commit is contained in:
James Cole 2020-05-24 09:19:02 +00:00 committed by GitHub
commit ae7b81bf86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/v1/js/ff/import/status.js
View File

@ -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);
}
}
}
}

4
resources/lang/en_US/firefly.php
View File

@ -488,9 +488,9 @@ return [
'rule_action_update_piggy' => 'Add/remove transaction amount in piggy bank ":action_value"',
'rule_action_append_description_choice' => 'Append description with..',
'rule_action_prepend_description_choice' => 'Prepend description with..',
'rule_action_set_source_account_choice' => 'Set source account to...',
'rule_action_set_source_account_choice' => 'Set source account to..',
'rule_action_set_source_account' => 'Set source account to :action_value',
'rule_action_set_destination_account_choice' => 'Set destination account to...',
'rule_action_set_destination_account_choice' => 'Set destination account to..',
'rule_action_set_destination_account' => 'Set destination account to :action_value',
'rule_action_append_notes_choice' => 'Append notes with..',
'rule_action_append_notes' => 'Append notes with ":action_value"',

2
resources/views/v1/emails/confirm-email-change-html.twig
View File

@ -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.
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The old email addres was: {{ oldEmail }}
The old email address was: {{ oldEmail }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The new email address is: <strong>{{ newEmail }}</strong>

2
resources/views/v1/emails/confirm-email-change-text.twig
View File

@ -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 }}

4
resources/views/v1/emails/error-html.twig
View File

@ -8,11 +8,11 @@
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The error occured on/at: {{ time }}.
The error occurred on/at: {{ time }}.
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
This error occured in file <span style="font-family: monospace;">{{ file }}</span> on line {{ line }} with code {{ code }}.
This error occurred in file <span style="font-family: monospace;">{{ file }}</span> on line {{ line }} with code {{ code }}.
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">

4
resources/views/v1/emails/error-text.twig
View File

@ -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 }}.

2
resources/views/v1/emails/undo-email-change-html.twig
View File

@ -7,7 +7,7 @@
If you initiated this change, you may safely ignore this message.
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The old email addres was: <strong>{{ oldEmail }}</strong>
The old email address was: <strong>{{ oldEmail }}</strong>
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The new email address is: {{ newEmail }}

2
resources/views/v1/emails/undo-email-change-text.twig
View File

@ -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 }}

2
resources/views/v1/errors/FireflyException.twig
View File

@ -76,7 +76,7 @@
{% if debug %}
<div class="error-stack">
<h4>Error</h4>
<p>This error occured in file <span style="font-family: monospace;">{{ exception.getFile }}</span> on line {{ exception.getLine }} with
<p>This error occurred in file <span style="font-family: monospace;">{{ exception.getFile }}</span> on line {{ exception.getLine }} with
code {{ exception.getCode }}.</p>
<h4>Stack trace</h4>
<div style="font-family: monospace;font-size:11px;">