Standardizing 'Order #' display

Fixes #2581
spree · Jan 20, 2014 · 284dd45 · 284dd45
1 parent 2c7c131
commit 284dd45
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/backend/app/views/spree/admin/orders/index.html.erb b/backend/app/views/spree/admin/orders/index.html.erb
@@ -38,7 +38,7 @@
 
       <div class="four columns">
         <div class="field">
-          <%= label_tag nil, Spree.t(:order_number) %>
+          <%= label_tag nil, Spree.t(:order_number, :number => '') %>
           <%= f.text_field :number_cont %>
         </div>
         <div class="field">

diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
@@ -772,7 +772,7 @@ en:
         thanks: Thank you for your business.
         total: ! 'Order Total: %{total}'
     order_not_found: We couldn't find your order. Please try that action again.
-    order_number: Order
+    order_number: Order %{number}
     order_populator:
       out_of_stock: ! '%{item} is out of stock.'
       selected_quantity_not_available: ! 'Selected quantity of %{item} is not available.'

diff --git a/frontend/app/controllers/spree/orders_controller.rb b/frontend/app/controllers/spree/orders_controller.rb
@@ -62,7 +62,11 @@ def empty
     end
 
     def accurate_title
-      @order && @order.completed? ? "#{Spree.t(:order)} #{@order.number}" : Spree.t(:shopping_cart)
+      if @order && @order.completed?
+        Spree.t(:order_number, :number => @order.number)
+      else
+        Spree.t(:shopping_cart)
+      end
     end
 
     def check_authorization

diff --git a/frontend/app/views/spree/orders/show.html.erb b/frontend/app/views/spree/orders/show.html.erb
@@ -1,5 +1,5 @@
 <fieldset id="order_summary" data-hook>
-  <legend><%= t(:order) + " #" + @order.number %></legend>
+  <legend><%= Spree.t(:order_number, :number => @order.number) %></legend>
   <h1><%= accurate_title %></h1>
 
   <div id="order" data-hook>