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.

Fixed missing translation in invitation email (#12969)

Damian Legawiec37bd42d5e80e
diff --git a/admin/app/views/spree/admin/invitations/show.html.erb b/admin/app/views/spree/admin/invitations/show.html.erb
index b21ef31c83..d87318573e 100644
--- a/admin/app/views/spree/admin/invitations/show.html.erb
+++ b/admin/app/views/spree/admin/invitations/show.html.erb
@@ -1,4 +1,4 @@
-<div class="d-flex align-items-center gap-2">
+<div class="d-flex align-items-center gap-2 mb-4">
<div>
<%= render_avatar(@invitation.inviter, height: 32, width: 32) %>
</div>
@@ -6,4 +6,4 @@
<strong><%= @invitation.inviter.name %></strong> has invited you to join <strong><%= @invitation.resource.name %></strong>
</div>
</div>
-<%= link_to Spree.t(:accept), spree.accept_admin_invitation_path(@invitation), class: 'btn btn-primary w-100', data: { turbo_method: :put } %>
\ No newline at end of file
+<%= link_to Spree.t(:accept), spree.accept_admin_invitation_path(@invitation), class: 'btn btn-primary mx-auto px-5', data: { turbo_method: :put } %>
\ No newline at end of file
diff --git a/core/app/views/spree/invitation_mailer/invitation_email.html.erb b/core/app/views/spree/invitation_mailer/invitation_email.html.erb
index 212275e069..ab57c9e8dc 100644
--- a/core/app/views/spree/invitation_mailer/invitation_email.html.erb
+++ b/core/app/views/spree/invitation_mailer/invitation_email.html.erb
@@ -10,7 +10,7 @@
<% if spree.respond_to?(:admin_invitation_url) %>
<p>
- <%= link_to Spree.t('invitation_mailer.invitation_email.link_text'), spree.admin_invitation_url(@invitation, token: @invitation.token, host: @invitation.store.formatted_url) %>
+ <%= link_to Spree.t(:accept), spree.admin_invitation_url(@invitation, token: @invitation.token, host: @invitation.store.formatted_url) %>
</p>
<% end %>
diff --git a/core/spec/mailers/spree/invitation_mailer_spec.rb b/core/spec/mailers/spree/invitation_mailer_spec.rb
index 8e7f0e6c32..669afe42dc 100644
--- a/core/spec/mailers/spree/invitation_mailer_spec.rb
+++ b/core/spec/mailers/spree/invitation_mailer_spec.rb
@@ -32,6 +32,7 @@ RSpec.describe Spree::InvitationMailer, type: :mailer do
end
it 'includes the invitation link in the body' do
+ expect(mail.body.encoded).to include(Spree.t(:accept))
expect(mail.body.encoded).to include("http://test.com/admin/invitations/#{invitation.id}?token=#{invitation.token}")
end
end