Merge branch 'issue-878' of https://github.com/elf-pavlik/openfoodnetwork into locale-patches

app/overrides/spree/admin/shared/_configuration_menu/add_accounts_and_billing.html.haml.deface

@@ -1,4 +1,4 @@
 // insert_bottom "[data-hook='admin_configurations_sidebar_menu']"
 
 %li
-  = link_to 'Accounts & Billing', main_app.edit_admin_accounts_and_billing_settings_path
+  = link_to t(:accounts_and_billing), main_app.edit_admin_accounts_and_billing_settings_path

app/views/admin/accounts_and_billing_settings/edit.html.haml

@@ -1,7 +1,7 @@
 = render :partial => 'spree/admin/shared/configuration_menu'
 
 - content_for :page_title do
-  = t(:accounts_and_billing_settings)
+  = t(:accounts_and_billing)
 
 = render 'spree/shared/error_messages', target: @settings
 
@@ -11,7 +11,7 @@
   %legend
     =t :admin_settings
   = form_for @settings, as: :settings, url: main_app.admin_accounts_and_billing_settings_path, :method => :put do |f|
-    .row{ ng: { app: t(:admin_accounts_and_billing) } }
+    .row{ ng: { app: 'admin.accounts_and_billing_settings' } }
       .twelve.columns.alpha.omega
         .field
           = f.label :accounts_distributor_id, t(:accounts_administration_distributor)

app/views/spree/admin/reports/customers.html.haml

@@ -33,7 +33,7 @@
 %br
 %table#listing_customers.index
   %thead
-    %tr{'data-hook' => "orders_header" }
+    %tr{'data-hook' => "orders_header"}
       - @report.header.each do |heading|
         %th=heading
   %tbody

app/views/spree/admin/reports/order_cycle_management.html.haml

@@ -33,7 +33,7 @@
 %br
 %table#listing_ocm_orders.index
   %thead
-    %tr{'data-hook' => "orders_header" }
+    %tr{'data-hook' => "orders_header"}
       - @report.header.each do |heading|
         %th=heading
   %tbody

app/views/spree/admin/reports/orders_and_distributors.html.haml

@@ -10,7 +10,7 @@
 %br
 %table#listing_orders.index
   %thead
-    %tr{'data-hook' => t(:report_customers_header)}
+    %tr{'data-hook' => 'orders_header'}
       - @report.header.each do |heading|
         %th=heading
   %tbody
@@ -21,4 +21,3 @@
     - if @report.table.empty?
       %tr
         %td{:colspan => "2"}= t(:none)
-

app/views/spree/admin/shared/_trial_progress_bar.html.haml

@@ -1,7 +1,7 @@
 - if enterprise
   -if shop_trial_in_progress?(enterprise)
     #trial_progress_bar
-      = t(:shop_trial_in_progress)
+      = t(:shop_trial_in_progress, days: remaining_trial_days(enterprise))
   -elsif shop_trial_expired?(enterprise)
     #trial_progress_bar
-      = t(:shop_trial_expired)
+      = t(:shop_trial_expired)

config/locales/en.yml

@@ -778,7 +778,7 @@ Please follow the instructions there to make your enterprise visible on the Open
   shop_variant_quantity_max: "max"
   contact: "Contact"
   follow: "Follow"
-  shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:" #FIXME
+  shop_for_products_html: "Shop for <span class=\"turquoise\">%{enterprise}</span> products at:"
   change_shop: "Change shop to:"
   shop_at: "Shop now at:"
   price_breakdown: "Full price breakdown"
@@ -870,13 +870,12 @@ Please follow the instructions there to make your enterprise visible on the Open
   go: "Go"
   hub: "Hub"
   accounts_administration_distributor: "accounts administration distributor"
-  admin_accounts_and_billing: "admin.accounts_and_billing_settings" #FIXME
+  accounts_and_billing: "Accounts & Billing"
   producer: "Producer"
   product: "Product"
   price: "Price"
   on_hand: "On hand"
   save_changes: "Save Changes"
-  update_action: "update()" #FIXME
   spree_admin_overview_enterprises_header: "My Enterprises"
   spree_admin_overview_enterprises_footer: "MANAGE MY ENTERPRISES"
   spree_admin_enterprises_hubs_name: "Name"
@@ -912,8 +911,8 @@ Please follow the instructions there to make your enterprise visible on the Open
   live: "live"
   manage: "Manage"
   resend: "Resend"
-  add_and_manage_products: "Add &amp; manage products"
-  add_and_manage_order_cycles: "Add &amp; manage order cycles"
+  add_and_manage_products: "Add & manage products"
+  add_and_manage_order_cycles: "Add & manage order cycles"
   manage_order_cycles: "Manage order cycles"
   manage_products: "Manage products"
   edit_profile_details: "Edit profile details"
@@ -946,14 +945,13 @@ Please follow the instructions there to make your enterprise visible on the Open
   hub_sidebar_at_least: "At least one hub must be selected"
   hub_sidebar_blue: "blue"
   hub_sidebar_red: "red"
-  shop_trial_in_progress: "Your shopfront trial expires in #{remaining_trial_days(enterprise)}." #FIXME
+  shop_trial_in_progress: "Your shopfront trial expires in %{days}."
   shop_trial_expired: "Good news! We have decided to extend shopfront trials until further notice (probably around March 2015)." #FIXME
   report_customers_distributor: "Distributor"
   report_customers_supplier: "Supplier"
   report_customers_cycle: "Order Cycle"
   report_customers_type: "Report Type"
   report_customers_csv: "Download as csv"
-  report_customers_header: "orders header"
   report_producers: "Producers: "
   report_type: "Report Type: "
   report_hubs: "Hubs: "
@@ -964,8 +962,6 @@ Please follow the instructions there to make your enterprise visible on the Open
   report_payment_totals: 'Payment Totals'
   report_all: 'all'
   report_order_cycle: "Order Cycle: "
-  report_product_header: "products_header"
-  report_order_header: "orders_header"
   report_entreprises: "Enterprises: "
   report_users: "Users: "
   initial_invoice_number: "Initial invoice number:"