shoppe 1.0.2 → 1.0.3

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

@@ -1,8 +1,8 @@
-- @page_title = "Products"
+- @page_title = t('shoppe.products.products')
 = content_for :header do
   %p.buttons
-    = link_to "Variants", [@product, :variants], :class => 'button'
-    = link_to "Stock levels", stock_level_adjustments_path(:item_id => @product.id, :item_type => @product.class), :class => 'button', :rel => 'dialog', :data => {:dialog_width => 700, :dialog_behavior => 'stockLevelAdjustments'}
-    = link_to "Back to product list", :products, :class => 'button'
-  %h2.products Products
-= render 'form'
+    = link_to t('shoppe.products.variants') , [@product, :variants], :class => 'button'
+    = link_to t('shoppe.products.stock_levels') , stock_level_adjustments_path(:item_id => @product.id, :item_type => @product.class), :class => 'button', :rel => 'dialog', :data => {:dialog_width => 700, :dialog_behavior => 'stockLevelAdjustments'}
+    = link_to t('shoppe.products.back_to_products') , :products, :class => 'button'
+  %h2.products= t('shoppe.products.products')
+= render 'form'

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

@@ -0,0 +1,63 @@
+- @page_title = t('shoppe.products.products')
+
+= content_for :header do
+  %h2.products= t('shoppe.products.import_products')
+
+= form_for "import", :url => import_products_path, :html => {:multipart => true} do |f|
+  = f.error_messages
+  
+  = field_set_tag t('shoppe.imports.file_upload') do
+    %dl
+      %dt= f.label :import_file, t('shoppe.imports.required_formats')
+      %dd= f.file_field :import_file
+
+  = field_set_tag t('shoppe.imports.example_file') do
+    %dl
+      %dd
+        %table.importExample
+          %thead
+            %tr
+              %th name
+              %th sku
+              %th description
+              %th short_description
+              %th weight
+              %th price
+              %th category_name
+              %th qty
+          %tbody
+            %tr
+              %td= t('shoppe.products.imports.examples.first.name') 
+              %td= t('shoppe.products.imports.examples.first.sku') 
+              %td= t('shoppe.products.imports.examples.first.description') 
+              %td= t('shoppe.products.imports.examples.first.short_description') 
+              %td= t('shoppe.products.imports.examples.first.weight') 
+              %td= t('shoppe.products.imports.examples.first.price') 
+              %td= t('shoppe.products.imports.examples.first.category_name') 
+              %td= t('shoppe.products.imports.examples.first.qty') 
+            %tr
+              %td= t('shoppe.products.imports.examples.second.name') 
+              %td= t('shoppe.products.imports.examples.second.sku') 
+              %td= t('shoppe.products.imports.examples.second.description') 
+              %td= t('shoppe.products.imports.examples.second.short_description') 
+              %td= t('shoppe.products.imports.examples.second.weight') 
+              %td= t('shoppe.products.imports.examples.second.price') 
+              %td= t('shoppe.products.imports.examples.second.category_name') 
+              %td= t('shoppe.products.imports.examples.second.qty') 
+            %tr
+              %td= t('shoppe.products.imports.examples.third.name') 
+              %td= t('shoppe.products.imports.examples.third.sku') 
+              %td= t('shoppe.products.imports.examples.third.description') 
+              %td= t('shoppe.products.imports.examples.third.short_description') 
+              %td= t('shoppe.products.imports.examples.third.weight') 
+              %td= t('shoppe.products.imports.examples.third.price') 
+              %td= t('shoppe.products.imports.examples.third.category_name') 
+              %td= t('shoppe.products.imports.examples.third.qty')          
+            %tr.tear-off
+              %td{:colspan => "8"}
+      %dd
+        %p.help= t('shoppe.products.imports.help') 
+
+  %p.submit
+    = f.submit t('shoppe.import'), :class => "button green"
+    = link_to t('shoppe.cancel'), :products, :class => "button"

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

@@ -1,7 +1,9 @@
-- @page_title = "Products"
+- @page_title = t('shoppe.products.products')
 
 = content_for :header do
-  %p.buttons= link_to "New product", :new_product, :class => 'button green'  
-  %h2.products Products
+  %p.buttons
+    = link_to t('shoppe.products.new_product'), :new_product, :class => 'button green'  
+    = link_to t('shoppe.products.import_products'), :import_products, :class => 'button gray'
+  %h2.products= t('shoppe.products.products')
 
-= render 'table', :products => @products
+= render 'table', :products => @products

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

@@ -1,5 +1,7 @@
-- @page_title = "Products"
+- @page_title = t('shoppe.products.products')
+
 = content_for :header do
-  %p.buttons= link_to "Back to product list", :products, :class => 'button'
-  %h2.products Products
-= render 'form'
+  %p.buttons= link_to t('shoppe.products.back_to_products') , :products, :class => 'button'
+  %h2.products= t('shoppe.products.products')
+
+= render 'form'

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

@@ -1,12 +1,12 @@
-- @page_title = 'Admin Login'
+- @page_title =  t('shoppe.sessions.admin_login')
 = display_flash
 .loginArea
   = form_tag :login, :class => 'login' do
     %p.field
-      = text_field_tag 'email_address', params[:email_address], :class => 'focus', :placeholder => 'E-Mail Address'
+      = text_field_tag 'email_address', params[:email_address], :class => 'focus', :placeholder => t('shoppe.sessions.email')
     %p.field
-      = password_field_tag 'password', params[:password], :class => '', :placeholder => 'Password'
+      = password_field_tag 'password', params[:password], :class => '', :placeholder =>  t('shoppe.sessions.password')
     %p.submit
-      = submit_tag "Login", :class => 'button green'
+      = submit_tag t('shoppe.sessions.login'), :class => 'button green'
     %p.reset
-      = link_to "Reset your password?", login_reset_path
+      = link_to t('shoppe.sessions.reset_password?'), login_reset_path

data/app/views/shoppe/sessions/reset.html.haml

@@ -1,11 +1,12 @@
-- @page_title = 'Admin Login'
+- @page_title =  t('shoppe.sessions.reset_password')
+
 = display_flash
 .loginArea
-  %h2 Reset your password
+  %h2= t('shoppe.sessions.reset_password')
   = form_tag :login_reset, :class => 'login' do
     %p.field
-      = text_field_tag 'email_address', params[:email_address], :class => 'focus', :placeholder => 'E-Mail Address'
+      = text_field_tag 'email_address', params[:email_address], :class => 'focus', :placeholder => t('shoppe.sessions.email')
     %p.submit
-      = submit_tag "Login", :class => 'button green'
+      = submit_tag t('shoppe.sessions.reset')  , :class => 'button green'
     %p.reset
-      = link_to "Back to login", login_path
+      = link_to t('shoppe.sessions.back_to_login') , login_path

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

@@ -1,12 +1,12 @@
-- @page_title = "Settings"
+- @page_title = t("shoppe.settings.settings")
 
 = content_for :header do
-  %h2.settings Settings
+  %h2.settings= t("shoppe.settings.settings")
 
 = form_tag :url => settings_path do |f|
 
   - Shoppe.settings_groups.each do |group, fields|
-    = field_set_tag t(group) do
+    = field_set_tag t("shoppe.settings.#{group}") do
       - fields.each do |f|
         %dl.sided
           %dt= settings_label f
@@ -14,6 +14,6 @@
             = settings_field f
             - if v = t("shoppe.settings.help")[f]
               %p.help= v
-        
+
   %p.submit.sided
-    = submit_tag "Save Settings", :class => 'button green'
+    = submit_tag t("shoppe.settings.save_settings"), :class => 'button green'

data/app/views/shoppe/shared/error.html.haml

@@ -1,6 +1,6 @@
-- @page_title = "Error"
+- @page_title = t('shoppe.shared.error')
 = display_flash
 .error
-  %h2 An error has occurred
+  %h2= t('shoppe.shared.error_occured')
   %p.message= @exception.message
-  %p.back= link_to "← Back to Shoppe".html_safe, root_path, :class => 'button'
+  %p.back= link_to "←#{t('shoppe.shared.back_to_shoppe')}".html_safe, root_path, :class => 'button'

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

@@ -1,17 +1,18 @@
-- @page_title = "Stock Levels - #{@item.name}"
+- @page_title = t('shoppe.stock_level_adjustments.stock_levels_title', item_name: @item.name)
+
 = content_for :header do
   %p.buttons
     - case @item
     - when Shoppe::Product
       - @active_nav = :products
-      = link_to "Edit product", [:edit, @item], :class => 'button'
-      = link_to "Back to product list", :products, :class => 'button'
-      
-  %h2.products Stock Levels for #{@item.name}
+      = link_to t('shoppe.stock_level_adjustments.edit_product'), [:edit, @item], :class => 'button'
+      = link_to t('shoppe.stock_level_adjustments.back_to_product'), :products, :class => 'button'
+
+  %h2.products= t('shoppe.stock_level_adjustments.stock_levels_for', item_name: @item.name)
 
 .table
   %p.info
-    Current stock level is <b>#{@item.stock}</b>
+    = t('shoppe.stock_level_adjustments.current_stock_level_html', item_stock: @item.stock).html_safe
     %span.float-right= page_entries_info @stock_level_adjustments
 
   = form_for @new_sla do |f|
@@ -20,20 +21,20 @@
     %table.data
       %thead
         %tr
-          %th{:width => '25%'} Date
-          %th{:width => '50%'} Description
-          %th{:width => '25%'} Adjustment
+          %th{:width => '25%'}= t('shoppe.stock_level_adjustments.date')
+          %th{:width => '50%'}= t('shoppe.stock_level_adjustments.description')
+          %th{:width => '25%'}= t('shoppe.stock_level_adjustments.adjustment')
       %tbody
         %tr.form
           %td
           %td.desc= f.text_field :description
           %td.adjustment
             = f.text_field :adjustment
-            = f.submit "Add", :class => 'button button-mini green'
+            = f.submit t('shoppe.stock_level_adjustments.add'), :class => 'button button-mini green'
         - for sla in @stock_level_adjustments
           %tr
-            %td= sla.created_at.to_s(:long)
+            %td= l(sla.created_at, format: :long)
             %td= sla.description
             %td= sla.adjustment > 0  ? "+#{sla.adjustment}" : sla.adjustment
 
-    = paginate @stock_level_adjustments
+    = paginate @stock_level_adjustments

data/app/views/shoppe/tax_rates/form.html.haml

@@ -1,28 +1,28 @@
-- @page_title = "Tax Rates"
+- @page_title = t('shoppe.tax_rates.tax_rates')
 = content_for :header do
-  %p.buttons= link_to "Back to tax rates", :tax_rates, :class => 'button grey'
-  %h2.tax_rates Tax Rates
+  %p.buttons= link_to t('shoppe.tax_rates.back_to_tax_rates'), :tax_rates, :class => 'button grey'
+  %h2.tax_rates= t('shoppe.tax_rates.tax_rates')
 
 = form_for @tax_rate do |f|
   = f.error_messages
-  = field_set_tag "Rate Details" do
+  = field_set_tag t('shoppe.tax_rates.rate_details') do
     .splitContainer
       %dl.half
-        %dt= f.label :name
+        %dt= f.label :name, t('shoppe.tax_rates.name')
         %dd= f.text_field :name, :class => 'focus text'
       %dl.half
-        %dt= f.label :rate
+        %dt= f.label :rate, t('shoppe.tax_rates.rate')
         %dd= f.text_field :rate, :class => 'text'
-  
-  = field_set_tag "Country Restriction" do
+
+  = field_set_tag t('shoppe.tax_rates.country_restriction') do
     %dl
       %dd
-        = f.select :address_type, Shoppe::TaxRate::ADDRESS_TYPES.map { |a| ["Apply to orders where the #{a} address matches one of the countries below".html_safe, a]}, {}, :class => 'chosen-basic'
+        = f.select :address_type, Shoppe::TaxRate::ADDRESS_TYPES.map { |a| [t('shoppe.tax_rates.address_type_option', address: t("shoppe.tax_rates.#{a}")).html_safe, a]}, {}, :class => 'chosen-basic'
     %dl
       %dd
-        = f.collection_select :country_ids, Shoppe::Country.ordered, :id, :name, {}, {:class => 'chosen', :multiple => true, :data => {:placeholder => "All countries"}}
+        = f.collection_select :country_ids, Shoppe::Country.ordered, :id, :name, {}, {:class => 'chosen', :multiple => true, :data => {:placeholder => t('shoppe.tax_rates.all_countries') }}
   %p.submit
     - unless @tax_rate.new_record?
-      %span.right= link_to "Delete", @tax_rate, :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this tax_rate?"}
-    = f.submit :class => 'button green'
-    = link_to "Cancel", :tax_rates, :class => 'button'
+      %span.right= link_to t('shoppe.delete'), @tax_rate, :class => 'button purple', :method => :delete, :data => {:confirm => t('shoppe.tax_rates.delete_confirmation') }
+    = f.submit t('shoppe.submit'), :class => 'button green'
+    = link_to t('shoppe.cancel'), :tax_rates, :class => 'button'

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

@@ -1,15 +1,15 @@
-- @page_title = "Tax Rates"
+- @page_title = t('shoppe.tax_rates.tax_rates')
 
 = content_for :header do
-  %p.buttons=link_to "New tax rate", :new_tax_rate, :class => 'button green'
-  %h2.tax_rates Tax Rates
+  %p.buttons= link_to t('shoppe.tax_rates.new_tax_rate'), :new_tax_rate, :class => 'button green'
+  %h2.tax_rates= t('shoppe.tax_rates.tax_rates')
 
 .table
   %table.data
     %thead
       %tr
-        %th Name
-        %th Rate
+        %th= t('shoppe.tax_rates.name')
+        %th= t('shoppe.tax_rates.rate')
     %tbody
       - for tax_rate in @tax_rates
         %tr

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

@@ -1,28 +1,27 @@
 = form_for @user do |f|
   = f.error_messages
-  = field_set_tag "User Details" do
+  = field_set_tag t('shoppe.users.user_details') do
     .splitContainer
       %dl.half
-        %dt= f.label :first_name
+        %dt= f.label :first_name, t('shoppe.users.first_name')
         %dd= f.text_field :first_name, :class => 'focus text'
       %dl.half
-        %dt= f.label :last_name
+        %dt= f.label :last_name, t('shoppe.users.last_name')
         %dd= f.text_field :last_name, :class => 'text'
-  = field_set_tag "Login" do
+  = field_set_tag t("shoppe.users.login") do
     .splitContainer
       %dl.third
-        %dt= f.label :email_address
+        %dt= f.label :email_address, t('shoppe.users.email')
         %dd= f.text_field :email_address, :class => 'text'
       %dl.third
-        %dt= f.label :password
+        %dt= f.label :password, t('shoppe.users.password')
         %dd= f.password_field :password, :class => 'text'
       %dl.third
-        %dt= f.label :password_confirmation, "...and again"
+        %dt= f.label :password_confirmation, t('shoppe.users.password_confirmation')
         %dd= f.password_field :password_confirmation, :class => 'text'
 
-
   %p.submit
     - unless @user.new_record?
-      %span.right= link_to "Delete", @user, :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this user?"}
-    = f.submit :class => 'button green'
-    = link_to "Cancel", :users, :class => 'button'
+      %span.right= link_to t('shoppe.delete'), @user, :class => 'button purple', :method => :delete, :data => {:confirm => t('shoppe.users.delete_confirmation')}
+    = f.submit  t('shoppe.submit'), :class => 'button green'
+    = link_to t('shoppe.cancel'), :users, :class => 'button'

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

@@ -1,5 +1,5 @@
-- @page_title = "Users"
+- @page_title = t('shoppe.users.users')
 = content_for :header do
-  %p.buttons= link_to "Back to users", :users, :class => 'button'
-  %h2.users Users
-= render 'form'
+  %p.buttons= link_to t('shoppe.users.back_to_users'), :users, :class => 'button'
+  %h2.users= t('shoppe.users.users')
+= render 'form'

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

@@ -1,15 +1,15 @@
-- @page_title = "Users"
+- @page_title = t('shoppe.users.users')
 
 = content_for :header do
-  %p.buttons=link_to "New user", :new_user, :class => 'button green'
-  %h2.users Users
+  %p.buttons= link_to t('shoppe.users.new_user'), :new_user, :class => 'button green'
+  %h2.users= t('shoppe.users.users')
 
 .table
   %table.data
     %thead
       %tr
-        %th Name
-        %th E-Mail Address
+        %th= t('shoppe.users.name')
+        %th= t('shoppe.users.email')
     %tbody
       - for user in @users
         %tr

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

@@ -1,5 +1,7 @@
-- @page_title = "Users"
+- @page_title = t('shoppe.users.users')
+
 = content_for :header do
-  %p.buttons= link_to "Back to users", :users, :class => 'button'
-  %h2.users Users
-= render 'form'
+  %p.buttons= link_to t('shoppe.users.back_to_users'), :users, :class => 'button'
+  %h2.users= t('shoppe.users.users')
+
+= render 'form'

data/app/views/shoppe/variants/form.html.haml

@@ -1,68 +1,66 @@
-- @page_title = "Variants - #{@product.name}"
+- @page_title = "#{t('shoppe.variants.variants')} - #{@product.name}"
 = content_for :header do
-  %p.buttons= link_to "Back to variants", [@product, :variants], :class => 'button'
-  %h2.products Variants of #{@product.name}
-
+  %p.buttons= link_to t('shoppe.variants.back_to_variants'), [@product, :variants], :class => 'button'
+  %h2.products= t('shoppe.variants.variants_of', product:@product.name)
 
 = form_for [@product, @variant], :url => @variant.new_record? ? product_variants_path(@product) : product_variant_path(@product, @variant), :html => {:multipart => true} do |f|
   = f.error_messages
-  = field_set_tag "Product Information" do
+  = field_set_tag t('shoppe.variants.product_information') do
     .splitContainer
       %dl.third
-        %dt= f.label :name
+        %dt= f.label :name, t('shoppe.variants.name')
         %dd= f.text_field :name, :class => 'text focus'
       %dl.third
-        %dt= f.label :permalink
+        %dt= f.label :permalink, t('shoppe.variants.permalink')
         %dd= f.text_field :permalink, :class => 'text'
       %dl.third
-        %dt= f.label :sku, 'SKU'
+        %dt= f.label :sku, t('shoppe.variants.sku')
         %dd= f.text_field :sku, :class => 'text'
-      
-  = field_set_tag "Image" do
+
+  = field_set_tag t('shoppe.variants.image') do
     %dl
       %dd
         = attachment_preview @variant.default_image, :hide_if_blank => true
         %p= f.file_field :default_image_file
-      
-  = field_set_tag "Pricing" do
+  = field_set_tag t("shoppe.variants.pricing") do
     .splitContainer
       %dl.third
-        %dt= f.label :price
+        %dt= f.label :price, t('shoppe.variants.price')
         %dd= f.text_field :price, :class => 'text'
       %dl.third
-        %dt= f.label :cost_price
+        %dt= f.label :cost_price, t('shoppe.variants.cost_price')
         %dd= 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"}}
+        %dt= f.label :tax_rate_id, t('shoppe.variants.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.variants.no_tax')}}
 
-  = field_set_tag "Stock Control" do
+  = field_set_tag t('shoppe.variants.stock_control') do
     .splitContainer
       %dl.half
-        %dt= f.label :weight
+        %dt= f.label :weight, t('shoppe.variants.weight')
         %dd= f.text_field :weight, :class => 'text'
 
       %dl.half
-        %dt= f.label :stock_control
+        %dt= f.label :stock_control, t('shoppe.variants.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.variants.enable_stock_control?')
 
-  = field_set_tag "Website Properties" do
+  = field_set_tag t('shoppe.variants.website_properties') do
     .splitContainer
       %dl.half
-        %dt= f.label :active, "On sale?"
+        %dt= f.label :active, t('shoppe.variants.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.variants.on_sale_info')
       %dl.half
-        %dt= f.label :default, "Default variant?"
+        %dt= f.label :default, t('shoppe.variants.default_variant?')
         %dd.checkbox
           = f.check_box :default
-          = f.label :default, "If checked, this variant will be the default"
-  
+          = f.label :default, t('shoppe.variants.default_variant_info')
+
   %p.submit
     - unless @variant.new_record?
-      %span.right= link_to "Delete", product_variant_path(@product, @variant), :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this variant?"}
-    = f.submit "Save Variant", :class => 'button green'
-    = link_to "Cancel", :products, :class => 'button'
+      %span.right= link_to t('shoppe.delete'), product_variant_path(@product, @variant), :class => 'button purple', :method => :delete, :data => {:confirm => t('shoppe.variants.delete_confirmation')}
+    = f.submit t('shoppe.variants.save_variant'), :class => 'button green'
+    = link_to t('shoppe.cancel'), :products, :class => 'button'