From d90d23699ca611f05d8def40109505251507fa46 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 12 Apr 2017 17:11:49 +0200 Subject: Make Reporting admin section translatable (#1549) * Make Reporting admin section translatable And translate it into english and french Signed-off-by: Thomas Citharel * Make subject of emails translatable and improve french translation Signed-off-by: Thomas Citharel * Make error pages translatable and translate them in english and french Signed-off-by: Thomas Citharel * Translate site setting section * Insert instance in registration emails and improve them a bit Signed-off-by: Thomas Citharel --- app/views/user_mailer/confirmation_instructions.en.text.erb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'app/views/user_mailer/confirmation_instructions.en.text.erb') 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 -- cgit