chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 14 Wiki Activity

Make Reporting admin section translatable (#1549)

Browse source 
* 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>
This commit is contained in:
Thomas Citharel 2017-04-12 17:11:49 +02:00 • committed by Eugen
commit d90d23699c
15 changed files with 192 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/views/user_mailer/confirmation_instructions.en.text.erb
View file

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