shoppe 1.0.2 → 1.0.3

data/app/views/shoppe/delivery_services/index.html.haml

@@ -1,28 +1,27 @@
-- @page_title = "Delivery Services"
+- @page_title = t('shoppe.delivery_services.delivery_services')
 
 = content_for :header do
-  %p.buttons= link_to "New delivery service", :new_delivery_service, :class => 'button green'
-  %h2.delivery_services Delivery Services
-  
+  %p.buttons= link_to t('shoppe.delivery_services.new'), :new_delivery_service, :class => 'button green'
+  %h2.delivery_services= t('shoppe.delivery_services.delivery_services')
+
 .table
   %table.data
     %thead
       %tr
-        %th Name
-        %th Prices
-        %th Courier
-        %th Active?
-        %th Default?
+        %th= t('shoppe.delivery_services.name')
+        %th= t('shoppe.delivery_services.prices')
+        %th= t('shoppe.delivery_services.courier')
+        %th= t('shoppe.delivery_services.active?')
+        %th= t('shoppe.delivery_services.default?')
     %tbody
       - if @delivery_services.empty?
         %tr.empty
-          %td{:colspan => 5} No delivery services to display.
+          %td{:colspan => 5}= t('shoppe.delivery_services.no_services')
       - else
         - for delivery_service in @delivery_services
           %tr
             %td= link_to delivery_service.name, [:edit, delivery_service]
-            %td= link_to "Set Prices", [delivery_service, :delivery_service_prices]
+            %td= link_to t('shoppe.delivery_services.set_prices'), [delivery_service, :delivery_service_prices]
             %td= delivery_service.courier
             %td= boolean_tag delivery_service.active?
             %td= boolean_tag delivery_service.default?
-          

data/app/views/shoppe/delivery_services/new.html.haml

@@ -1,5 +1,6 @@
-- @page_title = "Delivery Services"
+- @page_title = t('shoppe.delivery_services.delivery_services')
+
 = content_for :header do
-  %p.buttons= link_to "Back to delivery services", :delivery_services, :class => 'button'
-  %h2.delivery_services Delivery Services
-= render 'form'
+  %p.buttons= link_to t('shoppe.delivery_services.back'), :delivery_services, :class => 'button'
+  %h2.delivery_services= t('shoppe.delivery_services.delivery_services')
+= render 'form'

data/app/views/shoppe/orders/_form.html.haml

@@ -1,55 +1,55 @@
-= field_set_tag "Billing Address" do
+= field_set_tag t('shoppe.orders.billing_address') do
   .splitContainer
     %dl.third
-      %dt= f.label :first_name
+      %dt= f.label :first_name, t('shoppe.orders.first_name')
       %dd= f.text_field :first_name, :class => 'focus text'
     %dl.third
-      %dt= f.label :last_name
+      %dt= f.label :last_name, t('shoppe.orders.last_name')
       %dd= f.text_field :last_name, :class => 'text'
     %dl.third
-      %dt= f.label :company
+      %dt= f.label :company, t('shoppe.orders.company')
       %dd= f.text_field :company, :class => 'text'
   %dl
-    %dt= f.label :billing_address1, "Address"
+    %dt= f.label :billing_address1, t('shoppe.orders.address')
     %dd.space= f.text_field :billing_address1, :class => 'text'
     %dd.space= f.text_field :billing_address2, :class => 'text'
     %dd.space= f.text_field :billing_address3, :class => 'text'
     %dd.space= f.text_field :billing_address4, :class => 'text'
   .splitContainer
     %dl.half
-      %dt= f.label :billing_postcode, "Post code"
+      %dt= f.label :billing_postcode, t('shoppe.orders.post_code')
       %dd= f.text_field :billing_postcode, :class => 'text'
     %dl.half
-      %dt= f.label :billing_country_id, "Country"
-      %dd= f.collection_select :billing_country_id, Shoppe::Country.ordered, :id, :name, {:include_blank => true}, {:data => {:placeholder => 'Select a country'}}
-  
+      %dt= f.label :billing_country_id, t('shoppe.orders.country')
+      %dd= f.collection_select :billing_country_id, Shoppe::Country.ordered, :id, :name, {:include_blank => true}, {:data => {:placeholder => t('shoppe.orders.select_country')}}
+
   .splitContainer
     %dl.third
-      %dt= f.label :email_address
+      %dt= f.label :email_address, t('shoppe.orders.email_address')
       %dd= f.text_field :email_address, :class => 'text'
     %dl.third
-      %dt= f.label :phone_number
+      %dt= f.label :phone_number, t('shoppe.orders.phone_number')
       %dd= f.text_field :phone_number, :class => 'text'
     %dl.third
-      %dt= f.label :separate_delivery_address
+      %dt= f.label :separate_delivery_address, t('shoppe.orders.separate_delivery_address')
       %dd.checkbox
         = f.check_box :separate_delivery_address
-        = f.label :separate_delivery_address, "Use a seperate delivery address?"
+        = f.label :separate_delivery_address, t('shoppe.orders.use_separate_delivery_address?')
 
-= field_set_tag "Deilvery Address", :class => 'delivery' do
+= field_set_tag t('shoppe.orders.delivery_address'), :class => 'delivery' do
   %dl
-    %dt= f.label :delivery_name
+    %dt= f.label :delivery_name, t('shoppe.orders.delivery_name')
     %dd= f.text_field :delivery_name, :class => 'text'
   %dl
-    %dt= f.label :delivery_address1, "Address"
+    %dt= f.label :delivery_address1, t('shoppe.orders.address')
     %dd.space= f.text_field :delivery_address1, :class => 'text'
     %dd.space= f.text_field :delivery_address2, :class => 'text'
     %dd.space= f.text_field :delivery_address3, :class => 'text'
     %dd.space= f.text_field :delivery_address4, :class => 'text'
   .splitContainer
     %dl.half
-      %dt= f.label :delivery_postcode, "Post code"
+      %dt= f.label :delivery_postcode, t('shoppe.orders.post_code')
       %dd= f.text_field :delivery_postcode, :class => 'text'
     %dl.half
-      %dt= f.label :delivery_country_id, "Country"
-      %dd= f.collection_select :delivery_country_id, Shoppe::Country.ordered, :id, :name, {:include_blank => true}, {:data => {:placeholder => 'Select a country'}}
+      %dt= f.label :delivery_country_id, t('shoppe.orders.country')
+      %dd= f.collection_select :delivery_country_id, Shoppe::Country.ordered, :id, :name, {:include_blank => true}, {:data => {:placeholder => t('shoppe.orders.select_country')}}

data/app/views/shoppe/orders/_order_details.html.haml

@@ -1,11 +1,16 @@
 .details
   .left
     %dl
-      %dt Name
+      %dt= t('shoppe.orders.name')
       %dd= @order.full_name
-      %dt Company
+      %dt= t('shoppe.orders.company')
       %dd= @order.company.blank? ? '-' : @order.company
-      %dt Billing#{@order.separate_delivery_address? ? '' : '/Delivery'} Address
+      %dt
+        - if @order.separate_delivery_address?
+          = t('shoppe.orders.billing_address')
+        - else
+          = t('shoppe.orders.billing_delivery_address')
+
       %dd= @order.billing_address1
       %dd= @order.billing_address2
       %dd= @order.billing_address3
@@ -13,7 +18,7 @@
       %dd= @order.billing_postcode
       %dd= @order.billing_country.try(:name)
       - if @order.separate_delivery_address?
-        %dt Delivery Address
+        %dt= t('shoppe.orders.delivery_address')
         %dd= @order.delivery_name
         %dd= @order.delivery_address1
         %dd= @order.delivery_address2
@@ -23,30 +28,30 @@
         %dd= @order.delivery_country.try(:name)
   .right
     %dl
-      %dt E-Mail Address
+      %dt= t('shoppe.orders.email_address')
       %dd= mail_to @order.email_address
-      %dt Telephone
+      %dt= t('shoppe.orders.telephone')
       %dd= @order.phone_number
-      %dt Weight
+      %dt= t('shoppe.orders.weight')
       %dd= number_to_weight @order.total_weight
       - if @order.received?
-        %dt Build Time
+        %dt= t('shoppe.orders.build_time')
         %dd= distance_of_time_in_words(@order.created_at, @order.received_at)
       - if @order.invoiced?
-        %dt Invoice Number
+        %dt= t('shoppe.orders.invoice_number')
         %dd= @order.invoice_number
-      %dt Order Balance
+      %dt= t('shoppe.orders.order_balance')
       %dd= boolean_tag @order.paid_in_full?, nil, :true_text => number_to_currency(@order.balance), :false_text => number_to_currency(@order.balance)
     - if @order.accepted? && !@order.shipped?
       = form_tag [:ship, @order] do
         %dl.form
-          %dt.padding= label_tag 'consignment_number', 'Consignment Number'
+          %dt.padding= label_tag 'consignment_number', t('shoppe.orders.consignment_number')
           %dd= text_field_tag 'consignment_number', '', :class => 'text'
         %dl.form
-          %dd= submit_tag "Mark as shipped", :class => 'button green button-mini'
-    
+          %dd= submit_tag t('shoppe.orders.mark_as_shipped') , :class => 'button green button-mini'
+
     - unless @order.accepted? || @order.rejected?
       %dl.form
         %dd
-          = link_to "Accept", [:accept, @order], :method => :post, :class => 'button green'
-          = link_to "Reject", [:reject, @order], :method => :post, :class => 'button purple'
+          = link_to t('shoppe.orders.accept'), [:accept, @order], :method => :post, :class => 'button green'
+          = link_to t('shoppe.orders.reject'), [:reject, @order], :method => :post, :class => 'button purple'

data/app/views/shoppe/orders/_order_items.html.haml

@@ -3,13 +3,13 @@
     %table.data
       %thead
         %tr
-          %th.qty Qty
-          %th Item
-          %th SKU
-          %th.money Cost
-          %th.money Price
+          %th.qty= t('shoppe.orders.qty')
+          %th= t('shoppe.orders.item')
+          %th= t('shoppe.orders.sku')
+          %th.money= t('shoppe.orders.cost')
+          %th.money= t('shoppe.orders.price')
           %th.money= Shoppe.settings.tax_name
-          %th.money Sub-Total
+          %th.money= t('shoppe.orders.sub_total')
       %tbody
         - for item in @order.order_items
           %tr

data/app/views/shoppe/orders/_order_items_form.html.haml

@@ -1,19 +1,19 @@
 %table.data.orderItems
   %thead
     %tr
-      %th.product Product
-      %th.qty Quantity
-      %th.stock Stock
-      %th.price Unit Price
-      %th.tax Tax
-      %th.total Sub-Total
-      %th.weight Weight
+      %th.product= t('shoppe.orders.product')
+      %th.qty= t('shoppe.orders.quantity')
+      %th.stock= t('shoppe.orders.stock')
+      %th.price= t('shoppe.orders.unit_price')
+      %th.tax= t('shoppe.orders.tax')
+      %th.total= t('shoppe.orders.sub_total')
+      %th.weight= t('shoppe.orders.weight')
   %tbody
     - products = Shoppe::Product.ordered
     = f.fields_for :order_items do |of|
       = of.hidden_field :ordered_item_type
       %tr.item{:class => of.object.ordered_item ? 'existing' : 'new'}
-        %td.product{:colspan => of.object.ordered_item ? nil : 7}= of.collection_select :ordered_item_id, products, :id, :full_name, {:include_blank => true}, {:data => {:placeholder => 'Add an item'}}
+        %td.product{:colspan => of.object.ordered_item ? nil : 7}= of.collection_select :ordered_item_id, products, :id, :full_name, {:include_blank => true}, {:data => {:placeholder => t('shoppe.orders.add_item')}}
         - if of.object.ordered_item
           %td.qty= of.text_field :quantity, :class => 'text'
           %td.stock{:class => @order.new_record? && !of.object.in_stock? ? 'oos' : ''}= of.object.ordered_item.stock
@@ -30,9 +30,9 @@
     - if @order.available_delivery_services.empty?
       %tr.delivery
         - if @order.delivery_required?
-          %td.none{:colspan => 7} No suitable delivery service available, order cannot be created without an associated delivery service.
+          %td.none{:colspan => 7}= t('shoppe.orders.missing_delivery_service')
         - else
-          %td.none-needed{:colspan => 7} No delivery required for this order.
+          %td.none-needed{:colspan => 7 }= t('shoppe.orders.no_delivery_required')
     - else
       %tr.delivery
         %td.product= f.collection_select :delivery_service_id, @order.available_delivery_services, :id, :name
@@ -58,4 +58,4 @@
 
 - unless @order.new_record?
   %p.slaWarning
-    Any changes to quantities will update the appropriate stock levels for the associated product.
+    = t('shoppe.orders.sla_warning')

data/app/views/shoppe/orders/_payments_form.html.haml

@@ -1,15 +1,15 @@
 = form_for [@order, Shoppe::Payment.new(:amount => @order.balance)] do |f|
   %dl.text
-    %dt= f.label :method
+    %dt= f.label :method, t('shoppe.orders.method')
     %dd= f.text_field :method, :class => 'text'
   %dl.text
-    %dt= f.label :reference
+    %dt= f.label :reference, t('shoppe.orders.reference')
     %dd= f.text_field :reference, :class => 'text'
   %dl.amount
-    %dt= f.label :amount
+    %dt= f.label :amount, t('shoppe.orders.amount')
     %dd
       .moneyInput
         .currency= Shoppe.settings.currency_unit.html_safe
         = f.text_field :amount, :class => 'text'
   %dl.submit
-    %dd= f.submit "Add Payment", :class => 'button green'
+    %dd= f.submit t('shoppe.orders.add_payment') , :class => 'button green'

data/app/views/shoppe/orders/_payments_table.html.haml

@@ -3,35 +3,35 @@
     %table.data
       %thead
         %tr
-          %th ID
-          %th Type
-          %th Method
-          %th Reference
-          %th Amount
-          %th Refunded?
+          %th= t('shoppe.orders.id')
+          %th= t('shoppe.orders.type')
+          %th= t('shoppe.orders.method')
+          %th= t('shoppe.orders.reference')
+          %th= t('shoppe.orders.amount')
+          %th= t('shoppe.orders.refunded?')
           %th
       %tbody
         - for payment in @payments
           %tr
             %td= payment.id
             %td
-              = payment.refund? ? 'Refund' : 'Payment'
+              = payment.refund? ? t('shoppe.orders.refund') : t('shoppe.orders.payment')
               %span.float-right= boolean_tag payment.confirmed?
             %td= payment.method
             %td= link_to_if payment.transaction_url, payment.reference, payment.transaction_url
-            
+
             - if payment.refund?
               %td{:colspan => 2}
                 %b= number_to_currency payment.amount
                 - if payment.parent_payment_id
-                  from payment ##{payment.parent_payment_id}
+                  #{t('shoppe.orders.from_payment')} ##{payment.parent_payment_id}
             - else
               %td= number_to_currency payment.amount
               %td= boolean_tag payment.refunded?, nil, :true_text => number_to_currency(payment.amount_refunded)
             %td.refund
               - if payment.refundable?
-                = link_to "Refund", [:refund, @order, payment], :class => 'button purple button-mini', :rel => 'dialog'
+                = link_to t('shoppe.orders.refund'), [:refund, @order, payment], :class => 'button purple button-mini', :rel => 'dialog'
               - else
-                = link_to "Delete", [@order, payment], :class => 'button purple button-mini', :data => {:confirm => "Are you sure you wish to remove this payment?"}, :method => :delete
+                = link_to t('shoppe.delete'), [@order, payment], :class => 'button purple button-mini', :data => {:confirm => t('shoppe.orders.payment_remove_confirmation') }, :method => :delete
 - else
-  %p.notice There are no payments recorded for this order...
+  %p.notice= t('shoppe.orders.no_payments')

data/app/views/shoppe/orders/_search_form.html.haml

@@ -1,24 +1,24 @@
 .orderSearch{:style => action_name == 'search' ? "display:block" : ''}
   = search_form_for @query, :url => search_orders_path, :html => { :method => :post } do |f|
     %dl.left
-      %dt= f.label :id_eq, "Order Number"
+      %dt= f.label :id_eq, t('shoppe.orders.order_number')
       %dd= f.text_field :id_eq
-      %dt= f.label :first_name_or_last_name_or_company_cont, "Customer"
+      %dt= f.label :first_name_or_last_name_or_company_cont, t('shoppe.orders.customer')
       %dd= f.text_field :first_name_or_last_name_or_company_cont
-      %dt= f.label :address1_or_address2_or_address3_or_address4_or_postcode_cont, "Billing Address"
+      %dt= f.label :address1_or_address2_or_address3_or_address4_or_postcode_cont, t('shoppe.orders.billing_address')
       %dd= f.text_field :billing_address1_or_billing_address2_or_billing_address3_or_billing_address4_or_billing_postcode_cont
-      %dt= f.label :consignment_number_cont, "Consignment Number"
+      %dt= f.label :consignment_number_cont, t('shoppe.orders.consignment_number')
       %dd= f.text_field :consignment_number_cont
-      %dt= f.label :received_at_eq, "Received between"
+      %dt= f.label :received_at_eq, t('shoppe.orders.received_between')
       %dd
         = f.text_field :received_at_gteq, :class => 'small'
         →
         = f.text_field :received_at_lteq, :class => 'small'
     %dl.right
-      %dt= f.label :email_address_cont, "E-Mail Address"
+      %dt= f.label :email_address_cont, t('shoppe.orders.email_address')
       %dd= f.text_field :email_address_cont
-      %dt= f.label :phone_number_cont, "Phone Number"
+      %dt= f.label :phone_number_cont, t('shoppe.orders.phone_number')
       %dd= f.text_field :phone_number_cont
-      %dt= f.label :status_eq, "Status"
-      %dd= f.select :status_eq, [nil] + Shoppe::Order::STATUSES.map { |s| [s.humanize, s]}
-      %dd= f.submit "Search", :class => 'button green button'
+      %dt= f.label :status_eq, t('shoppe.orders.status')
+      %dd= f.select :status_eq, [nil] + Shoppe::Order::STATUSES.map { |s| [t("shoppe.orders.statuses.#{s}"), s]}
+      %dd= f.submit  t('shoppe.orders.search'), :class => 'button green button'

data/app/views/shoppe/orders/_status_bar.html.haml

@@ -2,30 +2,34 @@
   %ul
     - if @order.received?
       %li.received
-        %h4 Order Received
-        %p on #{@order.received_at.to_s(:short)} from #{@order.ip_address}
+        %h4= t('shoppe.orders.order_received')
+        %p
+          = t('shoppe.orders.status_bar.on_date', on: @order.received_at.to_s(:short))
+          = t('shoppe.orders.status_bar.from_ip', ip: @order.ip_address)
 
     - if @order.accepted?
       %li.accepted
-        %h4 Order Accepted
+        %h4= t('shoppe.orders.order_accepted')
         %p
-          on #{@order.accepted_at.to_s(:short)}
+          = t('shoppe.orders.status_bar.on_date', on: @order.accepted_at.to_s(:short))
           - if @order.accepter
-            by #{@order.accepter.short_name}
-        
+            = t('shoppe.orders.status_bar.by_user', user: @order.accepter.short_name)
+
     - elsif @order.rejected?
       %li.rejected
-        %h4 Order rejected
+        %h4= t('shoppe.orders.order_rejected')
         %p
-          on #{@order.rejected_at.to_s(:short)}
+          = t('shoppe.orders.status_bar.on_date', on: @order.rejected_at.to_s(:short))
           - if @order.rejecter
-            by #{@order.rejecter.short_name}
+            = t('shoppe.orders.status_bar.by_user', user: @order.rejecter.short_name)
 
     - if @order.shipped?
       %li.shipped
-        %h4 Order Shipped
-        %p on #{@order.shipped_at.to_s(:short)} by #{@order.shipper.try(:short_name) || 'Unknown'}
+        %h4= t('shoppe.orders.order_shipped')
+        %p
+          = t('shoppe.orders.status_bar.on_date', on: @order.shipped_at.to_s(:short))
+          = t('shoppe.orders.status_bar.by_user', user: @order.shipper.try(:short_name) || 'Unknown')
         - if @order.delivery_service && @order.courier_tracking_url
-          %p= link_to "Tracking URL", @order.courier_tracking_url
+          %p= link_to t('shoppe.orders.status_bar.tracking_url'), @order.courier_tracking_url
         - else
-          %p Consignment # <b>#{@order.consignment_number}</b>
+          %p= t('shoppe.orders.status_bar.consignment_no_html', consignment_number: @order.consignment_number)

data/app/views/shoppe/orders/despatch_note.html.haml

@@ -1,9 +1,9 @@
-- @page_title = "Order #{@order.number}"
+- @page_title = "#{t('shoppe.orders.despatch_note.order_number')} #{@order.number}"
 
 .despatchNote
   %header
     %h1= Shoppe.settings.store_name
-    %h2= t('.despatch_note')
+    %h2= t("shoppe.orders.despatch_note.despatch_note")
   .address
     %p.name= @order.delivery_name
     %p= @order.delivery_address1
@@ -12,27 +12,27 @@
     %p= @order.delivery_address4
     %p= @order.delivery_postcode
     %p= @order.delivery_country.try(:name)
-  
+
   %table.details
     %tr
-      %th= t('.order_number')
-      %th= t('.order_placed')
-      %th= t('.total_weight')
-      %th= t('.telephone')
+      %th= t("shoppe.orders.despatch_note.order_number")
+      %th= t("shoppe.orders.despatch_note.order_placed")
+      %th= t("shoppe.orders.despatch_note.total_weight")
+      %th= t("shoppe.orders.despatch_note.telephone")
     %tr
       %td= @order.number
       %td= @order.received? ? @order.received_at.to_s(:long) : 'n/a'
       %td= number_to_weight @order.total_weight
       %td= @order.phone_number
-  
+
   %table.items
     %thead
       %tr
-        %th= t('.quantity')
-        %th= t('.product')
-        %th= t('.sku')
-        %th= t('.weight')
-        %th= t('.packed?')
+        %th= t("shoppe.orders.despatch_note.quantity")
+        %th= t("shoppe.orders.despatch_note.product")
+        %th= t("shoppe.orders.despatch_note.sku")
+        %th= t("shoppe.orders.despatch_note.weight")
+        %th= t("shoppe.orders.despatch_note.packed?")
     %tbody
       - for item in @order.order_items
         %tr
@@ -41,5 +41,5 @@
           %td= item.ordered_item.sku
           %td= number_to_weight item.weight
           %td.check
-    
-  %p.footer= t('.footer', :default => "Thank you for your order!")
+
+  %p.footer= t('shoppe.orders.despatch_note.footer', :default => "Thank you for your order!")