solidus_backend 2.4.2 → 2.5.0.beta1

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

@@ -2,7 +2,7 @@
 
 <%= form_for [:admin, @property] do |f| %>
 <fieldset data-hook="new_property">
-  <legend align="center"><%= Spree.t(:new_property) %></legend>
+  <legend align="center"><%= t('spree.new_property') %></legend>
   <%= render partial: 'form', locals: { f: f } %>
   <div class="filter-actions">
     <%= render partial: 'spree/admin/shared/new_resource_links' %>

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

@@ -1,7 +1,7 @@
 <%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.checkout')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.checkout')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::RefundReason), spree.admin_refund_reasons_path) %>
 <% admin_breadcrumb(@refund_reason.name) %>
 

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

@@ -1,7 +1,7 @@
 <%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.checkout')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.checkout')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::RefundReason)) %>
 
 
@@ -9,7 +9,7 @@
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::RefundReason) %>
       <li>
-        <%= button_link_to Spree.t(:new_refund_reason), new_object_url, { id: 'admin_new_named_type' } %>
+        <%= button_link_to t('spree.new_refund_reason'), new_object_url, { id: 'admin_new_named_type' } %>
       </li>
     <% end %>
   </ul>
@@ -37,7 +37,7 @@
           </td>
           <td>
             <span class="pill pill-<%= named_type.active? ? 'active' : 'inactive' %>">
-              <%= Spree.t(named_type.active? ? :active : :inactive) %>
+              <%= t(named_type.active? ? :active : :inactive, scope: 'spree') %>
             </span>
           </td>
           <td class="actions">
@@ -50,7 +50,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="col-9 no-objects-found">
+  <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::RefundReason,
                  new_resource_url: new_object_url %>

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

@@ -1,9 +1,9 @@
 <%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.checkout')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.checkout')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::RefundReason), spree.admin_refund_reasons_path) %>
-<% admin_breadcrumb(Spree.t(:new_refund_reason)) %>
+<% admin_breadcrumb(t('spree.new_refund_reason')) %>
 
 
 <% content_for :page_actions do %>

data/app/views/spree/admin/refund_reasons/shared/_form.html.erb

@@ -13,7 +13,7 @@
     <div class="checkbox">
       <label>
         <%= f.check_box :active %>
-        <%= Spree.t(:active) %>
+        <%= t('spree.active') %>
       </label>
     </div>
   </div>

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

@@ -2,7 +2,7 @@
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
 <% admin_breadcrumb(link_to "#{Spree::Payment.model_name.human} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment)) %>
-<% admin_breadcrumb("#{Spree.t(:editing_refund)} #{@refund.id}") %>
+<% admin_breadcrumb("#{t('spree.editing_refund')} #{@refund.id}") %>
 
 <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
   <fieldset class="no-border-top">
@@ -22,8 +22,8 @@
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('actions.save') %>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order) %>
+      <%= button t('spree.actions.save') %>
+      <%= button_link_to t('spree.actions.cancel'), admin_order_payments_url(@refund.payment.order) %>
     </div>
   </fieldset>
 <% end %>

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

@@ -2,7 +2,7 @@
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
 <% admin_breadcrumb(link_to "#{Spree::Payment.model_name.human} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment)) %>
-<% admin_breadcrumb(Spree.t(:new_refund)) %>
+<% admin_breadcrumb(t('spree.new_refund')) %>
 
 
 <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
@@ -10,13 +10,13 @@
     <div data-hook="admin_refund_form_fields" class="row">
       <div class="col-3">
         <div class="field">
-          <%= Spree.t(:payment_amount) %><br/>
+          <%= t('spree.payment_amount') %><br/>
           <%= @refund.payment.amount %>
         </div>
       </div>
       <div class="col-3">
         <div class="field">
-          <%= Spree.t(:credit_allowed) %><br/>
+          <%= t('spree.credit_allowed') %><br/>
           <%= @refund.payment.credit_allowed %>
         </div>
       </div>
@@ -36,7 +36,7 @@
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
       <%= button Spree::Refund.model_name.human %>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order) %>
+      <%= button_link_to t('spree.actions.cancel'), admin_order_payments_url(@refund.payment.order) %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,7 +1,7 @@
 <%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.checkout')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.checkout')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::ReimbursementType)) %>
 
 

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

@@ -1,17 +1,17 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Returns' } %>
 
-<% admin_breadcrumb("#{Spree.t(:editing_reimbursement)} #{@reimbursement.number}") %>
+<% admin_breadcrumb("#{t('spree.editing_reimbursement')} #{@reimbursement.number}") %>
 
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_customer_return), url_for([:edit, :admin, @order, @reimbursement.customer_return]) %></li>
+  <li><%= button_link_to t('spree.back_to_customer_return'), url_for([:edit, :admin, @order, @reimbursement.customer_return]) %></li>
 <% end %>
 
 <%= render partial: 'spree/shared/error_messages', locals: { target: @reimbursement } %>
 
 <%= form_for [:admin, @order, @reimbursement] do |f| %>
   <fieldset class='no-border-bottom'>
-    <legend align='center'><%= Spree.t(:items_to_be_reimbursed) %></legend>
+    <legend align='center'><%= t('spree.items_to_be_reimbursed') %></legend>
     <table class="index reimbursement-return-items">
       <thead>
         <tr>
@@ -64,19 +64,19 @@
 
   <div class="form-buttons filter-actions actions" data-hook="buttons">
     <%= f.button do %>
-      <%= Spree.t(:update) %>
+      <%= t('spree.update') %>
     <% end %>
   </div>
   <br/>
 <% end %>
 
 <fieldset>
-  <legend align='center'><%= Spree.t(:calculated_reimbursements) %></legend>
+  <legend align='center'><%= t('spree.calculated_reimbursements') %></legend>
   <table class="index calculated-reimbursements">
     <thead data-hook="customer_return_header">
       <tr>
         <th><%= Spree::ReimbursementType.model_name.human %></th>
-        <th><%= Spree.t(:description) %></th>
+        <th><%= t('spree.description') %></th>
         <th><%= Spree::Reimbursement.human_attribute_name(:total) %></th>
       </tr>
     </thead>
@@ -92,15 +92,15 @@
   </table>
   <% if @order.has_non_reimbursement_related_refunds? %>
     <span class="red">
-      <%= Spree.t(:note_already_received_a_refund) %>
+      <%= t('spree.note_already_received_a_refund') %>
     </span>
   <% end %>
   <div class="form-buttons filter-actions actions" data-hook="reimburse-buttons">
     <% if !@reimbursement.reimbursed? %>
       <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'button', method: 'post' } do %>
-        <%= Spree.t(:reimburse) %>
+        <%= t('spree.reimburse') %>
       <% end %>
-      <%= button_link_to Spree.t('actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]) %>
+      <%= button_link_to t('spree.actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]) %>
     <% end %>
   </div>
 </fieldset>

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

@@ -3,7 +3,7 @@
 <% admin_breadcrumb(plural_resource_name(Spree::Reimbursement)) %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_url(@order) %></li>
+  <li><%= button_link_to t('spree.back_to_customer_return_list'), spree.admin_order_customer_returns_url(@order) %></li>
 <% end %>
 
 <%= render partial: 'spree/shared/error_messages', locals: { target: @customer_return } %>
@@ -11,7 +11,7 @@
 <table class="index">
   <thead data-hook="customer_return_header">
     <tr>
-      <th><%= Spree.t(:id) %></th>
+      <th><%= t('spree.id') %></th>
       <th><%= Spree::Reimbursement.human_attribute_name(:total) %></th>
       <th><%= Spree::Reimbursement.human_attribute_name(:reimbursement_status) %></th>
       <th><%= Spree::Reimbursement.human_attribute_name(:created_at) %></th>
@@ -24,9 +24,9 @@
         <td><%= reimbursement.total %></td>
         <td>
           <span class="pill pill-<%= reimbursement.reimbursement_status %>">
-            <%= Spree.t(
+            <%= t(
               reimbursement.reimbursement_status,
-              scope: :reimbursement_states
+              scope: 'spree.reimbursement_states'
             ) %>
           </span>
         </td>

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

@@ -4,13 +4,13 @@
 
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_customer_return), url_for([:edit, :admin, @order, @reimbursement.customer_return]) %></li>
+  <li><%= button_link_to t('spree.back_to_customer_return'), url_for([:edit, :admin, @order, @reimbursement.customer_return]) %></li>
 <% end %>
 
 <%= render partial: 'spree/shared/error_messages', locals: { target: @reimbursement } %>
 
 <fieldset class='no-border-bottom'>
-  <legend align='center'><%= Spree.t(:items_reimbursed) %></legend>
+  <legend align='center'><%= t('spree.items_reimbursed') %></legend>
   <table class="index reimbursement-reimbursement-items">
     <thead>
       <tr>
@@ -73,11 +73,11 @@
 </fieldset>
 
 <fieldset class="no-border-bottom">
-  <legend align='center'><%= Spree.t(:credits) %></legend>
+  <legend align='center'><%= t('spree.credits') %></legend>
   <table class="index reimbursement-credits">
     <thead data-hook="customer_return_header">
       <tr>
-        <th><%= Spree.t(:description) %></th>
+        <th><%= t('spree.description') %></th>
         <th><%= Spree::Reimbursement::Credit.human_attribute_name(:amount) %></th>
       </tr>
     </thead>

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

@@ -1,11 +1,11 @@
-<% admin_breadcrumb(Spree.t(:reports)) %>
+<% admin_breadcrumb(t('spree.reports')) %>
 
 
 <table class="index">
   <thead>
     <tr data-hook="reports_header">
-      <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:description) %></th>
+      <th><%= t('spree.name') %></th>
+      <th><%= t('spree.description') %></th>
     </tr>
   </thead>
   <tbody>

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -1,12 +1,12 @@
-<% admin_breadcrumb(link_to Spree.t(:reports), spree.admin_reports_path) %>
-<% admin_breadcrumb(Spree.t(:sales_total)) %>
+<% admin_breadcrumb(link_to t('spree.reports'), spree.admin_reports_path) %>
+<% admin_breadcrumb(t('spree.sales_total')) %>
 
 <% content_for :page_actions do %>
 <% end %>
 
 
 <% content_for :table_filter_title do %>
-  <%= Spree.t(:date_range) %>
+  <%= t('spree.date_range') %>
 <% end %>
 
 <% content_for :table_filter do %>
@@ -16,10 +16,10 @@
 <table class="admin-report" data-hook="sales_total">
   <thead>
     <tr>
-      <th><%= Spree.t(:currency) %></th>
-      <th><%= Spree.t(:item_total) %></th>
-      <th><%= Spree.t(:adjustment_total) %></th>
-      <th><%= Spree.t(:sales_total) %></th>
+      <th><%= t('spree.currency') %></th>
+      <th><%= t('spree.item_total') %></th>
+      <th><%= t('spree.adjustment_total') %></th>
+      <th><%= t('spree.sales_total') %></th>
     </tr>
   </thead>
   <tbody>

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

@@ -36,7 +36,7 @@
           </td>
           <td class="return-item-state">
             <span class="pill pill-<%= inventory_unit.state %>">
-              <%= Spree.t(inventory_unit.state, scope: :inventory_states) %>
+              <%= t(inventory_unit.state, scope: 'spree.inventory_states') %>
             </span>
           </td>
           <td class="return-item-charged">
@@ -76,12 +76,12 @@
   </table>
 
   <%= f.field_container :amount do %>
-    <%= Spree.t(:total_pre_tax_refund) %>: <span id="total_pre_tax_refund">0.00</span>
+    <%= t('spree.total_pre_tax_refund') %>: <span id="total_pre_tax_refund">0.00</span>
   <% end %>
 
   <%= f.field_container :stock_location do %>
     <%= f.label :stock_location_id, Spree::StockLocation.model_name.human %>
-    <%= f.select :stock_location_id, @stock_locations.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'custom-select fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
+    <%= f.select :stock_location_id, @stock_locations.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'custom-select fullwidth', "data-placeholder" => t('spree.select_a_stock_location')} %>
     <%= f.error_message_on :stock_location_id %>
   <% end %>
 

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

@@ -1,7 +1,7 @@
 <% content_for :page_actions do %>
   <% if @return_authorization.can_cancel? %>
     <li>
-      <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: Spree.t(:are_you_sure) } %>
+      <%= button_link_to t('spree.actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: t('spree.are_you_sure') } %>
     </li>
   <% end %>
 <% end %>
@@ -12,9 +12,9 @@
 <% admin_breadcrumb(
   """
     #{ @return_authorization.number }
-    (#{ Spree.t(
+    (#{ t(
       @return_authorization.state,
-      scope: :return_authorization_states
+      scope: 'spree.return_authorization_states'
     ) })
   """
 ) %>
@@ -27,8 +27,8 @@
 	    <%= render partial: 'form', locals: { f: f } %>
 
       <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button Spree.t('actions.update') %>
-        <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order) %>
+        <%= button t('spree.actions.update') %>
+        <%= button_link_to t('spree.actions.cancel'), admin_order_return_authorizations_url(@order) %>
       </div>
     </fieldset>
 	<% end %>

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

@@ -4,7 +4,7 @@
   <% if @order.shipments.any? &:shipped? %>
     <li>
       <% if can? :create, Spree::ReturnAuthorization %>
-        <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order) %>
+        <%= button_link_to t('spree.new_return_authorization'), new_admin_order_return_authorization_url(@order) %>
       <% end %>
     </li>
   <% end %>
@@ -30,9 +30,9 @@
           <td><%= return_authorization.number %></td>
           <td>
             <span class="pill pill-<%= return_authorization.state %>">
-              <%= Spree.t(
+              <%= t(
                 return_authorization.state,
-                scope: :return_authorization_states
+                scope: 'spree.return_authorization_states'
               ) %>
             </span>
           </td>
@@ -52,6 +52,6 @@
   </table>
 <% else %>
   <div data-hook="rma_cannot_create" class="no-objects-found">
-    <%= Spree.t(:cannot_create_returns) %>
+    <%= t('spree.cannot_create_returns') %>
   </div>
 <% end %>

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

@@ -1,7 +1,7 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Return Authorizations' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::ReturnAuthorization), spree.admin_order_return_authorizations_url) %>
-<% admin_breadcrumb(Spree.t(:new_return_authorization)) %>
+<% admin_breadcrumb(t('spree.new_return_authorization')) %>
 
 
 <% content_for :page_actions do %>
@@ -13,8 +13,8 @@
     <%= render partial: 'form', locals: { f: f } %>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:'actions.create') %>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order) %>
+      <%= button t('spree.actions.create') %>
+      <%= button_link_to t('spree.actions.cancel'), admin_order_return_authorizations_url(@order) %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,5 +1,5 @@
 <%= render partial: 'spree/admin/shared/named_types/edit', locals: {
-  root_tab: Spree.t(:settings),
-  sub_tab: Spree.t('admin.tab.checkout'),
+  root_tab: t('spree.settings'),
+  sub_tab: t('spree.admin.tab.checkout'),
   index_link: link_to(plural_resource_name(Spree::ReturnReason), spree.admin_return_reasons_path),
 } %>

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

@@ -1,7 +1,7 @@
 <%= render partial: 'spree/admin/shared/named_types/index', locals: {
-  root_tab: Spree.t(:settings),
-  sub_tab: Spree.t('admin.tab.checkout'),
+  root_tab: t('spree.settings'),
+  sub_tab: t('spree.admin.tab.checkout'),
   page_title: plural_resource_name(Spree::ReturnReason),
-  new_button_text: Spree.t(:new_rma_reason),
+  new_button_text: t('spree.new_rma_reason'),
   resource: Spree::ReturnReason
 } %>

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

@@ -1,6 +1,6 @@
 <%= render partial: 'spree/admin/shared/named_types/new', locals: {
-  root_tab: Spree.t(:settings),
-  sub_tab: Spree.t('admin.tab.checkout'),
+  root_tab: t('spree.settings'),
+  sub_tab: t('spree.admin.tab.checkout'),
   index_link: link_to(plural_resource_name(Spree::ReturnReason), spree.admin_return_reasons_path),
-  new_object: Spree.t(:new_rma_reason),
+  new_object: t('spree.new_rma_reason'),
 } %>