diff --git a/app/mailers/mailer.rb b/app/mailers/mailer.rb index 0ff7053b..78709856 100644 --- a/app/mailers/mailer.rb +++ b/app/mailers/mailer.rb @@ -81,7 +81,7 @@ class Mailer < ActionMailer::Base if args[:from].is_a? User args[:reply_to] = args[:from] unless args[:reply_to] - args[:from] = "#{show_user args[:from]} via #{I18n.t('layouts.foodsoft')} <#{FoodsoftConfig[:email_sender]}>" + args[:from] = "#{I18n.t('mailer.from_via_foodsoft', name: show_user(args[:from]))} <#{FoodsoftConfig[:email_sender]}>" end [:bcc, :cc, :reply_to, :sender, :to].each do |k| diff --git a/config/locales/de.yml b/config/locales/de.yml index 359d4fa9..4b3a7569 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1176,6 +1176,7 @@ de: feedback: header: "%{user} schrieb am %{date}:" subject: Feedback zur Foodsoft + from_via_foodsoft: "%{name} via Foodsoft" invite: subject: Einladung in die Foodcoop text: | diff --git a/config/locales/en.yml b/config/locales/en.yml index 795a538b..54537a9e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1178,6 +1178,7 @@ en: feedback: header: "%{user} wrote at %{date}:" subject: Feedback for Foodsoft + from_via_foodsoft: "%{name} via Foodsoft" invite: subject: Invitation to the Foodcoop text: | diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 005d141f..afc7f51d 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1187,6 +1187,7 @@ fr: feedback: header: 'Le %{date}, %{user} a écrit:' subject: Feedback pour Foodsoft + from_via_foodsoft: "%{name} via Foodsoft" invite: subject: Invitation à participer à une Bouffecoop text: |- diff --git a/config/locales/nl.yml b/config/locales/nl.yml index f09e0765..db67cbb8 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1170,6 +1170,7 @@ nl: feedback: header: "%{user} schreef op %{date}:" subject: Feedback voor Foodsoft + from_via_foodsoft: "%{name} via Foodsoft" invite: subject: Uitnodiging voor de foodcoop text: |-