diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2017-04-12 17:11:49 +0200 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-12 17:11:49 +0200 |
| commit | d90d23699ca611f05d8def40109505251507fa46 (patch) | |
| tree | e3ffdab55a7d5f5456732d03b827ee2bd140f896 /app/views/user_mailer | |
| parent | 1f5ff46fd92f679cdb548c93c47920786f2dcc33 (diff) | |
Make Reporting admin section translatable (#1549)
* Make Reporting admin section translatable And translate it into english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make subject of emails translatable and improve french translation Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make error pages translatable and translate them in english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate site setting section * Insert instance in registration emails and improve them a bit Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Diffstat (limited to 'app/views/user_mailer')
4 files changed, 42 insertions, 10 deletions
diff --git a/app/views/user_mailer/confirmation_instructions.en.html.erb b/app/views/user_mailer/confirmation_instructions.en.html.erb index 69e9ff80f..f28a38be2 100644 --- a/app/views/user_mailer/confirmation_instructions.en.html.erb +++ b/app/views/user_mailer/confirmation_instructions.en.html.erb @@ -1,5 +1,12 @@ -<p>Welcome <%= @resource.email %>!</p> +<p>Welcome <%= @resource.email %> !</p> -<p>You can confirm your Mastodon account email through the link below:</p> +<p>You just created an account on <%= @instance %>.</p> -<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p> +<p>To confirm your inscription, please click on the following link : <br> +<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %> + +<p>Please also check out our <%= link_to 'terms and conditions', terms_url %>.</p> + +<p>Sincerely,<p> + +<p>The <%= @instance %> team</p> \ No newline at end of file diff --git a/app/views/user_mailer/confirmation_instructions.en.text.erb b/app/views/user_mailer/confirmation_instructions.en.text.erb index bb21cf8e2..0419adef0 100644 --- a/app/views/user_mailer/confirmation_instructions.en.text.erb +++ b/app/views/user_mailer/confirmation_instructions.en.text.erb @@ -1,5 +1,12 @@ -Welcome <%= @resource.email %>! +Welcome <%= @resource.email %> ! -You can confirm your Mastodon account email through the link below: +You just created an account on <%= @instance %>. +To confirm your inscription, please click on the following link : <%= confirmation_url(@resource, confirmation_token: @token) %> + +Please also check out our terms and conditions <%= terms_url %> + +Sincerely, + +The <%= @instance %> team \ No newline at end of file diff --git a/app/views/user_mailer/confirmation_instructions.fr.html.erb b/app/views/user_mailer/confirmation_instructions.fr.html.erb index 6c45f1a21..b0b3d0f51 100644 --- a/app/views/user_mailer/confirmation_instructions.fr.html.erb +++ b/app/views/user_mailer/confirmation_instructions.fr.html.erb @@ -1,5 +1,14 @@ -<p>Bienvenue <%= @resource.email %> !</p> +<p>Bonjour <%= @resource.email %> !<p> -<p>Vous pouvez confirmer le courriel de votre compte Mastodon en cliquant sur le lien ci-dessous :</p> +<p>Vous venez de vous créer un compte sur <%= @instance %> et nous vous en remercions :)</p> -<p><%= link_to 'Confirmer mon compte', confirmation_url(@resource, confirmation_token: @token) %></p> +<p>Pour confirmer votre inscription, merci de cliquer sur le lien suivant : <br> +<%= link_to 'Confirmer mon compte', confirmation_url(@resource, confirmation_token: @token) %></p> + +<p>Après votre première connexion, vous pourrez accéder à la documentation de l'outil.</p> + +<p>Pensez également à jeter un œil à nos <%= link_to 'conditions d\'utilisation', terms_url %>.</p> + +<p>Amicalement,</p> + +<p>L'équipe <%= @instance %></p> \ No newline at end of file diff --git a/app/views/user_mailer/confirmation_instructions.fr.text.erb b/app/views/user_mailer/confirmation_instructions.fr.text.erb index dfa3f9f7c..cf8e39689 100644 --- a/app/views/user_mailer/confirmation_instructions.fr.text.erb +++ b/app/views/user_mailer/confirmation_instructions.fr.text.erb @@ -1,5 +1,14 @@ -Bienvenue <%= @resource.email %> ! +Bonjour <%= @resource.email %> ! -Vous pouvez confirmer le courriel de votre compte Mastodon en cliquant sur le lien ci-dessous : +Vous venez de vous créer un compte sur <%= @instance %> et nous vous en remercions. +Pour confirmer votre inscription, merci de cliquer sur le lien suivant : <%= confirmation_url(@resource, confirmation_token: @token) %> + +Après votre première connexion, vous pourrez accéder à la documentation de l'outil. + +Pour rappel, nos conditions d'utilisation sont indiquées ici <%= terms_url %> + +Amicalement, + +L'équipe <%= @instance %> \ No newline at end of file |