shoppe 1.0.2 → 1.0.3

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

@@ -1,21 +1,21 @@
-- @page_title = 'Edit Order #' + @order.number
+- @page_title = "#{t('shoppe.orders.edit_order')} ##{@order.number}"
 
 = content_for :header do
   %p.buttons
-    = link_to "Back to order", @order, :class => 'button grey'
-  %h2.orders Edit Order <b>##{@order.number}</b>
+    = link_to t('shoppe.orders.back_to_order'), @order, :class => 'button grey'
+  %h2.orders "#{t('shoppe.orders.edit_order')} <b>##{@order.number}</b>"
 
 = form_for @order, :html => {:class => 'orderForm'} do |f|
   = f.error_messages
   = render 'form', :f => f
-  
-  = field_set_tag "Notes" do
+
+  = field_set_tag  t('shoppe.orders.notes') do
     %dl
       %dd= f.text_area :notes, :class => 'text'
 
-  = field_set_tag "Ordered Products", :class => 'padded' do
+  = field_set_tag t('shoppe.orders.ordered_products'), :class => 'padded' do
     = render 'order_items_form', :f => f
 
   %p.submit
-    = f.submit "Save Order", :class => 'button green'
-    = link_to "Cancel", @order, :class => 'button'
+    = f.submit t('shoppe.orders.save_order') , :class => 'button green'
+    = link_to t('shoppe.cancel'), @order, :class => 'button'

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

@@ -1,11 +1,11 @@
-- @page_title = 'Orders'
+- @page_title = t('shoppe.orders.orders')
 
 = content_for :header do
   %p.buttons
-    = link_to "New Order", :new_order, :class => 'button green'
-    = link_to "Search Orders", '#', :class => 'button', :rel => 'searchOrders'
+    = link_to t('shoppe.orders.new_order'), :new_order, :class => 'button green'
+    = link_to t('shoppe.orders.search_orders'), '#', :class => 'button', :rel => 'searchOrders'
   %h2.orders
-    Orders
+    = t('shoppe.orders.orders')
     %span= page_entries_info @orders
 
 = render 'search_form'
@@ -14,16 +14,16 @@
   %table.data
     %thead
       %tr
-        %th Number
-        %th Customer
-        %th Status
-        %th Products
-        %th Total
-        %th Payment
+        %th= t('shoppe.orders.number')
+        %th= t('shoppe.orders.customer')
+        %th= t('shoppe.orders.status')
+        %th= t('shoppe.orders.products')
+        %th= t('shoppe.orders.total')
+        %th= t('shoppe.orders.payment')
     %tbody
       - if @orders.empty?
         %tr.empty
-          %td{:colspan => 6} No orders to display.
+          %td{:colspan => 6}= t('shoppe.orders.no_orders')
       - else
         - for order in @orders
           %tr
@@ -36,4 +36,4 @@
                   %li #{item.quantity} x #{item.ordered_item.full_name}
             %td= number_to_currency order.total
             %td= boolean_tag order.paid_in_full?, nil, :true_text => number_to_currency(order.amount_paid), :false_text => number_to_currency(order.amount_paid)
-= paginate @orders
+= paginate @orders

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

@@ -1,14 +1,14 @@
-- @page_title = 'New Order'
+- @page_title = t('shoppe.orders.new_order')
+
 = content_for :header do
-  %p.buttons= link_to "Back to orders", :orders, :class => 'button grey'
-  %h2.orders
-    New Order
+  %p.buttons= link_to t('shoppe.orders.back_to_orders'), :orders, :class => 'button grey'
+  %h2.orders= t('shoppe.orders.new_order')
 
 = form_for @order, :html => {:class => 'orderForm newOrder'} do |f|
   = f.error_messages
   = render 'form', :f => f
-  = field_set_tag "Ordered Products", :class => 'padded' do
+  = field_set_tag t('shoppe.orders.ordered_products'), :class => 'padded' do
     = render 'order_items_form', :f => f
   %p.submit
-    = f.submit "Create Order", :class => 'button green'
-    = link_to "Cancel", :orders, :class => 'button grey'
+    = f.submit t('shoppe.orders.create_order'), :class => 'button green'
+    = link_to t('shoppe.cancel'), :orders, :class => 'button grey'

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

@@ -1,12 +1,12 @@
-- @page_title = 'Order #' + @order.number
+- @page_title = "#{t('shoppe.orders.order')} ##{@order.number}"
 
 = content_for :header do
   %p.buttons
-    = link_to "Edit", [:edit, @order], :class => 'button'
+    = link_to t('shoppe.edit'), [:edit, @order], :class => 'button'
     - if @order.accepted?
-      = link_to "Despatch Note", [:despatch_note, @order], :class => 'button', :rel => 'print'
-    = link_to "Back to orders", :orders, :class => 'button grey'
-  %h2.orders Order <b>##{@order.number}</b>
+      = link_to t('shoppe.orders.despatch_note.despatch_note'), [:despatch_note, @order], :class => 'button', :rel => 'print'
+    = link_to t('shoppe.orders.back_to_orders'), :orders, :class => 'button grey'
+  %h2.orders= t('shoppe.orders.order_no_html', order_number: @order.number)
 
 #order
 
@@ -14,15 +14,12 @@
     = render 'order_details'
     = render 'status_bar'
   - else
-    %p.warning
-      This order is still being built by the customer in your store. At
-      present you can only view the items which are within the order.
+    %p.warning= t('shoppe.orders.in_progress_warning')
 
-
-  = field_set_tag "Order Items", :class => 'padded' do
+  = field_set_tag t('shoppe.orders.order_items'), :class => 'padded' do
     = render 'order_items'
-  
+
   - if @order.received?
-    = field_set_tag "Payments", :class => 'padded orderPayments' do
+    = field_set_tag t('shoppe.orders.payments'), :class => 'padded orderPayments' do
       = render 'payments_table'
       = render 'payments_form'

data/app/views/shoppe/payments/refund.html.haml

@@ -1,14 +1,13 @@
 
 = form_tag [:refund, @order, @payment], :class => 'refundForm' do
-  %h2 Issue Refund
+  %h2= t('shoppe.refund.issue_refund')
   %p.intro
-    To issue a refund for this payment, just enter the amount you wish to refund below and click 'Refund'.
-    The maximum you can refund is <b>#{number_to_currency @payment.refundable_amount}</b>.
-  
+    = t('shoppe.refund.intro_html', amount: number_to_currency(@payment.refundable_amount))
+
   .moneyInput
     .currency= Shoppe.settings.currency_unit.html_safe
     = text_field_tag 'amount', @payment.refundable_amount, :class => 'text'
   %p.submit
-    = submit_tag "Refund", :class => 'button green'
-    = link_to "Close", '#', :class => 'button grey', :rel => 'closeDialog'
-    
+    = submit_tag t('shoppe.refund.refund'), :class => 'button green'
+    = link_to t('shoppe.close'), '#', :class => 'button grey', :rel => 'closeDialog'
+

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

@@ -1,26 +1,26 @@
 = form_for @product_category do |f|
   = f.error_messages
-  = field_set_tag 'Category Details' do
+  = field_set_tag t('shoppe.product_category.category_details') do
     .splitContainer
       %dl.half
-        %dt= f.label :name
+        %dt= f.label :name, t('shoppe.product_category.name')
         %dd= f.text_field :name, :class => 'focus text'
       %dl.half
-        %dt= f.label :permalink
+        %dt= f.label :permalink, t('shoppe.product_category.permalink')
         %dd= f.text_field :permalink, :class => 'text'
     %dl
-      %dt= f.label :description
+      %dt= f.label :description, t('shoppe.product_category.description')
       %dd= f.text_area :description, :class => 'text'
-  = field_set_tag "Attachments" do
 
+  = field_set_tag t('shoppe.product_category.attachments') do
     %dl
-      %dt= f.label :image_file, "Image"
+      %dt= f.label :image_file, t('shoppe.product_category.image')
       %dd
         = attachment_preview @product_category.image
         %p= f.file_field :image_file
 
   %p.submit
     - unless @product_category.new_record?
-      %span.right= link_to "Delete", @product_category, :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this category?"}
-    = f.submit :class => 'button green'
-    = link_to "Cancel", :product_categories, :class => 'button'
+      %span.right= link_to t('shoppe.delete') , @product_category, :class => 'button purple', :method => :delete, :data => {:confirm => t('shoppe.product_category.delete_confirmation') }
+    = f.submit t('shoppe.submit'),  :class => 'button green'
+    = link_to t('shoppe.cancel') , :product_categories, :class => 'button'

data/app/views/shoppe/product_categories/edit.html.haml

@@ -1,6 +1,6 @@
-- @page_title = "Products"
+- @page_title = t('shoppe.product_category.product_categories')
 = content_for :header do
-  %p.buttons= link_to "Back to categories list", :product_categories, :class => 'button'
-  %h2.products Product Categories
+  %p.buttons= link_to t('shoppe.product_category.back_to_categories'), :product_categories, :class => 'button'
+  %h2.products= t('shoppe.product_category.product_categories')
 = render 'form'
- 
+

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

@@ -1,18 +1,18 @@
-- @page_title = "Product Categories"
+- @page_title = t('shoppe.product_category.product_categories')
 
 = content_for :header do
-  %p.buttons=link_to "New category", :new_product_category, :class => 'button green'
-  %h2.products Product Categories
+  %p.buttons=link_to t('shoppe.product_category.new_category'), :new_product_category, :class => 'button green'
+  %h2.products= t('shoppe.product_category.product_categories')
 
 .table
   %table.data
     %thead
       %tr
-        %th Name
+        %th= t('shoppe.product_category.name')
     %tbody
       - if @product_categories.empty?
         %tr.empty
-          %td No categories to display.
+          %td= t('shoppe.product_category.no_categories')
       - else
         - for cat in @product_categories
           %tr

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

@@ -1,5 +1,6 @@
-- @page_title = "Products"
+- @page_title = t('shoppe.product_category.product_categories')
 = content_for :header do
-  %p.buttons= link_to "Back to categories list", :product_categories, :class => 'button'
-  %h2.products Product Categories
+  %p.buttons= link_to t('shoppe.product_category.back_to_categories'), :product_categories, :class => 'button'
+  %h2.products= t('shoppe.product_category.product_categories')
+
 = render 'form'

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

@@ -1,119 +1,118 @@
 = form_for @product, :html => {:multipart => true} do |f|
   = f.error_messages
-  = field_set_tag "Product Information" do
+  = field_set_tag  t('shoppe.products.product_information') do
     %dl
-      %dt= f.label :product_category_id
-      %dd= f.collection_select :product_category_id, Shoppe::ProductCategory.ordered, :id, :name, {:include_blank => true}, {:class => 'chosen'}
-  
+      %dt= f.label :product_category_id, t('shoppe.products.product_category')
+      %dd= f.collection_select :product_category_id, Shoppe::ProductCategory.ordered, :id, :name, {:prompt => false}, {:class => 'chosen'}
+
     .splitContainer
       %dl.third
-        %dt= f.label :name
+        %dt= f.label :name, t('shoppe.products.name')
         %dd= f.text_field :name, :class => 'text focus'
       %dl.third
-        %dt= f.label :permalink
+        %dt= f.label :permalink, t('shoppe.products.permalink')
         %dd= f.text_field :permalink, :class => 'text'
       %dl.third
-        %dt= f.label :sku, 'SKU'
+        %dt= f.label :sku, t('shoppe.products.sku')
         %dd= f.text_field :sku, :class => 'text'
     %dl
-      %dt= f.label :description
+      %dt= f.label :description, t('shoppe.products.description')
       %dd= f.text_area :description, :class => 'text'
     %dl
-      %dt= f.label :short_description
+      %dt= f.label :short_description, t('shoppe.products.short_description')
       %dd= f.text_area :short_description, :class => 'text'
     %dl
-      %dt= f.label :in_the_box, "What's in the box?"
+      %dt= f.label :in_the_box, t('shoppe.products.in_the_box')
       %dd= f.text_area :in_the_box, :class => 'text'
-  
-  = field_set_tag "Attributes" do
+
+  = field_set_tag t('shoppe.products.attributes') do
     .margin
       %table.productAttributes
         %thead
           %tr
-            %td Name
-            %td Value
-            %td.searchable Searchable?
-            %td.searchable Public?
-            %td.remove Remove
+            %td= t('shoppe.products.name')
+            %td= t('shoppe.products.value')
+            %td.searchable= t('shoppe.products.searchable?')
+            %td.searchable= t('shoppe.products.public?')
+            %td.remove= t('shoppe.products.remove')
             %td
         %tbody
           %tr.template{:style => 'display:none;'}
-            %td= text_field_tag 'product[product_attributes_array][][key]', '', :placeholder => 'Name'
-            %td= text_field_tag 'product[product_attributes_array][][value]', '', :placeholder => 'Value'
+            %td= text_field_tag 'product[product_attributes_array][][key]', '', :placeholder => t('shoppe.products.name')
+            %td= text_field_tag 'product[product_attributes_array][][value]', '', :placeholder => t('shoppe.products.value')
             %td.searchable= check_box_tag 'product[product_attributes_array][][searchable]', '1'
             %td.searchable= check_box_tag 'product[product_attributes_array][][public]', '1'
-            %td.remove= link_to "Remove", '#', :class => 'button button-mini purple'
+            %td.remove= link_to t('shoppe.remove') , '#', :class => 'button button-mini purple'
             %td.handle
           - for attribute in @product.product_attributes
             %tr
-              %td= text_field_tag 'product[product_attributes_array][][key]', attribute.key, :placeholder => 'Name'
-              %td= text_field_tag 'product[product_attributes_array][][value]', attribute.value, :placeholder => 'Value'
+              %td= text_field_tag 'product[product_attributes_array][][key]', attribute.key, :placeholder => t('shoppe.products.name')
+              %td= text_field_tag 'product[product_attributes_array][][value]', attribute.value, :placeholder => t('shoppe.products.value')
               %td.searchable= check_box_tag 'product[product_attributes_array][][searchable]', '1', attribute.searchable?
               %td.searchable= check_box_tag 'product[product_attributes_array][][public]', '1', attribute.public?
-              %td.remove= link_to "Remove", '#', :class => 'button button-mini purple'
+              %td.remove= link_to t("shoppe.remove"), '#', :class => 'button button-mini purple'
               %td.handle
-      %p.addAttribute= link_to "Add attribute", '#', :data => {:behavior => 'addAttributeToAttributesTable'}, :class => 'button button-mini green'
-      
-  = field_set_tag "Attachments" do
+      %p.addAttribute= link_to t('shoppe.products.add_attribute') , '#', :data => {:behavior => 'addAttributeToAttributesTable'}, :class => 'button button-mini green'
+
+  = field_set_tag t('shoppe.products.attachments') do
     .splitContainer
       %dl.half
-        %dt= f.label :default_image_file, "Default Image"
+        %dt= f.label :default_image_file, t('shoppe.products.default_image')
         %dd
           = attachment_preview @product.default_image
           %p= f.file_field :default_image_file
       %dl.half
-        %dt= f.label :data_sheet_file, "Datasheet"
+        %dt= f.label :data_sheet_file, t('shoppe.products.datasheet')
         %dd
           = attachment_preview @product.data_sheet
           %p= f.file_field :data_sheet_file
-     
-  - unless @product.has_variants?   
-    = field_set_tag "Pricing" do
+
+  - unless @product.has_variants?
+    = field_set_tag t('shoppe.products.pricing') do
       .splitContainer
         %dl.third
-          %dt= f.label :price
+          %dt= f.label :price, t('shoppe.products.price')
           %dd
             .moneyInput
               .currency= Shoppe.settings.currency_unit.html_safe
               = f.text_field :price, :class => 'text'
         %dl.third
-          %dt= f.label :cost_price
+          %dt= f.label :cost_price, t('shoppe.products.cost_price')
           %dd
             .moneyInput
               .currency= Shoppe.settings.currency_unit.html_safe
               = f.text_field :cost_price, :class => 'text'
         %dl.third
-          %dt= f.label :tax_rate_id
-          %dd= f.collection_select :tax_rate_id, Shoppe::TaxRate.ordered, :id, :description, {:include_blank => true}, {:class => 'chosen-with-deselect', :data => {:placeholder => "No tax"}}
-  
-    = field_set_tag "Stock Control" do
+          %dt= f.label :tax_rate_id, t('shoppe.products.tax_rate')
+          %dd= f.collection_select :tax_rate_id, Shoppe::TaxRate.ordered, :id, :description, {:include_blank => true}, {:class => 'chosen-with-deselect', :data => {:placeholder => t('shoppe.products.no_tax')}}
+
+    = field_set_tag  t('shoppe.products.stock_control') do
       .splitContainer
         %dl.half
-          %dt= f.label :weight
+          %dt= f.label :weight, t('shoppe.products.weight')
           %dd= f.text_field :weight, :class => 'text'
-      
+
         %dl.half
-          %dt= f.label :stock_control
+          %dt= f.label :stock_control,  t('shoppe.products.stock_control')
           %dd.checkbox
             = f.check_box :stock_control
-            = f.label :stock_control, "Enable stock control for this product?"
+            = f.label :stock_control, t('shoppe.products.enable_stock_control?')
 
-  = field_set_tag "Website Properties" do
+  = field_set_tag  t('shoppe.products.website_properties') do
     .splitContainer
-
       %dl.half
-        %dt= f.label :active, "On sale?"
+        %dt= f.label :active,  t('shoppe.products.on_sale?')
         %dd.checkbox
           = f.check_box :active
-          = f.label :active, "If checked, this product will be displayed within the public store"
+          = f.label :active,  t('shoppe.products.on_sale_info')
       %dl.half
-        %dt= f.label :featured, "Featured?"
+        %dt= f.label :featured,  t('shoppe.products.featured?')
         %dd.checkbox
           = f.check_box :featured
-          = f.label :featured, "If checked, this product will appear on your homepage"
+          = f.label :featured, t('shoppe.products.featured_info')
 
   %p.submit
     - unless @product.new_record?
-      %span.right= link_to "Delete", @product, :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this product?"}
-    = f.submit :class => 'button green'
-    = link_to "Cancel", :products, :class => 'button'
+      %span.right= link_to t('shoppe.delete') , @product, :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this product?"}
+    = f.submit t('shoppe.submit'),  :class => 'button green'
+    = link_to t('shoppe.cancel'), :products, :class => 'button'

data/app/views/shoppe/products/_table.html.haml

@@ -2,14 +2,14 @@
   %table.data
     %thead
       %tr
-        %th{:width => '20%'} SKU
-        %th{:width => '40%'} Name
-        %th{:width => '25%'} Price/Variants
-        %th{:width => '15%'} Stock
+        %th{:width => '20%'}= t('shoppe.products.sku')
+        %th{:width => '40%'}= t('shoppe.products.name')
+        %th{:width => '25%'}= t('shoppe.products.price_variants')
+        %th{:width => '15%'}= t('shoppe.products.stock')
     %tbody
       - if products.empty?
         %tr.empty
-          %td{:colspan => 4} No products to display.
+          %td{:colspan => 4}= t('shoppe.products.no_products')
       - else
         - for category, products in products
           %tr
@@ -27,16 +27,16 @@
                         %td{:width => '30%'}= number_to_currency variant.price
                         %td{:width => '30%'}
                           - if variant.stock_control?
-                            %span.float-right= link_to "Edit", stock_level_adjustments_path(:item_type => variant.class, :item_id => variant.id), :class => 'edit', :rel => 'dialog', :data => {:dialog_width => 700, :dialog_behavior => 'stockLevelAdjustments'}
-                            = boolean_tag(variant.in_stock?, nil, :true_text => variant.stock, :false_text => 'No stock')
+                            %span.float-right= link_to t('shoppe.products.edit') , stock_level_adjustments_path(:item_type => variant.class, :item_id => variant.id), :class => 'edit', :rel => 'dialog', :data => {:dialog_width => 700, :dialog_behavior => 'stockLevelAdjustments'}
+                            = boolean_tag(variant.in_stock?, nil, :true_text => variant.stock, :false_text => t('shoppe.products.no_stock'))
                           - else
                             ∞
               - else
                 %td= number_to_currency product.price
                 %td
                   - if product.stock_control?
-                    %span.float-right= link_to "Edit", stock_level_adjustments_path(:item_type => product.class, :item_id => product.id), :class => 'edit', :rel => 'dialog', :data => {:dialog_width => 700, :dialog_behavior => 'stockLevelAdjustments'}
-                    = boolean_tag(product.in_stock?, nil, :true_text => product.stock, :false_text => 'No stock')
+                    %span.float-right= link_to t('shoppe.products.edit'), stock_level_adjustments_path(:item_type => product.class, :item_id => product.id), :class => 'edit', :rel => 'dialog', :data => {:dialog_width => 700, :dialog_behavior => 'stockLevelAdjustments'}
+                    = boolean_tag(product.in_stock?, nil, :true_text => product.stock, :false_text => t('shoppe.products.no_stock'))
                   - else
                     ∞
-                  
+