spree_core 0.70.0.rc2 → 0.70.0

data/app/views/admin/shared/_report_criteria.html.erb

@@ -1,15 +1,15 @@
 <%= form_for @search, :url => sales_total_admin_reports_path  do |s| %>
-    <label><%= t("date_range") %></label><br />
+    <%= label_tag nil, t(:date_range) %><br />
     <div class="date-range-filter">
       <div class="left sub-field">
         <%= s.text_field :created_at_greater_than, :class => 'datepicker' %><br />
-        <label class="sub"><%= t("start") %></label>
+        <%= label_tag nil, t(:start), :class => 'sub' %>
       </div>
       <div class="right sub-field">
         <%= s.text_field :created_at_less_than, :class => 'datepicker' %><br />
-        <label><%= t("stop") %></label>
+        <%= label_tag nil, t(:stop) %>
       </div>
     </div>
 
-    <p><%= button t("search") %></p>
+    <p><%= button t(:search) %></p>
 <% end %>

data/app/views/admin/shared/_show_resource_links.html.erb

@@ -1,5 +1,5 @@
 <p class="actions" data-hook="actions">
-<%= link_to t("edit"), edit_object_url %> |
-<%= link_to t("back"), collection_url %> |
-<%= link_to t("delete"), object_url, :confirm => t('are_you_sure_you_want_to_delete_this_record'), :method => :delete %>
+<%= link_to t(:edit), edit_object_url %> |
+<%= link_to t(:back), collection_url %> |
+<%= link_to t(:delete), object_url, :confirm => t(:are_you_sure_you_want_to_delete_this_record), :method => :delete %>
 </p>

data/app/views/admin/shared/_update_order_state.js

@@ -1,6 +1,6 @@
-$('#order_tab_summary h5#order_status').html('<%= "#{t('status')}: #{t("order_state.#{@order.state}")}" %>');
-$('#order_tab_summary h5#order_total').html('<%= "#{t('total')}: #{number_to_currency(@order.total)}" %>');
+$('#order_tab_summary h5#order_status').html('<%= "#{t(:status)}: #{t("order_state.#{@order.state}")}" %>');
+$('#order_tab_summary h5#order_total').html('<%= "#{t(:total)}: #{number_to_currency @order.total}" %>');
 <% if @order.completed? %>
-$('#order_tab_summary h5#payment_status').html('<%= "#{t('payment')}: #{t("payment_states.#{@order.payment_state}")}"  %>');
-$('#order_tab_summary h5#shipment_status').html('<%= "#{t('shipment')}: #{t("shipment_states.#{@order.shipment_state}")}"  %>');
+$('#order_tab_summary h5#payment_status').html('<%= "#{t(:payment)}: #{t("payment_states.#{@order.payment_state}")}"  %>');
+$('#order_tab_summary h5#shipment_status').html('<%= "#{t(:shipment)}: #{t("shipment_states.#{@order.shipment_state}")}"  %>');
 <% end %>

data/app/views/admin/shipments/_form.html.erb

@@ -1,11 +1,11 @@
 <% unless @shipment.order.cart? %>
   <table class="index" style="width:100%;" data-hook="admin_shipment_form_inventory_units">
     <tr data-hook="shipments_header">
-      <th width="130px"><%= t('include_in_shipment') %></th>
-      <th><%= t('sku') %></th>
-      <th><%= t('item_description') %></th>
-      <th><%= t('status') %></th>
-      <th><%= t('note') %></th>
+      <th style="width:130px;"><%= t(:include_in_shipment) %></th>
+      <th><%= t(:sku) %></th>
+      <th><%= t(:item_description) %></th>
+      <th><%= t(:status) %></th>
+      <th><%= t(:note) %></th>
     </tr>
 
     <% @shipment.order.inventory_units.each do |inventory_unit| %>
@@ -17,17 +17,17 @@
                             { :disabled => %w(shipped backordered returned).include?(inventory_unit.state),
                               :class => 'inventory_unit'} %>
         </td>
-        <td valign="top" width="120px;"><%= inventory_unit.variant.sku %></td>
-        <td width="300">
+        <td style="vertical-align:top; width:120px;"><%= inventory_unit.variant.sku %></td>
+        <td style="width:300px;">
           <%=inventory_unit.variant.product.name %>
-          <%= "(" + variant_options(inventory_unit.variant) + ")" unless inventory_unit.variant.option_values.empty? %>
+          <%= '(' + variant_options(inventory_unit.variant) + ')' unless inventory_unit.variant.option_values.empty? %>
         </td>
         <td><%= t(inventory_unit.state) %></td>
         <td>
           <% if inventory_unit.shipment == @shipment %>
-            <%= t('included_in_this_shipment') %>
+            <%= t(:included_in_this_shipment) %>
           <% elsif !inventory_unit.shipment.nil? %>
-            <%= t('included_in_other_shipment') %> - <%= link_to inventory_unit.shipment.number, edit_admin_order_shipment_url(inventory_unit.order, inventory_unit.shipment) %>
+            <%= t(:included_in_other_shipment) %> - <%= link_to inventory_unit.shipment.number, edit_admin_order_shipment_url(inventory_unit.order, inventory_unit.shipment) %>
           <% end %>
         </td>
       </tr>
@@ -37,32 +37,32 @@
 
 <div data-hook="admin_shipment_form_address">
   <% shipment_form.fields_for 'address' do |sa_form|  %>
-    <%= render :partial => 'admin/shared/address_form', :locals => {:f => sa_form, :name => t("shipping_address"), :use_billing => false} %>
+    <%= render :partial => 'admin/shared/address_form', :locals => {:f => sa_form, :name => t(:shipping_address), :use_billing => false} %>
   <% end %>
 </div>
 
 <div data-hook="admin_shipment_form_details">
   <table class="index">
     <tr>
-      <th colspan="8"><%= t("shipment_details") %></th>
+      <th colspan="8"><%= t(:shipment_details) %></th>
     </tr>
     <tr>
       <td>
-        <%= shipment_form.label :shipping_method_id, t('shipping_method') + ":" %>
+        <%= shipment_form.label :shipping_method_id, t(:shipping_method) + ':' %>
       </td>
       <td>
         <%= shipment_form.select :shipping_method_id,
                                         @shipping_methods.map {|sm| ["#{sm.name} - #{sm.zone.name}", sm.id] } %>
       </td>
       <td>
-        <%= shipment_form.label :tracking, t('tracking') + ":" %>
+        <%= shipment_form.label :tracking, t(:tracking) + ':' %>
       </td>
       <td><%= shipment_form.text_field :tracking %></td>
     </tr>
     <% if Spree::Config[:shipping_instructions] %>
       <tr>
         <td>
-          <%= shipment_form.label :special_instructions, t('special_instructions') + ":" %>
+          <%= shipment_form.label :special_instructions, t(:special_instructions) + ':' %>
         </td>
         <td colspan="3">
             <%= shipment_form.text_area :special_instructions %>

data/app/views/admin/shipments/edit.html.erb

@@ -2,35 +2,35 @@
   <ul class="actions" data-hook="admin_shipment_edit_buttons">
     <li>
       <% if @shipment.can_ship? %>
-        <%= button_link_to(t('ship'), fire_admin_order_shipment_path(@order, @shipment, :e => 'ship'), :method => :put, :confirm => t("are_you_sure")) %>
+        <%= button_link_to t(:ship), fire_admin_order_shipment_path(@order, @shipment, :e => 'ship'), :method => :put, :confirm => t(:are_you_sure) %>
       <% end %>
     </li>
   </ul>
-  <br class='clear' />
+  <br class="clear" />
 </div>
 
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Shipments"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Shipments'} %>
 
 <div data-hook="admin_shipment_edit_header">
-  <h2><%= t('shipment') %> #<%= @shipment.number%> (<%= t(@shipment.state.to_sym, :scope => :state_names, :default => @shipment.state.to_s.humanize) %>)</h2>
+  <h2><%= t(:shipment) %> #<%= @shipment.number%> (<%= t(@shipment.state.to_sym, :scope => :state_names, :default => @shipment.state.to_s.humanize) %>)</h2>
   <% if @shipment.cost %>
-    <h3><%= t('charges') %> <%= number_to_currency @shipment.cost %></h3>
+    <h3><%= t(:charges) %> <%= number_to_currency @shipment.cost %></h3>
   <% end %>
 
-  <%= render "shared/error_messages", :target => @shipment %>
+  <%= render 'shared/error_messages', :target => @shipment %>
 </div>
 
 <div data-hook="admin_shipment_edit_form">
-  <%= form_for(@shipment, :url => admin_order_shipment_path(@order, @shipment), :html => { :method => :put }) do |shipment_form| %>
-      <%= render :partial => "form", :locals => { :shipment_form => shipment_form } %>
+  <%= form_for @shipment, :url => admin_order_shipment_path(@order, @shipment), :html => { :method => :put } do |shipment_form| %>
+      <%= render :partial => 'form', :locals => { :shipment_form => shipment_form } %>
 
       <div data-hook="admin_shipment_edit_form_buttons">
         <p class="form-buttons">
           <% if self.respond_to?(:current_user) && @shipment.editable_by?(current_user) %>
-            <%= button @order.cart? ? t('continue') : t('update') %>
-            <%= t("or") %> <%= link_to t("cancel"), admin_order_shipments_path(@order) %>
+            <%= button @order.cart? ? t(:continue) : t(:update) %>
+            <%= t(:or) %> <%= link_to t(:cancel), admin_order_shipments_path(@order) %>
           <% else %>
-            <%= link_to raw("&laquo; #{t("back")}"), edit_admin_order_shipment_path(@order) %>
+            <%= link_to raw("&laquo; #{t(:back)}"), edit_admin_order_shipment_path(@order) %>
           <% end %>
         </p>
       </div>

data/app/views/admin/shipments/index.html.erb

@@ -1,22 +1,22 @@
 <div class="toolbar" data-hook="toolbar">
   <ul class="actions">
     <li id='new_shipment_section'>
-      <%= button_link_to t("new_shipment"), new_admin_order_shipment_url(@order), :icon => 'add'  %>
+      <%= button_link_to t(:new_shipment), new_admin_order_shipment_url(@order), :icon => 'add' %>
     </li>
   </ul>
-  <br class='clear' />
+  <br class="clear" />
 </div>
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Shipments"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Shipments'} %>
 <table class="index">
   <tr data-hook="admin_shipments_index_headers">
-    <th><%= t("shipment_number") %></th>
-    <th><%= t("shipping_method") %></th>
-    <th><%= t("shipping_cost") %></th>
-    <th><%= t("tracking") %></th>
-    <th><%= t("status") %></th>
+    <th><%= t(:shipment_number) %></th>
+    <th><%= t(:shipping_method) %></th>
+    <th><%= t(:shipping_cost) %></th>
+    <th><%= t(:tracking) %></th>
+    <th><%= t(:status) %></th>
     <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
     <th data-hook="admin_shipments_index_header_actions">
-      <%= t("action") %>
+      <%= t(:action) %>
     </th>
   </tr>
   <% @shipments.each do |shipment| %>
@@ -28,11 +28,11 @@
       <td><%= t(shipment.state.to_sym, :scope => :state_names, :default => shipment.state.to_s.humanize) %></td>
       <td><%= shipment.shipped_at.to_s(:date_time24) if shipment.shipped_at %></td>
       <td class="actions" data-hook="admin_shipments_index_row_actions">
-        <%= link_to_with_icon 'edit', t('edit'), edit_admin_order_shipment_url(@order, shipment) %>
+        <%= link_to_with_icon 'edit', t(:edit), edit_admin_order_shipment_url(@order, shipment) %>
         <%= link_to_delete shipment, :url => admin_order_shipment_url(@order, shipment) %>
       </td>
     </tr>
   <% end %>
 </table>
 
-<%= button_link_to t('continue'), admin_orders_url %>
+<%= button_link_to t(:continue), admin_orders_url %>

data/app/views/admin/shipments/new.html.erb

@@ -1,17 +1,17 @@
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Shipments"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Shipments'} %>
 
 <div data-hook="admin_shipment_new_header">
-  <h1><%= t('new_shipment')%></h1>
-  <%= render "shared/error_messages", :target => @shipment %>
+  <h1><%= t(:new_shipment) %></h1>
+  <%= render 'shared/error_messages', :target => @shipment %>
 </div>
 
 <div data-hook="admin_shipment_new_form">
-  <%= form_for(@shipment, :url => admin_order_shipments_path(@order)) do |shipment_form| %>
-    <%= render :partial => "form", :locals => { :shipment_form => shipment_form } %>
+  <%= form_for @shipment, :url => admin_order_shipments_path(@order) do |shipment_form| %>
+    <%= render :partial => 'form', :locals => { :shipment_form => shipment_form } %>
 
     <div data-hook="admin_shipment_new_form_buttons">
       <p class="form-buttons">
-        <%= button t('create') %>
+        <%= button t(:create) %>
       </p>
     </div>
   <% end %>

data/app/views/admin/shipping_categories/_form.html.erb

@@ -1,6 +1,6 @@
 <table data-hook="name">
 	<tr>
-    <td><%=t("name")%>:</td>
-    <td><%= f.text_field :name, {"style" => "width:200px"} %></td>
+    <td><%= t(:name) %>:</td>
+    <td><%= f.text_field :name, {'style' => 'width:200px'} %></td>
   </tr>
 </table>

data/app/views/admin/shipping_categories/edit.html.erb

@@ -1,6 +1,6 @@
-<h1><%= t("editing_shipping_category") %></h1>
+<h1><%= t(:editing_shipping_category) %></h1>
 <%= render 'shared/error_messages', :target => @shipping_category %>
-<%= form_for([:admin, @shipping_category]) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <%= render :partial => "admin/shared/edit_resource_links" %>
+<%= form_for [:admin, @shipping_category] do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'admin/shared/edit_resource_links' %>
 <% end %>

data/app/views/admin/shipping_categories/index.html.erb

@@ -1,27 +1,27 @@
 <div class="toolbar" data-hook="toolbar">
   <ul class="actions">
     <li>
-      <%= button_link_to t("new_shipping_category"), new_object_url, :icon => 'add'  %>
+      <%= button_link_to t(:new_shipping_category), new_object_url, :icon => 'add'  %>
     </li>
   </ul>
-  <br class="clear">
+  <br class="clear" />
 </div>
 
-<h1><%=t("shipping_categories") %></h1>
+<h1><%= t(:shipping_categories) %></h1>
 <table class="index">
   <thead>
     <tr data-hook="categories_header">
-      <th><%= t("name") %></th>
-      <th><%= t("action") %></th>
+      <th><%= t(:name) %></th>
+      <th><%= t(:action) %></th>
     </tr>
   </thead>
   <tbody>
     <% @shipping_categories.each do |shipping_category|%>
     <tr id="<%= dom_id shipping_category %>" data-hook="category_row">
-      <td width="350px"><%= shipping_category.name %></td>
+      <td style="width:350px;"><%= shipping_category.name %></td>
       <td>
-      	<%= link_to_edit shipping_category %> &nbsp;
-      	<%= link_to_delete shipping_category %>
+        <%= link_to_edit shipping_category %> &nbsp;
+        <%= link_to_delete shipping_category %>
       </td>
     </tr>
     <% end %>

data/app/views/admin/shipping_categories/new.html.erb

@@ -1,8 +1,8 @@
-<h1><%= t("new_shipping_category") %></h1>
+<h1><%= t(:new_shipping_category) %></h1>
 
 <%= render 'shared/error_messages', :target => @shipping_category %>
 
-<%= form_for([:admin, @shipping_category]) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <%= render :partial => "admin/shared/new_resource_links" %>
+<%= form_for [:admin, @shipping_category] do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'admin/shared/new_resource_links' %>
 <% end %>

data/app/views/admin/shipping_methods/_form.html.erb

@@ -1,18 +1,18 @@
 <div data-hook="admin_shipping_method_form_fields">
   <%= f.field_container :name do %>
-    <%= f.label :name, t("name") %><br />
+    <%= f.label :name, t(:name) %><br />
     <%= f.text_field :name  %>
     <%= error_message_on :shipping_method, :name %>
   <% end %>
 
   <%= f.field_container :zone_id do %>
-    <%= f.label :zone_id, t("zone") %><br />
-    <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, {"style" => "width:200px"})  %>
+    <%= f.label :zone_id, t(:zone) %><br />
+    <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, {'style' => 'width:200px;'})  %>
     <%= error_message_on :shipping_method, :zone_id %>
   <% end %>
 
   <%= f.field_container :display_on do %>
-    <%= f.label :display_on, t("display") %><br />
+    <%= f.label :display_on, t(:display) %><br />
     <%= select(:shipping_method, :display_on, ShippingMethod::DISPLAY.collect {|display| [t(display), display == :both ? nil : display.to_s]})  %>
     <%= error_message_on :shipping_method, :display_on %>
   <% end %>
@@ -20,6 +20,6 @@
 </div>
 
 <div data-hook="admin_shipping_method_form_calculator_fields">
-  <%= render "admin/shared/calculator_fields", :f => f %>
+  <%= render 'admin/shared/calculator_fields', :f => f %>
 </div>
 

data/app/views/admin/shipping_methods/edit.html.erb

@@ -1,16 +1,16 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
 <div data-hook="admin_shipping_method_edit_form_header">
-  <h1><%= t("editing_shipping_method") %></h1>
-  <%= render "shared/error_messages", :target => @shipping_method %>
+  <h1><%= t(:editing_shipping_method) %></h1>
+  <%= render 'shared/error_messages', :target => @shipping_method %>
 </div>
 
 <div data-hook="admin_shipping_method_edit_form">
-  <%= form_for([:admin, @shipping_method]) do |f| %>
-    <%= render :partial => "form", :locals => { :f => f } %>
+  <%= form_for [:admin, @shipping_method] do |f| %>
+    <%= render :partial => 'form', :locals => { :f => f } %>
 
     <div data-hook="admin_shipping_method_edit_form_buttons">
-      <%= render :partial => "admin/shared/edit_resource_links" %>
+      <%= render :partial => 'admin/shared/edit_resource_links' %>
     </div>
   <% end %>
 </div>

data/app/views/admin/shipping_methods/index.html.erb

@@ -3,22 +3,21 @@
 <div class="toolbar" data-hook="toolbar">
   <ul class="actions">
     <li>
-      <%= button_link_to t("new_shipping_method"), new_object_url,  :icon => 'add',
-                                                                    :id => 'admin_new_shipping_method_link' %>
+      <%= button_link_to t(:new_shipping_method), new_object_url,  :icon => 'add', :id => 'admin_new_shipping_method_link' %>
     </li>
   </ul>
-  <br class="clear">
+  <br class="clear" />
 </div>
 
-<h1><%= t("shipping_methods") %></h1>
+<h1><%= t(:shipping_methods) %></h1>
 
 <table class="index" id='listing_shipping_methods'>
   <thead>
     <tr data-hook="admin_shipping_methods_index_headers">
-      <th><%= t("name") %></th>
-      <th><%= t("zone") %></th>
-      <th><%= t("calculator") %></th>
-      <th><%= t("display") %></th>
+      <th><%= t(:name) %></th>
+      <th><%= t(:zone) %></th>
+      <th><%= t(:calculator) %></th>
+      <th><%= t(:display) %></th>
       <th data-hook="admin_shipping_methods_index_header_actions"></th>
     </tr>
   </thead>
@@ -28,8 +27,8 @@
         <td><%= shipping_method.name %></td>
         <td><%= shipping_method.zone.name if shipping_method.zone %></td>
         <td><%= shipping_method.calculator.description %></td>
-        <td><%= shipping_method.display_on.blank? ? t('both') : t(shipping_method.display_on) %></td>
-        <td width="140px" data-hook="admin_shipping_methods_index_row_actions">
+        <td><%= shipping_method.display_on.blank? ? t(:both) : t(shipping_method.display_on) %></td>
+        <td style="width:140px;" data-hook="admin_shipping_methods_index_row_actions">
           <%= link_to_edit shipping_method %> &nbsp;
           <%= link_to_delete shipping_method %>
         </td>

data/app/views/admin/shipping_methods/new.html.erb

@@ -1,17 +1,17 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
 <div data-hook="admin_shipping_method_new_form_header">
-  <h1><%= t("new_shipping_method") %></h1>
+  <h1><%= t(:new_shipping_method) %></h1>
 
   <%= render 'shared/error_messages', :target => @shipping_method %>
 </div>
 
 <div data-hook="admin_shipping_method_new_form">
-  <%= form_for([:admin, @shipping_method]) do |f| %>
-    <%= render :partial => "form", :locals => { :f => f } %>
+  <%= form_for [:admin, @shipping_method] do |f| %>
+    <%= render :partial => 'form', :locals => { :f => f } %>
 
     <div data-hook="admin_shipping_method_new_form_buttons">
-      <%= render :partial => "admin/shared/new_resource_links" %>
+      <%= render :partial => 'admin/shared/new_resource_links' %>
     </div>
   <% end %>
 </div>

data/app/views/admin/states/_form.html.erb

@@ -1,9 +1,9 @@
 <%= f.field_container :name do %>
-  <%= f.label :name, t("name") %><br />
-  <%=f.text_field :name %>
+  <%= f.label :name, t(:name) %><br />
+  <%= f.text_field :name %>
 <% end %>
 
 <%= f.field_container :abbr do %>
-  <%= f.label :abbr, t("abbreviation") %><br />
+  <%= f.label :abbr, t(:abbreviation) %><br />
   <%= f.text_field :abbr %>
 <% end %>

data/app/views/admin/states/_state_list.html.erb

@@ -1,8 +1,8 @@
 <table class="index" id='listing_states' data-hook>
   <thead>
     <tr data-hook="states_header">
-      <th><%= t("name") %></th>
-      <th><%= t("abbreviation") %></th>
+      <th><%= t(:name) %></th>
+      <th><%= t(:abbreviation) %></th>
       <th></th>
     </tr>
   </thead>
@@ -12,10 +12,10 @@
          @delete_url = admin_country_state_path(@country, state)
     %>
       <tr id="<%= dom_id state %>" data-hook="states_row">
-        <td><%=state.name %></td>
-        <td><%=state.abbr %></td>
+        <td><%= state.name %></td>
+        <td><%= state.abbr %></td>
         <td class="actions">
-          <%= link_to_with_icon 'edit', t("edit"), edit_admin_country_state_url(@country, state), :class => 'edit' %>
+          <%= link_to_with_icon 'edit', t(:edit), edit_admin_country_state_url(@country, state), :class => 'edit' %>
           &nbsp;
           <%= link_to_delete state %>
         </td>
@@ -28,7 +28,5 @@
 </table>
 <div id="new_state" data-hook></div>
 <p data-hook="buttons">
-  <%= button_link_to t("new_state"), new_admin_country_state_url(@country), {:remote => true,
-                                                                             :icon => 'add',
-                                                                             :id => 'new_state_link'} %>
+  <%= button_link_to t(:new_state), new_admin_country_state_url(@country), {:remote => true, :icon => 'add', :id => 'new_state_link'} %>
 </p>