Unfloyded/Legamunt
0
0
Fork 0
Code 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
parent 1f5ff46fd9
commit d90d23699c
15 changed files with 192 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/mailers/user_mailer.rb
View file

@ -7,9 +7,10 @@ class UserMailer < Devise::Mailer
def confirmation_instructions(user, token, _opts = {})
@resource = user
@token = token
@instance = Rails.configuration.x.local_domain
I18n.with_locale(@resource.locale || I18n.default_locale) do
mail to: @resource.unconfirmed_email.blank? ? @resource.email : @resource.unconfirmed_email
mail to: @resource.unconfirmed_email.blank? ? @resource.email : @resource.unconfirmed_email, subject: I18n.t('devise.mailer.confirmation_instructions.subject', instance: @instance)
end
end
@ -18,7 +19,7 @@ class UserMailer < Devise::Mailer
@token = token
I18n.with_locale(@resource.locale || I18n.default_locale) do
mail to: @resource.email
mail to: @resource.email, subject: I18n.t('devise.mailer.reset_password_instructions.subject')
end
end
@ -26,7 +27,7 @@ class UserMailer < Devise::Mailer
@resource = user
I18n.with_locale(@resource.locale || I18n.default_locale) do
mail to: @resource.email
mail to: @resource.email, subject: I18n.t('devise.mailer.password_change.subject')
end
end
end