diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-28 16:22:28 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-28 16:22:28 +0200 |
| commit | f313bf3e97ddd83e7847ae00f5bdb488942c943c (patch) | |
| tree | 5035b4504d35a85cb0b2fcbc65ce57ed5d0de71d /config | |
| parent | a4e1830b5f15118bf2532401005376a0c6e896e6 (diff) | |
| parent | 30658924a80434e6a2bceb61267b911ea8d37898 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/production.rb | 6 | ||||
| -rw-r--r-- | config/locales/en.yml | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index ce3c41799..40fcd3bdd 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -91,11 +91,13 @@ Rails.application.configure do # E-mails outgoing_email_address = ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost') - outgoing_mail_domain = Mail::Address.new(outgoing_email_address).domain + outgoing_email_domain = Mail::Address.new(outgoing_email_address).domain + config.action_mailer.default_options = { from: outgoing_email_address, reply_to: ENV['SMTP_REPLY_TO'], - 'Message-ID': -> { "<#{Mail.random_tag}@#{outgoing_mail_domain}>" }, + return_path: ENV['SMTP_RETURN_PATH'], + message_id: -> { "<#{Mail.random_tag}@#{outgoing_email_domain}>" }, } config.action_mailer.smtp_settings = { diff --git a/config/locales/en.yml b/config/locales/en.yml index 5fa3c012e..829cd61d0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -168,7 +168,6 @@ en: previous_strikes_description_html: one: This account has <strong>one</strong> strike. other: This account has <strong>%{count}</strong> strikes. - zero: This account is <strong>in good standing</strong>. promote: Promote protocol: Protocol public: Public @@ -530,7 +529,6 @@ en: known_accounts: one: "%{count} known account" other: "%{count} known accounts" - zero: No known account moderation: all: All limited: Limited @@ -802,7 +800,6 @@ en: shared_by_over_week: one: Shared by one person over the last week other: Shared by %{count} people over the last week - zero: Shared by noone over the last week title: Trending links usage_comparison: Shared %{today} times today, compared to %{yesterday} yesterday pending_review: Pending review @@ -845,7 +842,6 @@ en: used_by_over_week: one: Used by one person over the last week other: Used by %{count} people over the last week - zero: Used by noone over the last week title: Trends warning_presets: add_new: Add new |