Email translations cleanup

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 <strong>all</strong> 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 <strong>all</strong> 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 <a style="color:#337ab7" href=":address">Firefly III</a>. 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 <a style="color:#337ab7" href=":address/password/reset">the password reset tool</a>.',
-    'registered_pw_text' => 'If you have forgotten your password already, please reset it using the password reset tool.',
+    'registered_welcome' => 'Welcome to <a style="color:#337ab7" href=":address">Firefly III</a>. 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 <a style="color:#337ab7" href=":address/password/reset">the password reset tool</a>.',
     '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 <a style="color:#337ab7" href="https://docs.firefly-iii.org/about-firefly-iii/grand-theory">grand theory</a>.',
     '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 <strong>must</strong> 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 <strong>must</strong> 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: <strong>:email</strong>',
+    'email_change_new' => 'The new email address is: :email',
+    'email_change_new_strong' => 'The new email address is: <strong>:email</strong>',
     '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 <strong>all</strong> 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 <span style="font-family: monospace;">:url</span>.',
+    'oauth_created_explanation' => 'With this client, they can access <strong>all</strong> 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' => '<strong>PLEASE</strong> 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' => '<strong>PLEASE</strong> 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: <span style="font-family: monospace;">:errorMessage</span>.',
     '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 "<span style="font-family: monospace;">:file</span>" on line :line with code :code.',
+    'error_user' => 'The error was encountered by user #:id, <a href="mailto::email">:email</a>.',
     '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 <a href="mailto:james@firefly-iii.org?subject=BUG!">james@firefly-iii.org</a>. This can help fix the bug you just encountered.',
+    'error_github_html' => 'If you prefer, you can also open a new issue on <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>.',
+    '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

resources/views/v1/emails/access-token-created-html.twig

@@ -1,13 +1,13 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.access_token_created_body')}}
+    {{ trans('email.access_token_created_body') }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.access_token_created_explanation_html')|raw }}
+    {{ trans('email.access_token_created_explanation')|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.access_token_created_revoke', {url: route('profile.index') })}}
+    {{ trans('email.access_token_created_revoke', {url: route('profile.index') }) }}
 </p>
 {% include 'emails.footer-html' %}

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' %}

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

@@ -3,10 +3,10 @@
     {{ trans('email.email_change_body_to_new')}}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{trans('email.email_change_old')}} {{ oldEmail }}
+    {{trans('email.email_change_old', { email: oldEmail }) }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{trans('email.email_change_new')}} <strong>{{ newEmail }}</strong>
+    {{trans('email.email_change_new_strong', { email: newEmail })|raw }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.email_change_instructions')}}

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

resources/views/v1/emails/error-html.twig

@@ -1,6 +1,6 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.error_intro', { version: version }) }} <span style="font-family: monospace;">{{ errorMessage }}</span>.
+    {{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
@@ -13,28 +13,28 @@
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.error_location', { file: "<span style=\"font-family: monospace;\">#{ file }</span>", line: line, code: code })|raw }}
+    {{ trans('email.error_location', { file: file, line: line, code: code })|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {% if loggedIn %}
-        {{ trans('email.error_user', { id: user.id, email: "<a href=\"mailto::email\">#{ user.email }</a>" })|raw }}
+        {{ trans('email.error_user', { id: user.id, email: user.email })|raw }}
     {% else %}
         {{ trans('email.error_no_user') }}
     {% endif %}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.error_ip') }} {{ ip }}<br />
-    {{ trans('email.error_url') }} {{ url }}<br />
-    {{ trans('email.error_user_agent') }} {{ userAgent }}
+    {{ trans('email.error_ip', { ip: ip }) }}<br />
+    {{ trans('email.error_url', {url :url }) }}<br />
+    {{ trans('email.error_user_agent', {userAgent: userAgent }) }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.error_stacktrace', { email: '<a href="mailto:james@firefly-iii.org?subject=BUG!">james@firefly-iii.org</a>' })|raw }}
+    {{ trans('email.error_stacktrace')|raw }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.error_github', { link: '<a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>' })|raw }}
+    {{ trans('email.error_github_html')|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">

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' %}

resources/views/v1/emails/oauth-client-created-html.twig

@@ -1,10 +1,10 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.oauth_created_body', { name:client.name, url: "<span style=\"font-family: monospace;\">" ~ client.redirect ~ "</span>"})|raw }}
+    {{ trans('email.oauth_created_body', { name:client.name, url: client.redirect })|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.oauth_created_explanation_html')|raw }}
+    {{ trans('email.oauth_created_explanation')|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">

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' %}

resources/views/v1/emails/password-html.twig

@@ -4,7 +4,7 @@
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.reset_pw_warning_html')|raw }}
+    {{ trans('email.reset_pw_warning')|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">

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' %}

resources/views/v1/emails/registered-html.twig

@@ -1,11 +1,11 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.registered_welcome_html', {address: address})|raw }}
+    {{ trans('email.registered_welcome', {address: address})|raw }}
 </p>
 
 <ul>
     <li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-        {{ trans('email.registered_pw_html', {address: address})|raw }}
+        {{ trans('email.registered_pw', {address: address})|raw }}
     </li>
     <li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
         {{ trans('email.registered_help')}}

resources/views/v1/emails/registered-text.twig

@@ -1,8 +1,8 @@
 {% include 'emails.header-text' %}
 
-{{ trans('email.registered_welcome_text')|raw }}
+{{ trans('email.registered_welcome')|striptags|raw }}
 
-* {{ trans('email.registered_pw_text')|raw }}
+* {{ trans('email.registered_pw')|striptags|raw }}
 * {{ trans('email.registered_help')|raw }}
 * {{ trans('email.registered_doc_text')|raw }}
 

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

@@ -1,15 +1,15 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.email_change_body_to_old_html')|raw }}
+    {{ trans('email.email_change_body_to_old')|raw }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{ trans('email.email_change_ignore') }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{trans('email.email_change_old')}} <strong>{{ oldEmail }}</strong>
+    {{trans('email.email_change_old_strong', { email: oldEmail })|raw }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{trans('email.email_change_new')}} {{ newEmail }}
+    {{trans('email.email_change_new', { email: newEmail }) }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     {{trans('email.email_change_undo_link')}} <a href="{{ uri }}">{{ uri }}</a>

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

@@ -1,11 +1,11 @@
 {% include 'emails.header-text' %}
-{{ trans('email.email_change_body_to_old_text')|raw }}
+{{ trans('email.email_change_body_to_old')|striptags|raw }}
 
 {{ trans('email.email_change_ignore')|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_undo_link')|raw }} {{ uri }}
 {% include 'emails.footer-text' %}