Email notifications are now translatable

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_1')}}
+    {{ 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_body_2_html')|raw }}
+    {{ trans('email.access_token_created_explanation_html')|raw }}
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.access_token_created_body_3', {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_1')}}
+{{ trans('email.access_token_created_body')|raw  }}
 
-{{ trans('email.access_token_created_body_2_text')}}
+{{ trans('email.access_token_created_explanation_text')|raw }}
 
-{{ trans('email.access_token_created_body_3', {url: route('profile.index') })}}
+{{ trans('email.access_token_created_revoke', {url: route('profile.index') })|raw }}
 {% include 'emails.footer-text' %}

resources/views/v1/emails/admin-test-text.twig

@@ -1,3 +1,3 @@
 {% include 'emails.header-text' %}
-    {{ trans('email.admin_test_body', {email: email })}}
+{{ trans('email.admin_test_body', {email: email })|raw }}
 {% include 'emails.footer-text' %}

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

@@ -1,10 +1,10 @@
 {% include 'emails.header-text' %}
-{{ trans('email.email_change_body_to_new')}}
+{{ trans('email.email_change_body_to_new')|raw }}
 
-{{trans('email.email_change_old')}} {{ oldEmail }}
+{{trans('email.email_change_old')|raw }} {{ oldEmail }}
 
-{{trans('email.email_change_new')}} {{ newEmail }}
+{{trans('email.email_change_new')|raw }} {{ newEmail }}
 
-{{ trans('email.email_change_instructions')}}
+{{ trans('email.email_change_instructions')|raw }}
 {{ uri }}
 {% include 'emails.footer-text' %}

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_html', { version: version, errorMessage: errorMessage })|raw }}
+    {{ trans('email.error_intro', { version: version }) }} <span style="font-family: monospace;">{{ errorMessage }}</span>.
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
@@ -13,12 +13,12 @@
 </p>
 
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {{ trans('email.error_location_html', { file: file, line: line, code: code })|raw }}
+    {{ trans('email.error_location', { file: "<span style=\"font-family: monospace;\">#{ file }</span>", 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_html', { id: user.id, email: user.email })|raw }}
+        {{ trans('email.error_user', { id: user.id, email: "<a href=\"mailto::email\">#{ user.email }</a>" })|raw }}
     {% else %}
         {{ trans('email.error_no_user') }}
     {% endif %}
@@ -26,7 +26,7 @@
 
 <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_url') }} {{ url }}<br />
     {{ trans('email.error_user_agent') }} {{ userAgent }}
 </p>
 

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

@@ -1,31 +1,27 @@
 {% include 'emails.header-text' %}
-Firefly III v{{ version }} ran into an error: {{ errorMessage }}.
+{{ trans('email.error_intro', { version: version })|raw }} {{ errorMessage }}.
 
-The error was of type "{{ class }}".
+{{ trans('email.error_type', {class: class })|raw }}
 
-The error occurred on/at: {{ time }}.
+{{ trans('email.error_timestamp', {time: time })|raw }}
 
-This error occurred in file "{{ file }}" on line {{ line }} with code {{ code }}.
+{{ trans('email.error_location', { file: file , line: line, code: code })|raw }}
 
 {% if loggedIn %}
-    The error was encountered by user #{{ user.id }}, {{ user.email }}.
+{{     trans('email.error_user', { id: user.id, email: user.email })|raw }}
 {% else %}
-    There was no user logged in for this error or no user was detected.
+{{     trans('email.error_no_user')|raw }}
 {% endif %}
 
-The IP address related to this error is: {{ ip }}
-URL is: {{ url }}
-User agent: {{ userAgent }}
+{{ trans('email.error_ip')|raw }} {{ ip }}
+{{ trans('email.error_url')|raw }} {{ url }}
+{{ trans('email.error_user_agent')|raw }} {{ userAgent }}
 
-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.
+{{ trans('email.error_stacktrace', { email: 'james@firefly-iii.org' })|raw }}
 
-If you prefer, you can also open a new issue here:
+{{ trans('email.error_github', { link: 'https://github.com/firefly-iii/firefly-iii/issues' })|raw }}
 
-https://github.com/firefly-iii/firefly-iii/issues
-
-The full stacktrace is below:
+{{ trans('email.error_stacktrace_below')|raw }}
 
 {{ stackTrace }}
 {% include 'emails.footer-text' %}

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

@@ -1,6 +1,6 @@
 
-{{ trans('email.closing') }}
+{{ trans('email.closing')|raw }}
 
-{{ trans('email.signature') }}
+{{ trans('email.signature')|raw }}
 
-{{ trans('email.footer_ps', {ipAddress: ipAddress}) }}
+{{ trans('email.footer_ps', {ipAddress: ipAddress})|raw }}

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

@@ -1 +1,2 @@
-{{ trans('email.greeting') }}
+{{ trans('email.greeting')|raw }}
+

resources/views/v1/emails/oauth-client-created-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.oauth_created_body_html', { name:client.name, url:client.redirect})|raw }}
+    {{ trans('email.oauth_created_body', { name:client.name, url: "<span style=\"font-family: monospace;\">" ~ client.redirect ~ "</span>"})|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,9 +1,7 @@
 {% include 'emails.header-text' %}
-{{ trans('email.oauth_created_body_text', {name:  client.name }) }}
+{{ trans('email.oauth_created_body', {name:  client.name, url: client.redirect })|raw }}
 
-{{ client.redirect }}
+{{ trans('email.oauth_created_explanation_text')|raw }}
 
-{{ trans('email.oauth_created_explanation_text') }}
-
-{{ trans('email.oauth_created_undo') }}
+{{ trans('email.oauth_created_undo', { url:route('profile.index')})|raw }}
 {% include 'emails.footer-text' %}

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

@@ -1,7 +1,7 @@
 {% include 'emails.header-text' %}
-{{ trans('email.reset_pw_instructions') }}
+{{ trans('email.reset_pw_instructions')|raw }}
 
-{{ trans('email.reset_pw_warning_text') }}
+{{ trans('email.reset_pw_warning_text')|raw }}
 
 {{ url }}
 {% include 'emails.footer-text' %}

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

@@ -1,16 +1,17 @@
 {% include 'emails.header-text' %}
-{{ trans('email.registered_welcome_text')}}
 
-* {{ trans('email.registered_pw_text')}}
-* {{ trans('email.registered_help')}}
-* {{ trans('email.registered_doc_text')}}
+{{ trans('email.registered_welcome_text')|raw }}
 
-{{ trans('email.registered_closing')}}
+* {{ trans('email.registered_pw_text')|raw }}
+* {{ trans('email.registered_help')|raw }}
+* {{ trans('email.registered_doc_text')|raw }}
 
-{{ trans('email.registered_firefly_iii_link')}}
+{{ trans('email.registered_closing')|raw }}
+
+{{ trans('email.registered_firefly_iii_link')|raw }}
 {{ address }}
 
-{{ trans('email.registered_pw_reset_link')}}
+{{ trans('email.registered_pw_reset_link')|raw }}
 {{ address }}/password/reset
 
 {{ trans('email.registered_doc_link')}}

resources/views/v1/emails/report-new-journals-html.twig

@@ -1,11 +1,6 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {% if transformed|length == 1 %}
-        Firefly III has created a transaction for you. You can find it in your Firefly III installation:
-    {% endif %}
-    {% if transformed|length > 1 %}
-        Firefly III has created {{ groups.count }} transactions for you. You can find them in your Firefly III installation:
-    {% endif %}
+    {{ trans_choice('email.new_journals_header', transformed|length ) }}
 </p>
 
 <!-- loop groups -->

resources/views/v1/emails/report-new-journals-text.twig

@@ -1,6 +1,5 @@
 {% include 'emails.header-text' %}
-{% if transformed|length == 1 %}Firefly III has created a transaction for you. You can find it in your Firefly III installation:{% endif %}
-{% if transformed|length > 1 %}Firefly III has created {{ groups.count }} transactions for you. You can find them in your Firefly III installation:{% endif %}
+{{ trans_choice('email.new_journals_header', transformed|length )|raw }}
 
 
 {% for group in transformed %}

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')}}
+{{ trans('email.email_change_body_to_old_text')|raw }}
 
-{{ trans('email.email_change_ignore')}}
+{{ trans('email.email_change_ignore')|raw }}
 
-{{trans('email.email_change_old')}} {{ oldEmail }}
+{{trans('email.email_change_old')|raw }} {{ oldEmail }}
 
-{{trans('email.email_change_new')}} {{ newEmail }}
+{{trans('email.email_change_new')|raw }} {{ newEmail }}
 
-{{ trans('email.email_change_undo_link')}} {{ uri }}
+{{ trans('email.email_change_undo_link')|raw }} {{ uri }}
 {% include 'emails.footer-text' %}