spree_admin 5.5.3 → 5.6.0.rc1

data/app/views/spree/admin/dashboard/analytics.html.erb

@@ -11,7 +11,7 @@
         <div class="col-span-6 lg:col-span-4 gap-2">
           <div class="analytics-card-tab active" data-tabs-target="tab" data-action="click->tabs#select">
             <div class="flex justify-center flex-col mb-6 lg:mb-0">
-              <span class="text-sm text-gray-500">Total Sales</span>
+              <span class="text-sm text-gray-500"><%= Spree.t(:total_sales) %></span>
               <span class="text-lg text-gray-900 font-bold mt-1">
                 <%= @sales_total %>
               </span>
@@ -25,7 +25,7 @@
         <div class="col-span-6 lg:col-span-2">
           <div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#select">
             <div class="flex justify-center flex-col mb-6 lg:mb-0">
-              <span class="text-sm text-gray-500">Avg. Order Value</span>
+              <span class="text-sm text-gray-500"><%= Spree.t('admin.avg_order_value') %></span>
               <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @orders_average %></span>
               <div>
                 <%= render 'spree/admin/shared/growth_rate_badge', growth_rate: @orders_average_growth_rate %>
@@ -37,7 +37,7 @@
         <div class="col-span-6 lg:col-span-2">
           <div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#select">
             <div class="flex justify-center flex-col mb-6 lg:mb-0">
-              <span class="text-sm text-gray-500">Total Orders</span>
+              <span class="text-sm text-gray-500"><%= Spree.t('admin.total_orders') %></span>
               <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @orders_total  %></span>
               <div>
                 <%= render 'spree/admin/shared/growth_rate_badge', growth_rate: @orders_growth_rate %>
@@ -49,7 +49,7 @@
           <div class="col-span-6 lg:col-span-2">
             <div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#select">
               <div class="flex justify-center flex-col">
-                <span class="text-sm text-gray-500">Visits</span>
+                <span class="text-sm text-gray-500"><%= Spree.t(:visits) %></span>
                 <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @visits_total %></span>
                 <div>
                   <%= render 'spree/admin/shared/growth_rate_badge', growth_rate: @visits_growth_rate %>
@@ -63,7 +63,7 @@
           <div class="col-span-6 lg:col-span-2">
             <div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#select">
               <div class="flex justify-center flex-col">
-                <span class="text-sm text-gray-500">Sign-ups</span>
+                <span class="text-sm text-gray-500"><%= Spree.t('admin.sign_ups') %></span>
                 <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @audience_total %></span>
                 <div>
                   <%= render 'spree/admin/shared/growth_rate_badge', growth_rate: @audience_growth_rate %>

data/app/views/spree/admin/dashboard/setup_tasks/_add_products.html.erb

@@ -1,16 +1,16 @@
 <% if done %>
   <p>
-    Good job, you've added products to your store!
+    <%= Spree.t('admin.store_setup_tasks.add_products_task.done_title') %>
   </p>
   <p>
-    Remember you can always add more!
+    <%= Spree.t('admin.store_setup_tasks.add_products_task.done_subtitle') %>
   </p>
 <% else %>
   <p>
-    Add products to your store, either your own or invite 3rd party vendors to sell together.
+    <%= Spree.t('admin.store_setup_tasks.add_products_task.copy') %>
   </p>
   <p>
-    You can also import products in bulk from a CSV or Excel file.
+    <%= Spree.t('admin.store_setup_tasks.add_products_task.import_hint') %>
   </p>
 <% end %>
 

data/app/views/spree/admin/dashboard/setup_tasks/_set_customer_support_email.html.erb

@@ -1,18 +1,17 @@
 <%= turbo_frame_tag :set_customer_support_email, class: 'w-full' do %>
   <div class="alert alert-info">
-    We need your customer support email to display on your storefront.
-    This email will work as a contact point for your customers to reach out to you for any queries or support.
+    <%= Spree.t('admin.store_setup_tasks.customer_support_email_task.copy') %>
   </div>
 
   <% if done %>
     <p class="mb-3">
-      Your customer support email is <strong><%= current_store.customer_support_email %>.</strong>
+      <%= Spree.t('admin.store_setup_tasks.customer_support_email_task.current_html', email: tag.strong(current_store.customer_support_email)) %>
     </p>
     <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_emails_admin_store_path, class: 'btn btn-light' %>
   <% else %>
     <%= form_for current_store, url: spree.admin_store_path, as: :store do |f| %>
       <div class="form-group">
-        <%= f.label :customer_support_email, 'Customer support email' %>
+        <%= f.label :customer_support_email, Spree.t('admin.store_setup_tasks.customer_support_email_task.label') %>
         <%= f.email_field :customer_support_email, class: 'form-input', required: true %>
       </div>
       <%= turbo_save_button_tag %>

data/app/views/spree/admin/dashboard/setup_tasks/_setup_storefront.html.erb

@@ -0,0 +1,18 @@
+<% if done %>
+  <p>
+    <%= Spree.t('admin.store_setup_tasks.storefront.done') %>
+    <%= link_to current_store.storefront_url, current_store.storefront_url, target: :_blank, rel: 'noopener', class: 'font-medium' %>
+  </p>
+  <% if can?(:update, current_store) %>
+    <div>
+      <%= link_to Spree.t('admin.store_setup_tasks.storefront.manage'), spree.admin_storefront_path, class: 'btn btn-light', data: { turbo_frame: '_top' } %>
+    </div>
+  <% end %>
+<% else %>
+  <p><%= Spree.t('admin.store_setup_tasks.storefront.copy') %></p>
+  <% if can?(:update, current_store) %>
+    <div>
+      <%= link_to Spree.t('admin.store_setup_tasks.storefront.setup'), spree.admin_storefront_path, class: 'btn btn-primary', data: { turbo_frame: '_top' } %>
+    </div>
+  <% end %>
+<% end %>

data/app/views/spree/admin/gift_card_batches/_form.html.erb

@@ -10,6 +10,6 @@
     <%= f.spree_money_field :amount, currency: f.object.currency, required: true, disabled: f.object.persisted? %>
     <%= f.spree_select :currency, options_for_select(supported_currency_options, f.object.currency), { label: Spree.t(:currency), autocomplete: true } %>
     <%= f.spree_number_field :codes_count, required: true, min: 1, max: Spree::Config[:gift_card_batch_limit], label: Spree.t('admin.gift_card_batches.codes_count') %>
-    <%= f.spree_date_field :expires_at, disabled: f.object.persisted?, help: 'Gift cards will expire after this date.' %>
+    <%= f.spree_date_field :expires_at, disabled: f.object.persisted?, help: Spree.t('admin.gift_card_batches.expires_at_help') %>
   </div>
 </div>

data/app/views/spree/admin/import_rows/show.html.erb

@@ -4,10 +4,10 @@
   <div class="drawer-body" data-controller="highlight tabs">
     <ul class="nav nav-pills mb-6">
       <li class="nav-item">
-        <a class="nav-link active" data-tabs-target="tab" data-action="click->tabs#select">JSON</a>
+        <a class="nav-link active" data-tabs-target="tab" data-action="click->tabs#select"><%= Spree.t('admin.imports.json') %></a>
       </li>
       <li class="nav-item">
-        <a class="nav-link" data-tabs-target="tab" data-action="click->tabs#select">Schema</a>
+        <a class="nav-link" data-tabs-target="tab" data-action="click->tabs#select"><%= Spree.t('admin.imports.schema') %></a>
       </li>
     </ul>
 

data/app/views/spree/admin/imports/_footer.html.erb

@@ -5,7 +5,7 @@
     </div>
 
     <div>
-      <%= import.rows.processed.count %> / <%= import.rows_count %> rows processed
+      <%= Spree.t('admin.imports.rows_processed', processed: import.rows.processed.count, total: import.rows_count) %>
     </div>
   <% elsif import.status != 'failed' %>
     <div>

data/app/views/spree/admin/imports/_mapping_form.html.erb

@@ -6,6 +6,6 @@
     <% if mapping.file_column.present? %>
       <% select_options.prepend([mapping.file_column, mapping.file_column]) %>
     <% end %>
-    <%= f.select :file_column, options_for_select(select_options, mapping.file_column), { include_blank: 'Please select a column' }, { data: { action: 'auto-submit#submit', controller: 'autocomplete-select' }, id: "import_mapping_file_column_#{mapping.id}" } %>
+    <%= f.select :file_column, options_for_select(select_options, mapping.file_column), { include_blank: Spree.t('admin.imports.please_select_a_column') }, { data: { action: 'auto-submit#submit', controller: 'autocomplete-select' }, id: "import_mapping_file_column_#{mapping.id}" } %>
   <% end %>
 <% end %>

data/app/views/spree/admin/imports/show.html.erb

@@ -3,9 +3,9 @@
 <% end %>
 
 <% content_for :steps do %>
-  <li class="border-r grow h-full flex items-center justify-center <% if @import.mapping? %>bg-gray-100 font-bold<% end %>">1. Map fields</li>
-  <li class="border-r grow h-full flex items-center justify-center <% if @import.processing? %>bg-gray-100 font-bold<% end %>">2. Process rows</li>
-  <li class="grow h-full flex items-center justify-center <% if @import.complete? %>bg-gray-100 font-bold<% end %>">3. Complete</li>
+  <li class="border-r grow h-full flex items-center justify-center <% if @import.mapping? %>bg-gray-100 font-bold<% end %>"><%= Spree.t('admin.imports.steps.map_fields') %></li>
+  <li class="border-r grow h-full flex items-center justify-center <% if @import.processing? %>bg-gray-100 font-bold<% end %>"><%= Spree.t('admin.imports.steps.process_rows') %></li>
+  <li class="grow h-full flex items-center justify-center <% if @import.complete? %>bg-gray-100 font-bold<% end %>"><%= Spree.t('admin.imports.steps.complete') %></li>
 <% end %>
 
 <% if @import.status == 'mapping' %>

data/app/views/spree/admin/integrations/_integration.html.erb

@@ -22,7 +22,7 @@
           <%= Spree.t(:settings) %>
         <% end if can?(:update, integration) %>
 
-        <span class="ml-auto inline-flex items-center text-xs font-medium text-green-700">
+        <span class="ms-auto inline-flex items-center text-xs font-medium text-green-700">
           <span class="w-1.5 h-1.5 rounded-full bg-green-500 mr-1"></span>
           <%= Spree.t(:active) %>
         </span>

data/app/views/spree/admin/integrations/index.html.erb

@@ -28,13 +28,11 @@
       <% end %>
 
       <p class="text-gray-600 text-center my-12">
-        Find more integrations in <%= external_link_to 'Integrations Directory', 'https://spreecommerce.org/docs/integrations/integrations', target: '_blank' %>
+        <%= Spree.t('admin.integrations.find_more_html', integrations_link: external_link_to(Spree.t('admin.integrations_directory'), 'https://spreecommerce.org/docs/integrations/integrations', target: '_blank')) %>
       </p>
     <% else %>
       <p class="text-gray-600 text-center my-12">
-        No integrations installed yet. Find integrations in 
-
-        <%= external_link_to 'Integrations Directory', 'https://spreecommerce.org/docs/integrations/integrations', target: '_blank' %>
+        <%= Spree.t('admin.integrations.none_installed_html', integrations_link: external_link_to(Spree.t('admin.integrations_directory'), 'https://spreecommerce.org/docs/integrations/integrations', target: '_blank')) %>
       </p>
     <% end %>
   </div>

data/app/views/spree/admin/invitations/_invitation.html.erb

@@ -21,7 +21,7 @@
       <span class="badge badge-warning"><%= Spree.t(:expired) %></span>
     <% else %>
       <span class="badge badge-light"><%= Spree.t(:pending) %></span>
-      <p class="text-gray-600 text-sm mb-0 mt-2 pl-1">Expires at: <%= spree_time(invitation.expires_at) %></p>
+      <p class="text-gray-600 text-sm mb-0 mt-2 pl-1"><%= Spree.t('admin.invitations.expires_at') %>: <%= spree_time(invitation.expires_at) %></p>
     <% end %>
   </td>
   <td class="w-10">

data/app/views/spree/admin/invitations/new.html.erb

@@ -5,7 +5,7 @@
     <%= dialog_header Spree.t('actions.send_invitation') %>
     <div class="dialog-body">
       <%= render 'spree/admin/shared/error_messages', target: @invitation %>
-      <%= f.spree_email_field :email, required: true, data: { 'enable-button-target': 'input' }, placeholder: 'eg. steve@apple.com', autofocus: true %>
+      <%= f.spree_email_field :email, required: true, data: { 'enable-button-target': 'input' }, placeholder: Spree.t('admin.invitations.email_placeholder'), autofocus: true %>
       <% if @roles.any? %>
         <%= f.spree_select :role_id, @roles.map { |role| [role.name, role.id] }, { label: Spree.t(:role_id), autocomplete: true, required: true }, { data: { 'enable-button-target': 'input' } } %>
       <% end %>

data/app/views/spree/admin/invitations/show.html.erb

@@ -3,7 +3,7 @@
     <%= render_avatar(@invitation.inviter, height: 32, width: 32) %>
   </div>
   <div>
-    <strong><%= @invitation.inviter.name %></strong> has invited you to join <strong><%= @invitation.resource.name %></strong>
+    <%= Spree.t('admin.invitations.invited_you_to_join_html', inviter: tag.strong(@invitation.inviter.name), resource: tag.strong(@invitation.resource.name)) %>
   </div>
 </div>
 <%= link_to Spree.t(:accept), spree.accept_admin_invitation_path(@invitation), class: 'btn btn-primary mx-auto px-12', data: { turbo_method: :put } %>

data/app/views/spree/admin/line_items/new.html.erb

@@ -18,7 +18,7 @@
         </div>
       </div>
       <div class="dialog-footer">
-        <div class="flex gap-2 m-0 items-center mr-auto">
+        <div class="flex gap-2 m-0 items-center me-auto">
           <%= form.label :quantity, Spree.t(:quantity), class: "mb-0" %>
           <%= form.number_field :quantity, class: "form-input", min: 1 %>
         </div>

data/app/views/spree/admin/markets/_form.html.erb

@@ -8,17 +8,19 @@
   <div class="card-body">
     <%= f.spree_text_field :name, required: true %>
 
-    <%= f.spree_select :country_ids, @countries.map { |country| ["#{Spree::Country.iso_to_emoji_flag(country.iso)} #{country.name}", country.id] }, { include_blank: false, label: Spree.t(:countries), autocomplete: true, multiple: true } %>
+    <%= f.spree_select :country_ids, country_select_options(@countries), { include_blank: false, label: Spree.t(:countries), autocomplete: true, multiple: true } %>
 
-    <%= f.spree_select :currency, currency_options(f.object.currency), { label: Spree.t(:currency), required: true, autocomplete: true } %>
+    <%= f.spree_select :currency, currency_options(f.object.currency), { label: Spree.t(:currency), required: true, autocomplete: true }, { data: { display_names_type: 'currency' } } %>
 
     <%= f.spree_select :default_locale,
-          options_from_collection_for_select(all_locales_options, :last, :first, f.object.default_locale || I18n.locale),
-          { required: true, autocomplete: true } %>
+          options_from_collection_for_select(translation_locales_options, :last, :first, f.object.default_locale || I18n.locale),
+          { required: true, autocomplete: true },
+          { data: { display_names_type: 'language' } } %>
 
     <%= f.spree_select :supported_locales,
-          options_from_collection_for_select(all_locales_options, :last, :first, f.object.supported_locales&.split(',')),
-          { multiple: true, autocomplete: true, hint: Spree.t('admin.markets.supported_locales_hint') } %>
+          options_from_collection_for_select(translation_locales_options, :last, :first, f.object.supported_locales&.split(',')),
+          { multiple: true, autocomplete: true, hint: Spree.t('admin.markets.supported_locales_hint') },
+          { data: { display_names_type: 'language' } } %>
 
     <hr class="my-6">
 

data/app/views/spree/admin/metafields/edit.html.erb

@@ -35,7 +35,7 @@
     <div class="drawer-body">
       <div class="text-gray-600 p-12 flex items-center w-full justify-center flex-col gap-4">
         <%= icon 'map-search', class: 'text-4xl' %>
-        <p>No metafield definitions configured for <%= model_class.name.demodulize.titleize.pluralize %>.</p>
+        <p><%= Spree.t('admin.metafields.none_configured_for', resource: model_class.model_name.human(count: 2)) %></p>
         <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_metafield_definition_path(resource_type: model_class.to_s), class: 'btn btn-primary', data: { 'turbo-frame': '_top' } if can?(:create, Spree::MetafieldDefinition) %>
       </div>
     </div>

data/app/views/spree/admin/option_types/_form.html.erb

@@ -5,11 +5,11 @@
     <div class="card-body" data-controller="slug-form">
       <div class="grid grid-cols-12 gap-6 mb-6">
         <div class="col-span-12 md:col-span-6">
-          <%= f.spree_text_field :presentation, required: true, autofocus: f.object.new_record?, data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName' }, help_text: "This is used to display the option type on the storefront." %>
+          <%= f.spree_text_field :presentation, required: true, autofocus: f.object.new_record?, data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName' }, help_text: Spree.t('admin.option_types.presentation_help') %>
         </div>
 
         <div class="col-span-12 md:col-span-6">
-          <%= f.spree_text_field :name, label: Spree.t(:internal_name), data: { slug_form_target: :url }, help_text: raw("This is used internally to identify the option type. <strong>It must be unique.</strong>") %>
+          <%= f.spree_text_field :name, label: Spree.t(:internal_name), data: { slug_form_target: :url }, help_text: Spree.t('admin.option_types.name_help_html') %>
         </div>
       </div>
       <div class="grid grid-cols-12 gap-6 mb-6">
@@ -38,7 +38,7 @@
       <h5 class="card-title"><%= Spree.t(:option_values) %></h5>
       <% if @option_values_total > 0 %>
         <span class="text-sm text-gray-500">
-          <%= @option_values_total %> <%= 'value'.pluralize(@option_values_total) %>
+          <%= Spree.t('admin.option_types.value_count', count: @option_values_total) %>
         </span>
       <% end %>
     </div>
@@ -77,14 +77,17 @@
         <div class="flex items-center justify-between p-3 border-t">
           <span class="text-sm text-gray-500">
             <% per_page = Spree::Admin::RuntimeConfig.admin_option_values_per_page %>
-            Showing <%= (@option_values_page - 1) * per_page + 1 %>-<%= [@option_values_page * per_page, @option_values_total].min %> of <%= @option_values_total %>
+            <%= Spree.t('admin.option_types.showing_pagination',
+                  from: (@option_values_page - 1) * per_page + 1,
+                  to: [@option_values_page * per_page, @option_values_total].min,
+                  total: @option_values_total) %>
           </span>
           <div class="flex gap-1.5">
             <% if @option_values_page > 1 %>
               <%= link_to icon('chevron-left', class: 'text-gray-900 mr-0'),
                   spree.edit_admin_option_type_path(@option_type, option_values_page: @option_values_page - 1),
                   class: "btn btn-light p-2",
-                  'aria-label': 'Previous page' %>
+                  'aria-label': Spree.t('admin.previous_page') %>
             <% else %>
               <button class="btn btn-light p-2 cursor-not-allowed opacity-50" disabled>
                 <%= icon('chevron-left', class: 'text-gray-900 mr-0') %>
@@ -95,7 +98,7 @@
               <%= link_to icon('chevron-right', class: 'text-gray-900 mr-0'),
                   spree.edit_admin_option_type_path(@option_type, option_values_page: @option_values_page + 1),
                   class: "btn btn-light p-2",
-                  'aria-label': 'Next page' %>
+                  'aria-label': Spree.t('admin.next_page') %>
             <% else %>
               <button class="btn btn-light p-2 cursor-not-allowed opacity-50" disabled>
                 <%= icon('chevron-right', class: 'text-gray-900 mr-0') %>

data/app/views/spree/admin/option_types/index.html.erb

@@ -9,8 +9,7 @@
 
 <%= content_for(:page_alerts) do %>
   <div class="alert alert-info">
-    Options are used to group certain attributes. For example, you can create an option named "shirt size" and then
-    create an option value named "small" and "medium" for this option.
+    <%= Spree.t('admin.option_types.intro_help') %>
   </div>
 <% end %>
 
@@ -19,5 +18,5 @@
 <%= render_table @collection, :option_types, sortable: true %>
 
 <p class="documentation-link-container">
-  <%= external_link_to "Learn more about options", "https://spreecommerce.org/docs/user/manage-products/product-options" %>
+  <%= external_link_to Spree.t('admin.option_types.learn_more'), "https://spreecommerce.org/docs/user/manage-products/product-options" %>
 </p>

data/app/views/spree/admin/orders/_customer.html.erb

@@ -4,7 +4,7 @@
       <%= Spree.t(:customer) %>
     </h5>
     <% if can?(:update_customer, @order) || can?(:update_addresses, @order) %>
-      <%= dropdown id: 'customer-edit-dropdown', class: 'ml-auto', portal: false do %>
+      <%= dropdown id: 'customer-edit-dropdown', class: 'ms-auto', portal: false do %>
         <%= dropdown_toggle class: 'btn-light btn-sm px-1', data: { test_id: 'dropdown-toggle' } do %>
           <%= icon 'dots-vertical', class: 'mr-0' %>
         <% end %>

data/app/views/spree/admin/orders/_customer_summary.html.erb

@@ -11,7 +11,7 @@
     <span class="text-gray-600">
       <%= order.full_name %>
     </span>
-    <%= help_bubble('This order was placed by a guest customer') %>
+    <%= help_bubble(Spree.t('admin.orders.placed_by_guest')) %>
   <% else %>
     <span class="text-gray-600">
       <%= Spree.t(:not_available) %>

data/app/views/spree/admin/orders/_payments.html.erb

@@ -7,7 +7,7 @@
       </h5>
       <% if @payments.any? %>
         <span class="badge badge-info ml-2"><%= @payments.count %></span>
-        <%= order_payment_state(@order, class: "ml-auto") %>
+        <%= order_payment_state(@order, class: "ms-auto") %>
       <% end %>
     </div>
     <div class="card-body flex flex-col gap-2 px-2 pt-0 pb-2">

data/app/views/spree/admin/orders/_shipment.html.erb

@@ -51,6 +51,11 @@
           </span>
         <% else %>
           <%= Spree.t(:no_shipping_method_selected) %>
+          <% if shipment.cost.positive? %>
+            <span>
+              <%= shipment.display_cost %>
+            </span>
+          <% end %>
         <% end %>
       </div>
 
@@ -87,9 +92,9 @@
     <% if can_ship?(shipment) %>
       <div class="card-footer flex justify-end border-t bg-gray-25">
         <% if shipment.tracked? %>
-          <%= link_to_with_icon 'send.svg', Spree.t(:ship), spree.ship_admin_order_shipment_path(order, shipment), class: 'ml-auto btn btn-primary mb-0', data: {turbo_method: :post, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: '_top'} %>
+          <%= link_to_with_icon 'send.svg', Spree.t(:ship), spree.ship_admin_order_shipment_path(order, shipment), class: 'ms-auto btn btn-primary mb-0', data: {turbo_method: :post, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: '_top'} %>
         <% elsif !shipment.digital? %>
-          <span class="ship ml-auto btn btn-primary disabled mb-0" data-controller="tooltip" data-tooltip-placement-value="left">
+          <span class="ship ms-auto btn btn-primary disabled mb-0" data-controller="tooltip" data-tooltip-placement-value="left">
             <%= icon 'send' %>
             <%= Spree.t(:ship) %>
             <%= tooltip(Spree.t('admin.shipment.please_provide_tracking_details')) %>

data/app/views/spree/admin/orders/_shipments.html.erb

@@ -7,7 +7,7 @@
     <% if @shipments.any? %>
       <span class="badge badge-info ml-2"><%= @shipments.count %></span>
 
-      <%= order_shipment_state(@order, class: "ml-auto") %>
+      <%= order_shipment_state(@order, class: "ms-auto") %>
     <% end %>
   </div>
   <div class="card-body px-2 pt-0 pb-2 flex flex-col gap-2">

data/app/views/spree/admin/orders/_user_overview.html.erb

@@ -1,13 +1,16 @@
-<% if @order.user.orders.complete.any? %>
+<% completed_orders = current_store.orders.where(user: @order.user).complete %>
+<% if completed_orders.any? %>
   <div class="alert alert-info mt-2 mb-0">
     <div>
       <h5 class="font-bold">
-        <%= icon('magic') %> Assistant
+        <%= icon('magic') %> <%= Spree.t('admin.assistant') %>
       </h5>
-      This is a repeat customer that has spent a total of
-      <strong><%= Spree::Money.new(@order.user.orders.complete.sum(:total)) %></strong> across
-      <strong><%= @order.user.orders.complete.count %> orders</strong>, averaging
-      <strong><%= Spree::Money.new(@order.user.orders.complete.average(:total)) %></strong> per order.
+      <%= Spree.t(
+            'admin.orders.repeat_customer_summary_html',
+            amount: tag.strong(Spree::Money.new(completed_orders.sum(:total))),
+            count: tag.strong(Spree.t('admin.orders.orders_count', count: completed_orders.count)),
+            average: tag.strong(Spree::Money.new(completed_orders.average(:total)))
+          ) %>
     </div>
   </div>
 <% end %>

data/app/views/spree/admin/orders/return_authorizations/edit.html.erb

@@ -20,7 +20,7 @@ locals: {
 
   <div class="form-actions">
     <%= turbo_save_button_tag Spree.t("actions.update") %>
-    <div class="ml-auto flex gap-6">
+    <div class="ms-auto flex gap-6">
       <% if f.object.can_cancel? && can?(:cancel, f.object) %>
         <%= link_to Spree.t("actions.cancel"),
         spree.cancel_admin_return_authorization_path(f.object),

data/app/views/spree/admin/payment_methods/_form.html.erb

@@ -22,7 +22,7 @@
     <h5 class="card-title"><%= Spree.t(:display_settings) %></h5>
   </div>
   <div class="card-body">
-    <%= f.spree_text_field :name, help: 'This name will be used to identify the payment method on the storefront' %>
+    <%= f.spree_text_field :name, help: Spree.t('admin.payment_methods.name_help') %>
 
     <%= f.spree_select :display_on, display_on_options, { label: Spree.t(:display) } %>
     <%= f.spree_select :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes).to_s, true], [Spree.t(:say_no).to_s, false]], { label: Spree.t(:auto_capture) } %>

data/app/views/spree/admin/payment_methods/index.html.erb

@@ -26,7 +26,7 @@
 </div>
 
 <% if available_payment_methods.present? && can?(:create, Spree::PaymentMethod) %>
-  <h6 class="pb-2 pt-6">Available Payment Methods</h6>
+  <h6 class="pb-2 pt-6"><%= Spree.t('admin.payment_methods.available_payment_methods') %></h6>
   <div class="card-lg">
     <div class="table-responsive">
       <table class="table">
@@ -46,5 +46,5 @@
 <% end %>
 
 <p class="text-gray-600 text-center my-12">
-  Find more payment methods in <%= external_link_to 'Integrations Directory', 'https://spreecommerce.org/docs/integrations/integrations', target: '_blank' %>
+  <%= Spree.t('admin.payment_methods.find_more_payment_methods_html', integrations_link: external_link_to(Spree.t('admin.integrations_directory'), 'https://spreecommerce.org/docs/integrations/integrations', target: '_blank')) %>
 </p>

data/app/views/spree/admin/payments/_payment.html.erb

@@ -14,7 +14,7 @@
       <%= payment_method_icon_tag(payment.payment_method.payment_icon_name) %>
     <% end %>
     <strong><%= payment.number.upcase %></strong>
-    <%= spree_time(payment.created_at, class: 'ml-auto text-gray-600 text-sm') %>
+    <%= spree_time(payment.created_at, class: 'ms-auto text-gray-600 text-sm') %>
 
     <%= dropdown do %>
       <%= dropdown_toggle class: 'btn-light btn-sm px-1' do %>

data/app/views/spree/admin/price_lists/index.html.erb

@@ -9,7 +9,7 @@
 
 <% content_for :page_alerts do %>
   <div class="alert alert-info">
-    Price lists are a powerful tool for managing pricing strategies based on customer groups, products, or other criteria.
+    <%= Spree.t('admin.price_lists.page_info') %>
   </div>
 <% end %>
 
@@ -18,5 +18,5 @@
 <%= render_table @collection, :price_lists, sortable: true %>
 
 <p class="documentation-link-container">
-  <%= external_link_to "Learn more about price lists", "https://spreecommerce.org/docs/user/manage-products/price-lists" %>
+  <%= external_link_to Spree.t('admin.price_lists.learn_more'), "https://spreecommerce.org/docs/user/manage-products/price-lists" %>
 </p>

data/app/views/spree/admin/products/form/_inventory.html.erb

@@ -17,6 +17,25 @@
           %>
       <%= f.label :track_inventory, Spree.t(:track_quantity), class: 'custom-control-label' %>
     </div>
+    <%= f.fields_for :master, @product.master do |vf| %>
+      <div class="mb-2">
+        <%= vf.spree_check_box :preorderable, label: Spree.t('admin.variants_form.preorderable_label') %>
+        <small class="text-muted text-xs d-block"><%= Spree.t('admin.variants_form.preorderable_hint') %></small>
+      </div>
+      <div class="mb-2">
+        <%# datetime-local inputs have no timezone; render in the store's timezone so admins see and submit store-local times (parsed back in ProductsController#permitted_resource_params). %>
+        <% preorder_ships_at_local = vf.object.preorder_ships_at&.in_time_zone(current_timezone)&.strftime('%Y-%m-%dT%H:%M') %>
+        <%= vf.spree_datetime_field :preorder_ships_at,
+              value: preorder_ships_at_local,
+              label: Spree.t('admin.variants_form.preorder_ships_at_label'),
+              help: "#{Spree.t('admin.variants_form.preorder_ships_at_hint')} #{Spree.t('admin.datetime_field_timezone_help', zone: current_timezone.name)}" %>
+      </div>
+      <div class="mb-6">
+        <%= vf.spree_number_field :backorder_limit, min: 0,
+              label: Spree.t('admin.variants_form.backorder_limit_label'),
+              help: Spree.t('admin.variants_form.backorder_limit_hint') %>
+      </div>
+    <% end %>
     <div
       class="master-variant-quantity-form <%= @product.has_variants? || !@product.track_inventory ? 'hidden' : '' %>"
       data-product-form-target="<%= @product.has_variants? ? '' : 'quantityForm' %>"

data/app/views/spree/admin/products/form/_publishing.html.erb

@@ -13,9 +13,8 @@
 %>
 
 <%
-  store_timezone = ActiveSupport::TimeZone[current_store.preferred_timezone] || Time.zone
-  to_store_local = ->(value) { value&.in_time_zone(store_timezone)&.strftime('%Y-%m-%dT%H:%M') }
-  tz_help        = Spree.t('admin.datetime_field_timezone_help', zone: store_timezone.name)
+  to_store_local = ->(value) { value&.in_time_zone(current_timezone)&.strftime('%Y-%m-%dT%H:%M') }
+  tz_help        = Spree.t('admin.datetime_field_timezone_help', zone: current_timezone.name)
   store_channels = current_store.channels.order(:name).to_a
   publications_by_channel = @product.product_publications.includes(:channel).index_by(&:channel_id)
   can_manage_publications = can?(:manage, Spree::ProductPublication)

data/app/views/spree/admin/products/index.html.erb

@@ -14,6 +14,5 @@
 <%= render_table @collection, :products, bulk_operations: true, export_type: Spree::Exports::Products %>
 
 <p class="documentation-link-container">
-  Learn more about
-  <%= external_link_to 'managing products', 'https://spreecommerce.org/docs/user/manage-products' %>
+  <%= external_link_to Spree.t('admin.products.learn_more'), 'https://spreecommerce.org/docs/user/manage-products' %>
 </p>

data/app/views/spree/admin/profile/edit.html.erb

@@ -17,6 +17,9 @@
           <%= f.spree_email_field :email, required: true %>
           <%= f.spree_text_field :first_name, required: true %>
           <%= f.spree_text_field :last_name, required: true %>
+          <%= f.spree_select :selected_locale,
+              options_from_collection_for_select(admin_locales_options, :last, :first, @user.selected_locale || I18n.locale),
+              { label: Spree.t(:language), help_bubble: Spree.t(:admin_language_help), autocomplete: true } %>
           <%= f.spree_file_field :avatar, crop: true %>
         </div>
       </div>

data/app/views/spree/admin/promotion_rules/forms/_channel.html.erb

@@ -0,0 +1,7 @@
+<div class="form-group">
+  <%= f.label :preferred_channel_ids, Spree.t(:channels) %>
+  <%= f.select :preferred_channel_ids,
+              current_store.channels.order(:name).pluck(:name, :id),
+              { selected: f.object.preferred_channel_ids },
+              { multiple: true, data: { controller: 'autocomplete-select' } } %>
+</div>

data/app/views/spree/admin/promotion_rules/forms/_country.html.erb

@@ -1,7 +1,7 @@
 <div class="form-group">
   <%= f.label :preferred_country_iso, Spree.t(:country) %>
   <%= f.select :preferred_country_iso,
-    available_countries_iso.map { |iso| [Spree.t(iso, scope: 'country_names', default: iso), iso] },
+    available_countries.map { |country| [country.localized_name, country.iso] },
     { selected: f.object.preferred_country_iso || current_store.default_market&.default_country&.iso },
     { data: { controller: 'autocomplete-select' } } %>
 </div>

data/app/views/spree/admin/promotion_rules/forms/_item_total.html.erb

@@ -20,7 +20,7 @@
     <%= f.number_field :preferred_amount_max, class: 'form-input' %>
 
     <span class="form-text mt-2">
-      Leave this field blank to not limit the maximum amount.
+      <%= Spree.t('item_total_rule.max_amount_help') %>
     </span>
   </div>
 </div>

data/app/views/spree/admin/promotion_rules/forms/_market.html.erb

@@ -0,0 +1,7 @@
+<div class="form-group">
+  <%= f.label :preferred_market_ids, Spree.t(:markets) %>
+  <%= f.select :preferred_market_ids,
+              current_store.markets.order(:name).pluck(:name, :id),
+              { selected: f.object.preferred_market_ids },
+              { multiple: true, data: { controller: 'autocomplete-select' } } %>
+</div>