Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Translate vendor email subjects in the store's locale

Damian Legawiec1595b411cfac
diff --git a/spree/emails/app/mailers/spree/vendor_mailer.rb b/spree/emails/app/mailers/spree/vendor_mailer.rb
index 989153076e..de133367da 100644
--- a/spree/emails/app/mailers/spree/vendor_mailer.rb
+++ b/spree/emails/app/mailers/spree/vendor_mailer.rb
@@ -15,7 +15,7 @@ module Spree
# so a hosted dashboard, a dev Vite server and a mounted build all work.
@dashboard_url = Spree::Stores::DashboardUrl.call(store: store).presence
- deliver_to_vendor(Spree.t('vendor_mailer.approved_email.subject', store_name: store.name))
+ deliver_to_vendor('vendor_mailer.approved_email.subject')
end
# Carries no reason: the operator's note is an internal record, and a
@@ -23,13 +23,13 @@ module Spree
def suspended_email(vendor)
@vendor = load_vendor(vendor)
- deliver_to_vendor(Spree.t('vendor_mailer.suspended_email.subject', store_name: store.name))
+ deliver_to_vendor('vendor_mailer.suspended_email.subject')
end
def rejected_email(vendor)
@vendor = load_vendor(vendor)
- deliver_to_vendor(Spree.t('vendor_mailer.rejected_email.subject', store_name: store.name))
+ deliver_to_vendor('vendor_mailer.rejected_email.subject')
end
private
@@ -49,12 +49,19 @@ module Spree
(@vendor.users.pluck(:email) << @vendor.contact_email).compact_blank.uniq(&:downcase)
end
- def deliver_to_vendor(subject)
+ # Takes the key, not the translated string: resolving the subject outside
+ # the block would render it in whatever locale the job happens to run
+ # under, so a seller could get an English subject over a German email.
+ def deliver_to_vendor(subject_key)
addresses = recipients
return message.perform_deliveries = false if addresses.empty?
with_store_locale(store) do
- mail(to: addresses, subject: subject, store_url: store.storefront_url)
+ mail(
+ to: addresses,
+ subject: Spree.t(subject_key, store_name: store.name),
+ store_url: store.storefront_url
+ )
end
end
end
diff --git a/spree/emails/spec/mailers/spree/vendor_mailer_spec.rb b/spree/emails/spec/mailers/spree/vendor_mailer_spec.rb
index c0a7b42dde..5a945969fc 100644
--- a/spree/emails/spec/mailers/spree/vendor_mailer_spec.rb
+++ b/spree/emails/spec/mailers/spree/vendor_mailer_spec.rb
@@ -52,6 +52,25 @@ RSpec.describe Spree::VendorMailer do
end
end
+ # The subject is translated inside the store-locale block, not before it.
+ # Resolved outside, it would render in whatever locale the delivery job
+ # happens to run under — an English subject over a German email.
+ describe 'locale' do
+ before do
+ I18n.backend.store_translations(
+ :de,
+ spree: { vendor_mailer: { approved_email: { subject: 'DE-SUBJECT', heading: 'DE-HEADING' } } }
+ )
+ store.update!(default_locale: 'de', supported_locales: 'en,de')
+ end
+
+ it 'renders the subject in the store locale, not the job locale' do
+ message = I18n.with_locale(:en) { described_class.approved_email(vendor.id) }
+
+ expect(message.subject).to include('DE-SUBJECT')
+ end
+ end
+
describe 'recipients' do
it 'reaches the whole team plus the contact address' do
member = create(:admin_user, email: '[email protected]')