tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix subject of email subscription notification e-mail being difficult to localize (#38507)

Browse Source
This commit is contained in:
Eugen Rochko 2026-04-01 10:32:47 +02:00 committed by GitHub
parent 6736b50c14
commit 14544dc4dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/email_subscription_mailer.rb
View File

@ -30,7 +30,7 @@ class EmailSubscriptionMailer < ApplicationMailer
@statuses = statuses @statuses = statuses
I18n.with_locale(locale) do I18n.with_locale(locale) do
mail subject: default_i18n_subject(count: @statuses.size, name: @subscription.account.display_name, excerpt: @statuses.first.text.truncate(17)) mail subject: I18n.t(@statuses.size == 1 ? 'singular' : 'plural', scope: 'email_subscription_mailer.notification.subject', name: @subscription.account.display_name, excerpt: @statuses.first.text.truncate(17))
end end
end end

2
app/views/email_subscription_mailer/notification.text.erb
View File

@ -1,4 +1,4 @@
<%= t '.title', count: @statuses.size, name: display_name(@subscription.account), excerpt: truncate(@statuses.first.text, length: 17) %> <%= t @statuses.size == 1 ? 'singular' : 'plural', scope: 'email_subscription_mailer.notification.title', name: display_name(@subscription.account), excerpt: truncate(@statuses.first.text, length: 17) %>
=== ===

8
config/locales/en.yml
View File

@ -1440,11 +1440,11 @@ en:
one: Interact with this post and discover more like it. one: Interact with this post and discover more like it.
other: Interact with these posts and discover more. other: Interact with these posts and discover more.
subject: subject:
one: 'New post: "%{excerpt}"' plural: New posts from %{name}
other: New posts from %{name} singular: 'New post: "%{excerpt}"'
title: title:
one: 'New post: "%{excerpt}"' plural: New posts from %{name}
other: New posts from %{name} singular: 'New post: "%{excerpt}"'
email_subscriptions: email_subscriptions:
active: Active active: Active
confirmations: confirmations:

4
spec/mailers/email_subscription_mailer_spec.rb
View File

@ -30,7 +30,7 @@ RSpec.describe EmailSubscriptionMailer do
.to send_email( .to send_email(
to: email_subscription.email, to: email_subscription.email,
from: 'notifications@localhost', from: 'notifications@localhost',
subject: I18n.t('email_subscription_mailer.notification.subject', count: statuses.size, name: email_subscription.account.display_name, excerpt: statuses.first.text.truncate(17)) subject: I18n.t('email_subscription_mailer.notification.subject.singular', name: email_subscription.account.display_name, excerpt: statuses.first.text.truncate(17))
) )
end end
end end
@ -43,7 +43,7 @@ RSpec.describe EmailSubscriptionMailer do
.to send_email( .to send_email(
to: email_subscription.email, to: email_subscription.email,
from: 'notifications@localhost', from: 'notifications@localhost',
subject: I18n.t('email_subscription_mailer.notification.subject', count: statuses.size, name: email_subscription.account.display_name, excerpt: ActionController::Base.helpers.truncate(statuses.first.text, length: 17)) subject: I18n.t('email_subscription_mailer.notification.subject.plural', name: email_subscription.account.display_name, excerpt: ActionController::Base.helpers.truncate(statuses.first.text, length: 17))
) )
end end
end end