From 6c6bb2cd1e61e3980110d6c6a2c112f65f4cc014 Mon Sep 17 00:00:00 2001 From: Florian Dupret Date: Wed, 27 May 2020 09:34:52 +0200 Subject: [PATCH] Email translations cleanup --- resources/lang/en_US/email.php | 44 +++++++++---------- .../v1/emails/access-token-created-html.twig | 6 +-- .../v1/emails/access-token-created-text.twig | 4 +- .../v1/emails/confirm-email-change-html.twig | 4 +- .../v1/emails/confirm-email-change-text.twig | 4 +- resources/views/v1/emails/error-html.twig | 16 +++---- resources/views/v1/emails/error-text.twig | 18 ++++---- .../v1/emails/oauth-client-created-html.twig | 4 +- .../v1/emails/oauth-client-created-text.twig | 4 +- resources/views/v1/emails/password-html.twig | 2 +- resources/views/v1/emails/password-text.twig | 2 +- .../views/v1/emails/registered-html.twig | 4 +- .../views/v1/emails/registered-text.twig | 4 +- .../v1/emails/undo-email-change-html.twig | 6 +-- .../v1/emails/undo-email-change-text.twig | 6 +-- 15 files changed, 62 insertions(+), 66 deletions(-) diff --git a/resources/lang/en_US/email.php b/resources/lang/en_US/email.php index add1b6cbad..872c37cc00 100644 --- a/resources/lang/en_US/email.php +++ b/resources/lang/en_US/email.php @@ -36,16 +36,13 @@ return [ // access token created 'access_token_created_subject' => 'A new access token was created', 'access_token_created_body' => 'Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.', - 'access_token_created_explanation_html' => 'With this token, they can access all of your financial records through the Firefly III API.', - 'access_token_created_explanation_text' => 'With this token, they can access *all* of your financial records through the Firefly III API.', + 'access_token_created_explanation' => 'With this token, they can access all of your financial records through the Firefly III API.', 'access_token_created_revoke' => 'If this wasn\'t you, please revoke this token as soon as possible at :url.', // registered 'registered_subject' => 'Welcome to Firefly III!', - 'registered_welcome_html' => 'Welcome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay!', - 'registered_welcome_text' => 'Welcome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay!', - 'registered_pw_html' => 'If you have forgotten your password already, please reset it using the password reset tool.', - 'registered_pw_text' => 'If you have forgotten your password already, please reset it using the password reset tool.', + 'registered_welcome' => 'Welcome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay!', + 'registered_pw' => 'If you have forgotten your password already, please reset it using the password reset tool.', 'registered_help' => 'There is a help-icon in the top right corner of each page. If you need help, click it!', 'registered_doc_html' => 'If you haven\'t already, please read the grand theory.', 'registered_doc_text' => 'If you haven\'t already, please read the first use guide and the full description.', @@ -57,41 +54,40 @@ return [ // email change 'email_change_subject' => 'Your Firefly III email address has changed', 'email_change_body_to_new' => '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.', - 'email_change_body_to_old_html' => 'You or somebody with access to your Firefly III account has changed your email address. - If you did not expect this to happen, you must follow the "undo"-link below to protect your account!', - 'email_change_body_to_old_text' => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this to happen, you *must* follow the "undo"-link below to protect your account!', + 'email_change_body_to_old' => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this to happen, you must follow the "undo"-link below to protect your account!', 'email_change_ignore' => 'If you initiated this change, you may safely ignore this message.', - 'email_change_old' => 'The old email address was:', - 'email_change_new' => 'The new email address is:', + 'email_change_old' => 'The old email address was: :email', + 'email_change_old_strong' => 'The old email address was: :email', + 'email_change_new' => 'The new email address is: :email', + 'email_change_new_strong' => 'The new email address is: :email', 'email_change_instructions' => 'You cannot use Firefly III until you confirm this change. Please follow the link below to do so.', 'email_change_undo_link' => 'To undo the change, follow this link:', // OAuth token created 'oauth_created_subject' => 'A new OAuth client has been created', - 'oauth_created_body' => 'Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It\'s labeled ":name" and has callback URL :url.', - 'oauth_created_explanation_html' => 'With this client, they can access all of your financial records through the Firefly III API.', - 'oauth_created_explanation_text' => 'With this client, they can access *all* of your financial records through the Firefly III API.', + 'oauth_created_body' => 'Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It\'s labeled ":name" and has callback URL :url.', + 'oauth_created_explanation' => 'With this client, they can access all of your financial records through the Firefly III API.', 'oauth_created_undo' => 'If this wasn\'t you, please revoke this client as soon as possible at :url.', // reset password 'reset_pw_subject' => 'Your password reset request', 'reset_pw_instructions' => 'Somebody tried to reset your password. If it was you, please follow the link below to do so.', - 'reset_pw_warning_html' => 'PLEASE verify that the link actually goes to the Firefly III you expect it to go!', - 'reset_pw_warning_text' => '*PLEASE* verify that the link actually goes to the Firefly III you expect it to go!', + 'reset_pw_warning' => 'PLEASE verify that the link actually goes to the Firefly III you expect it to go!', // error 'error_subject' => 'Caught an error in Firefly III', - 'error_intro' => 'Firefly III v:version ran into an error:', + 'error_intro' => 'Firefly III v:version ran into an error: :errorMessage.', 'error_type' => 'The error was of type ":class".', 'error_timestamp' => 'The error occurred on/at: :time.', - 'error_location' => 'This error occurred in file ":file" on line :line with code :code.', - 'error_user' => 'The error was encountered by user #:id, :email.', + 'error_location' => 'This error occurred in file ":file" on line :line with code :code.', + 'error_user' => 'The error was encountered by user #:id, :email.', 'error_no_user' => 'There was no user logged in for this error or no user was detected.', - 'error_ip' => 'The IP address related to this error is:', - 'error_url' => 'URL is:', - 'error_user_agent' => 'User agent:', - 'error_stacktrace' => 'The full stacktrace is below. If you think this is a bug in Firefly III, you can forward this message to :email. This can help fix the bug you just encountered.', - 'error_github' => 'If you prefer, you can also open a new issue on :link.', + 'error_ip' => 'The IP address related to this error is: :ip', + 'error_url' => 'URL is: :url', + 'error_user_agent' => 'User agent: :userAgent', + 'error_stacktrace' => 'The full stacktrace is below. If you think this is a bug in Firefly III, you can forward this message to james@firefly-iii.org. This can help fix the bug you just encountered.', + 'error_github_html' => 'If you prefer, you can also open a new issue on GitHub.', + 'error_github_text' => 'If you prefer, you can also open a new issue on https://github.com/firefly-iii/firefly-iii/issues.', 'error_stacktrace_below' => 'The full stacktrace is below:', // report new journals diff --git a/resources/views/v1/emails/access-token-created-html.twig b/resources/views/v1/emails/access-token-created-html.twig index d20aecd79e..ede3a2f044 100644 --- a/resources/views/v1/emails/access-token-created-html.twig +++ b/resources/views/v1/emails/access-token-created-html.twig @@ -1,13 +1,13 @@ {% include 'emails.header-html' %}

- {{ trans('email.access_token_created_body')}} + {{ trans('email.access_token_created_body') }}

- {{ trans('email.access_token_created_explanation_html')|raw }} + {{ trans('email.access_token_created_explanation')|raw }}

- {{ trans('email.access_token_created_revoke', {url: route('profile.index') })}} + {{ trans('email.access_token_created_revoke', {url: route('profile.index') }) }}

{% include 'emails.footer-html' %} diff --git a/resources/views/v1/emails/access-token-created-text.twig b/resources/views/v1/emails/access-token-created-text.twig index ccb5b37408..04d85cdf35 100644 --- a/resources/views/v1/emails/access-token-created-text.twig +++ b/resources/views/v1/emails/access-token-created-text.twig @@ -1,7 +1,7 @@ {% include 'emails.header-text' %} -{{ trans('email.access_token_created_body')|raw }} +{{ trans('email.access_token_created_body')|raw }} -{{ trans('email.access_token_created_explanation_text')|raw }} +{{ trans('email.access_token_created_explanation')|striptags|raw }} {{ trans('email.access_token_created_revoke', {url: route('profile.index') })|raw }} {% include 'emails.footer-text' %} diff --git a/resources/views/v1/emails/confirm-email-change-html.twig b/resources/views/v1/emails/confirm-email-change-html.twig index cc494344f2..7eb907c421 100644 --- a/resources/views/v1/emails/confirm-email-change-html.twig +++ b/resources/views/v1/emails/confirm-email-change-html.twig @@ -3,10 +3,10 @@ {{ trans('email.email_change_body_to_new')}}

- {{trans('email.email_change_old')}} {{ oldEmail }} + {{trans('email.email_change_old', { email: oldEmail }) }}

- {{trans('email.email_change_new')}} {{ newEmail }} + {{trans('email.email_change_new_strong', { email: newEmail })|raw }}

{{ trans('email.email_change_instructions')}} diff --git a/resources/views/v1/emails/confirm-email-change-text.twig b/resources/views/v1/emails/confirm-email-change-text.twig index 7392c89a99..1fd8695814 100644 --- a/resources/views/v1/emails/confirm-email-change-text.twig +++ b/resources/views/v1/emails/confirm-email-change-text.twig @@ -1,9 +1,9 @@ {% include 'emails.header-text' %} {{ trans('email.email_change_body_to_new')|raw }} -{{trans('email.email_change_old')|raw }} {{ oldEmail }} +{{trans('email.email_change_old', { email: oldEmail })|raw }} -{{trans('email.email_change_new')|raw }} {{ newEmail }} +{{trans('email.email_change_new', { email: newEmail })|raw }} {{ trans('email.email_change_instructions')|raw }} {{ uri }} diff --git a/resources/views/v1/emails/error-html.twig b/resources/views/v1/emails/error-html.twig index 792f1caba0..d90bc67879 100644 --- a/resources/views/v1/emails/error-html.twig +++ b/resources/views/v1/emails/error-html.twig @@ -1,6 +1,6 @@ {% include 'emails.header-html' %}

- {{ trans('email.error_intro', { version: version }) }} {{ errorMessage }}. + {{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|raw }}

@@ -13,28 +13,28 @@

- {{ trans('email.error_location', { file: "#{ file }", line: line, code: code })|raw }} + {{ trans('email.error_location', { file: file, line: line, code: code })|raw }}

{% if loggedIn %} - {{ trans('email.error_user', { id: user.id, email: "#{ user.email }" })|raw }} + {{ trans('email.error_user', { id: user.id, email: user.email })|raw }} {% else %} {{ trans('email.error_no_user') }} {% endif %}

- {{ trans('email.error_ip') }} {{ ip }}
- {{ trans('email.error_url') }} {{ url }}
- {{ trans('email.error_user_agent') }} {{ userAgent }} + {{ trans('email.error_ip', { ip: ip }) }}
+ {{ trans('email.error_url', {url :url }) }}
+ {{ trans('email.error_user_agent', {userAgent: userAgent }) }}

- {{ trans('email.error_stacktrace', { email: 'james@firefly-iii.org' })|raw }} + {{ trans('email.error_stacktrace')|raw }}

- {{ trans('email.error_github', { link: 'GitHub' })|raw }} + {{ trans('email.error_github_html')|raw }}

diff --git a/resources/views/v1/emails/error-text.twig b/resources/views/v1/emails/error-text.twig index 83c11026f8..35e4a46334 100644 --- a/resources/views/v1/emails/error-text.twig +++ b/resources/views/v1/emails/error-text.twig @@ -1,27 +1,27 @@ {% include 'emails.header-text' %} -{{ trans('email.error_intro', { version: version })|raw }} {{ errorMessage }}. +{{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|striptags|raw }} {{ trans('email.error_type', {class: class })|raw }} {{ trans('email.error_timestamp', {time: time })|raw }} -{{ trans('email.error_location', { file: file , line: line, code: code })|raw }} +{{ trans('email.error_location', { file: file , line: line, code: code })|striptags|raw }} {% if loggedIn %} -{{ trans('email.error_user', { id: user.id, email: user.email })|raw }} +{{ trans('email.error_user', { id: user.id, email: user.email })|striptags|raw }} {% else %} {{ trans('email.error_no_user')|raw }} {% endif %} -{{ trans('email.error_ip')|raw }} {{ ip }} -{{ trans('email.error_url')|raw }} {{ url }} -{{ trans('email.error_user_agent')|raw }} {{ userAgent }} +{{ trans('email.error_ip', { ip: ip }) }} +{{ trans('email.error_url', {url :url}) }} +{{ trans('email.error_user_agent', {userAgent: userAgent } ) }} -{{ trans('email.error_stacktrace', { email: 'james@firefly-iii.org' })|raw }} +{{ trans('email.error_stacktrace')|striptags|raw }} -{{ trans('email.error_github', { link: 'https://github.com/firefly-iii/firefly-iii/issues' })|raw }} +{{ trans('email.error_github_text' )|raw }} {{ trans('email.error_stacktrace_below')|raw }} -{{ stackTrace }} +{{ stackTrace|raw }} {% include 'emails.footer-text' %} diff --git a/resources/views/v1/emails/oauth-client-created-html.twig b/resources/views/v1/emails/oauth-client-created-html.twig index 9be04c0e1b..03906957f1 100644 --- a/resources/views/v1/emails/oauth-client-created-html.twig +++ b/resources/views/v1/emails/oauth-client-created-html.twig @@ -1,10 +1,10 @@ {% include 'emails.header-html' %}

- {{ trans('email.oauth_created_body', { name:client.name, url: "" ~ client.redirect ~ ""})|raw }} + {{ trans('email.oauth_created_body', { name:client.name, url: client.redirect })|raw }}

- {{ trans('email.oauth_created_explanation_html')|raw }} + {{ trans('email.oauth_created_explanation')|raw }}

diff --git a/resources/views/v1/emails/oauth-client-created-text.twig b/resources/views/v1/emails/oauth-client-created-text.twig index 4edf653de8..566f2ad89b 100644 --- a/resources/views/v1/emails/oauth-client-created-text.twig +++ b/resources/views/v1/emails/oauth-client-created-text.twig @@ -1,7 +1,7 @@ {% include 'emails.header-text' %} -{{ trans('email.oauth_created_body', {name: client.name, url: client.redirect })|raw }} +{{ trans('email.oauth_created_body', {name: client.name, url: client.redirect })|striptags|raw }} -{{ trans('email.oauth_created_explanation_text')|raw }} +{{ trans('email.oauth_created_explanation')|striptags|raw }} {{ trans('email.oauth_created_undo', { url:route('profile.index')})|raw }} {% include 'emails.footer-text' %} diff --git a/resources/views/v1/emails/password-html.twig b/resources/views/v1/emails/password-html.twig index 28c07eacd2..2f020fb924 100644 --- a/resources/views/v1/emails/password-html.twig +++ b/resources/views/v1/emails/password-html.twig @@ -4,7 +4,7 @@

- {{ trans('email.reset_pw_warning_html')|raw }} + {{ trans('email.reset_pw_warning')|raw }}

diff --git a/resources/views/v1/emails/password-text.twig b/resources/views/v1/emails/password-text.twig index d184d5cf94..258521ea99 100644 --- a/resources/views/v1/emails/password-text.twig +++ b/resources/views/v1/emails/password-text.twig @@ -1,7 +1,7 @@ {% include 'emails.header-text' %} {{ trans('email.reset_pw_instructions')|raw }} -{{ trans('email.reset_pw_warning_text')|raw }} +{{ trans('email.reset_pw_warning')|striptags|raw }} {{ url }} {% include 'emails.footer-text' %} diff --git a/resources/views/v1/emails/registered-html.twig b/resources/views/v1/emails/registered-html.twig index 3bd9b14dcd..78d8b1052e 100644 --- a/resources/views/v1/emails/registered-html.twig +++ b/resources/views/v1/emails/registered-html.twig @@ -1,11 +1,11 @@ {% include 'emails.header-html' %}

- {{ trans('email.registered_welcome_html', {address: address})|raw }} + {{ trans('email.registered_welcome', {address: address})|raw }}