Auto-merged master into ng-vo-inventory-reset on deployment.

.travis.yml

@@ -36,7 +36,7 @@ before_script:
     fi
 
 script:
-  - '[ "$KARMA" = "true" ] && bundle exec rake karma:run || echo "Skipping karma run"'
+  - 'if [ "$KARMA" = "true" ]; then bundle exec rake karma:run; else echo "Skipping karma run"; fi'
   #- "KNAPSACK_GENERATE_REPORT=true bundle exec rspec spec"
   - "bundle exec rake knapsack:rspec"
 

app/views/spree/shared/_order_details.html.haml

@@ -62,7 +62,7 @@
         %strong= order.shipping_method.name
       .pad
         .text-big
-          Ready for collection
+          = t :order_pickup_time
           %strong #{order.order_cycle.pickup_time_for(order.distributor)}
         %p.text-small.text-skinny.pre-line
           %em= order.shipping_method.description.andand.html_safe || ""

config/application.rb

@@ -66,6 +66,7 @@ module Openfoodnetwork
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     config.i18n.default_locale = ENV["LOCALE"]
+    I18n.locale = config.i18n.locale = config.i18n.default_locale
 
     # Setting this to true causes a performance regression in Rails 3.2.17
     # When we're on a version with the fix below, we can set it to true

config/locales/en.yml

@@ -227,6 +227,7 @@ en:
   order_delivery_on: Delivery on
   order_delivery_address: Delivery address
   order_special_instructions: "Your notes:"
+  order_pickup_time: Ready for collection
   order_pickup_instructions: Collection Instructions
   order_produce: Produce
   order_total_price: Total

config/locales/fr.yml

@@ -166,6 +166,7 @@ fr:
   order_delivery_on: Livraison prévue
   order_delivery_address: Adresse de livraison
   order_special_instructions: "Vos commentaires:"
+  order_pickup_time: Disponible pour retrait
   order_pickup_instructions: Instructions de retrait
   order_produce: Produit
   order_total_price: Total