Updating translations for config/locales/fr.yml [skip ci]

Complete seed data to purchase to Enterprise 2

.codeclimate.yml

@@ -1,11 +1,9 @@
 engines:
   rubocop:
     enabled: true
-    exclude_fingerprints:
-    - ac41db8d4ec4cbf508c353d9b65a024f
-    - 8e3b6322aef5be9f38700b3fd0cd347e
+    channel: rubocop-0-48
   scss-lint:
-    enabled: true
+    enabled: false
 ratings:
   paths:
   - app/**

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,28 @@
+#### What? Why?
+
+[Explain why is this change needed and the solution you propose. Provide
+context for others to understand it]
+
+#### What should we test?
+
+[List which features should be tested and how]
+
+#### Release notes
+
+[In case this should be present in the release notes, please write them or
+remove this section otherwise]
+
+#### How is this related to the Spree upgrade?
+
+[Any known conflicts with the Spree Upgrade? explain them or remove this section
+otherwise]
+
+#### Discourse thread
+
+[Is there a discussion about this in Discourse? add the link if so or remove
+this section otherwise]
+
+#### Dependencies
+
+[Does this PR depend on another one? add the link of so or remove this section
+otherwise]

.rubocop.yml

@@ -1,4 +1,9 @@
+inherit_from:
+  - .rubocop_todo.yml
+
 AllCops:
+  TargetRubyVersion: 2.1
+  TargetRailsVersion: 3.2
   Include:
     - '**/Rakefile'
     - '**/config.ru'
@@ -6,24 +11,169 @@ AllCops:
     - 'db/**/*'
     - 'config/**/*'
     - 'script/**/*'
-    - 'spec/**/*'
+    - 'vendor/**/*'
+    - 'node_modules/**/*'
     - !ruby/regexp /old_and_unused\.rb$/
 
-Documentation:
+# OFN SETTINGS
+# Cop settings that have been agreed upon by the OFN community
+
+Rails:
+  Enabled: true
+
+Style/Documentation:
   Enabled: false
 
-Style/EmptyLinesAroundClassBody:
+Style/StringLiterals:
   Enabled: false
 
-Style/BracesAroundHashParameters:
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+# TEMPORARY/CONTESTED SETTINGS
+# These are still to be decided upon, but recommended for inclusion by
+# oeoeaio after scrutinising offenses the codebase
+
+# Don't think this is a big issue, mostly picking up RPSEC scope definitions
+# with lamdas and RSpec '.to change{}' blocks
+Lint/AmbiguousBlockAssociation:
   Enabled: false
-  
+
+# Heaps of offences (> 100) in specs, mostly in situations where two or more
+# instances of a model are required, but only one is referenced. Difficult to
+# fix without making the spec look messy or rewriting it.
+# Should definitely fix at some point.
+Lint/UselessAssignment:
+  Exclude:
+  - spec/**/*
+
+# AFAIK, there is no good alternative to dynamic matchers until we upgrade
+# to Rails 4 and can use #find_by. If there is a better approach, let's do it.
+Rails/DynamicFindBy:
+  Enabled: false
+
+# This should be the programmer's discretion, perhaps we should review all of
+# the uses of it an make specific exceptions though.
+Rails/SkipsModelValidations:
+  Enabled: false
+
+# Relaxed.Ruby.Style SETTINGS
+# These styles are a starting point for the conversation around conventions
+# They should be removed or tweaked and moved above as decisions are made
+# NOTE: Cops which did not fail at the time of writing were removed
+
+Layout/DotPosition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledotposition
+
+Layout/SpaceBeforeBlockBraces:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
+
+Layout/SpaceInsideParens:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
+
+Style/Alias:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylealias
+
+Style/BlockDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleblockdelimiters
+
+Style/CommentAnnotation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylecommentannotation
+
+Style/DoubleNegation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledoublenegation
+
+Style/FormatString:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleformatstring
+
+Style/IfUnlessModifier:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleifunlessmodifier
+
+Style/Lambda:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylelambda
+
+Style/MultilineBlockChain:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylemultilineblockchain
+
+Style/NegatedIf:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedif
+
+Style/NegatedWhile:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedwhile
+
+Style/ParallelAssignment:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleparallelassignment
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylepercentliteraldelimiters
+
+Style/Semicolon:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesemicolon
+
+Style/SingleLineMethods:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
+
+Style/TrailingCommaInArguments:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainarguments
+
+Style/TrailingCommaInLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainliteral
+
+Style/WordArray:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylewordarray
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
+
+Lint/AssignmentInCondition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
 Metrics/LineLength:
   Enabled: false
-  Max: 120
 
-MethodLength:
+Metrics/MethodLength:
   Enabled: false
 
-StringLiterals:
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
   Enabled: false

.travis.yml

@@ -22,6 +22,9 @@ env:
     - CI_NODE_INDEX=3
     - CI_NODE_INDEX=4 KARMA="true" GITHUB_DEPLOY="true"
 
+before_install:
+  - ./script/upgrade_bundler.sh
+
 before_script:
   - cp config/database.travis.yml config/database.yml
   - cp config/application.yml.example config/application.yml

Gemfile

@@ -4,6 +4,7 @@ ruby "2.1.5"
 gem 'rails', '3.2.21'
 gem 'rails-i18n', '~> 3.0.0'
 gem 'i18n', '~> 0.6.11'
+gem 'i18n-js', '~> 3.0.0'
 
 # Patched version. See http://rubysec.com/advisories/CVE-2015-5312/.
 gem 'nokogiri', '>= 1.6.7.1'
@@ -126,7 +127,12 @@ group :development do
   gem 'guard-livereload'
   gem 'rack-livereload'
   gem 'guard-rails'
-  gem 'guard-zeus'
   gem 'guard-rspec'
   gem 'parallel_tests'
+  gem 'rubocop', '>= 0.49.1'
+
+  # 1.0.9 fixed openssl issues on macOS https://github.com/eventmachine/eventmachine/issues/602
+  # While we don't require this gem directly, no dependents forced the upgrade to a version
+  # greater than 1.0.9, so we just required the latest available version here.
+  gem 'eventmachine', '>= 1.2.3'
 end

Gemfile.lock

@@ -165,6 +165,7 @@ GEM
     angularjs-rails (1.5.5)
     ansi (1.4.2)
     arel (3.0.3)
+    ast (2.3.0)
     atomic (1.1.99)
     awesome_nested_set (2.1.5)
       activerecord (>= 3.0.0)
@@ -257,7 +258,7 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.5.3)
     erubis (2.7.0)
-    eventmachine (1.0.8)
+    eventmachine (1.2.3)
     excon (0.45.4)
     execjs (2.6.0)
     factory_girl (3.3.0)
@@ -407,9 +408,6 @@ GEM
     guard-rspec (4.0.4)
       guard (>= 2.1.1)
       rspec (~> 2.14)
-    guard-zeus (0.0.1)
-      guard
-      zeus
     haml (4.0.4)
       tilt
     highline (1.6.11)
@@ -419,6 +417,8 @@ GEM
       multi_json (~> 1.0)
       multi_xml
     i18n (0.6.11)
+    i18n-js (3.0.0)
+      i18n (~> 0.6, >= 0.6.6)
     immigrant (0.1.6)
       activerecord (>= 3.0)
       foreigner (>= 1.2.1)
@@ -477,9 +477,11 @@ GEM
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
-    parallel (1.4.1)
-    parallel_tests (1.3.7)
+    parallel (1.11.2)
+    parallel_tests (2.14.1)
       parallel
+    parser (2.4.0.0)
+      ast (~> 2.2)
     paypal-sdk-core (0.2.10)
       multi_json (~> 1.0)
       xml-simple
@@ -494,6 +496,7 @@ GEM
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.5)
+    powerpack (0.1.1)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -531,8 +534,10 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
+    rainbow (2.2.2)
+      rake
     raindrops (0.13.0)
-    rake (11.1.2)
+    rake (11.3.0)
     ransack (0.7.2)
       actionpack (~> 3.0)
       activerecord (~> 3.0)
@@ -578,7 +583,14 @@ GEM
       rspec-mocks (~> 2.14.0)
     rspec-retry (0.4.2)
       rspec-core
-    ruby-progressbar (1.7.1)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
     rubyzip (1.2.0)
     safe_yaml (0.9.5)
     sass (3.3.14)
@@ -620,6 +632,7 @@ GEM
     uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    unicode-display_width (1.3.0)
     unicorn (4.9.0)
       kgio (~> 2.6)
       rack
@@ -648,8 +661,6 @@ GEM
     xml-simple (1.1.4)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    zeus (0.15.4)
-      method_source (>= 0.6.7)
 
 PLATFORMS
   ruby
@@ -679,6 +690,7 @@ DEPENDENCIES
   deface!
   delayed_job_active_record
   diffy
+  eventmachine (>= 1.2.3)
   factory_girl_rails
   figaro
   foreigner
@@ -692,9 +704,9 @@ DEPENDENCIES
   guard-livereload
   guard-rails
   guard-rspec
-  guard-zeus
   haml
   i18n (~> 0.6.11)
+  i18n-js (~> 3.0.0)
   immigrant
   jquery-migrate-rails
   jquery-rails
@@ -723,6 +735,7 @@ DEPENDENCIES
   roo (~> 2.7.0)
   rspec-rails
   rspec-retry
+  rubocop (>= 0.49.1)
   sass (~> 3.3)
   sass-rails (~> 3.2.3)
   shoulda-matchers
@@ -749,4 +762,4 @@ RUBY VERSION
    ruby 2.1.5p273
 
 BUNDLED WITH
-   1.14.3
+   1.15.2

Guardfile

@@ -47,4 +47,3 @@ end
   #watch(%r{^spec/acceptance/(.+)\.feature$})
   #watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
 #end
-

README.md

@@ -54,6 +54,7 @@ First, check your dependencies: Ensure that you have Ruby 2.1.5 installed:
 Install the project's gem dependencies:
 
     cd openfoodnetwork
+    ./script/upgrade_bundler.sh
     bundle install
 
 Configure the site:
@@ -107,6 +108,9 @@ If you want karma to automatically rerun the tests on file modification, use:
 
     ./script/karma start
 
+### Multilingual
+Do not forget to run `rake tmp:cache:clear` after locales are updated to reload I18n js translations.
+
 ## Credits
 
 * Andrew Spinks (http://github.com/andrewspinks)

app/assets/javascripts/admin/all.js

@@ -48,7 +48,7 @@
 //= require textAngular-rangy.min.js
 //= require textAngular-sanitize.min.js
 //= require textAngular.min.js
-//= require darkswarm/i18n.js
+//= require i18n/translations
 //= require darkswarm/i18n.translate.js
 
 

app/assets/javascripts/admin/business_model_configuration/controllers/business_model_configuration_controller.js.coffee

@@ -14,8 +14,8 @@ angular.module("admin.businessModelConfiguration").controller "BusinessModelConf
     $scope.cappedBill()
 
   $scope.capReached = ->
-    return "No" if !$scope.cap? || Number($scope.cap) == 0
-    if $scope.bill() >= Number($scope.cap) then "Yes" else "No"
+    return t('no') if !$scope.cap? || Number($scope.cap) == 0
+    if $scope.bill() >= Number($scope.cap) then t('yes') else t('no')
 
   $scope.includedTax = ->
     return 0 if !$scope.taxRate? || Number($scope.taxRate) == 0

app/assets/javascripts/admin/customers/directives/new_customer_dialog.js.coffee

@@ -21,7 +21,7 @@ angular.module("admin.customers").directive 'newCustomerDialog', ($compile, $tem
           if response.data.errors
             scope.errors.push(error) for error in response.data.errors
           else
-            scope.errors.push("Sorry! Could not create '#{scope.email}'")
+            scope.errors.push(t('js.customers.could_not_create') + " '#{scope.email}'")
       return
 
     # Compile modal template
@@ -35,4 +35,4 @@ angular.module("admin.customers").directive 'newCustomerDialog', ($compile, $tem
       if CurrentShop.shop.id
         template.dialog('open')
       else
-        alert('Please select a shop first')
+        alert(t('js.customers.select_shop'))

app/assets/javascripts/admin/enterprise_fees/directives/delete_resource.js.coffee

@@ -2,7 +2,7 @@ angular.module('admin.enterpriseFees').directive 'spreeDeleteResource', ->
   (scope, element, attrs) ->
     if scope.enterprise_fee.id
       url = '/admin/enterprise_fees/' + scope.enterprise_fee.id
-      html = '<a href="' + url + '" class="delete-resource icon_link icon-trash no-text" data-action="remove" data-confirm="Are you sure?" url="' + url + '"></a>'
+      html = '<a href="' + url + '" class="delete-resource icon_link icon-trash no-text" data-action="remove" data-confirm="' + t('are_you_sure') + '" url="' + url + '"></a>'
       #var html = '<a href="'+url+'" class="delete-resource" data-confirm="Are you sure?"><img alt="Delete" src="/assets/admin/icons/delete.png" /> Delete</a>';
       element.append html
     return

app/assets/javascripts/admin/enterprises/controllers/enterprises_controller.js.coffee

@@ -30,27 +30,27 @@ angular.module("admin.enterprises").controller 'enterprisesCtrl', ($scope, $q, E
     $scope.producerTextFor = (enterprise) ->
       switch enterprise.is_primary_producer
         when true
-          "Producer"
+          t('js.enterprises.producer')
         else
-          "Non-Producer"
+          t('js.enterprises.non_producer')
 
     $scope.packageTextFor = (enterprise) ->
       switch enterprise.is_primary_producer
         when true
           switch enterprise.sells
             when "none"
-              "Profile"
+              t('js.profile')
             when "own"
-              "Shop"
+              t('js.shop')
             when "any"
-              "Hub"
+              t('js.hub')
             else
-              "Choose"
+              t('js.choose')
         else
           switch enterprise.sells
             when "none"
-              "Profile"
+              t('js.profile')
             when "any"
-              "Hub"
+              t('js.hub')
             else
-              "Choose"
+              t('js.choose')

app/assets/javascripts/admin/enterprises/controllers/index_panel_controller.js.coffee

@@ -14,7 +14,7 @@ angular.module("admin.enterprises").controller 'indexPanelCtrl', ($scope, Enterp
       , (response) ->
         $scope.saving = false
         if response.status == 422 && response.data.errors?
-          message = 'Please resolve the following errors:\n'
+          message = t('js.resolve_errors') + ':\n'
           for attr, msg of response.data.errors
             message += "#{attr} #{msg}\n"
           alert(message)

app/assets/javascripts/admin/enterprises/services/permalink_checker.js.coffee

@@ -19,16 +19,16 @@ angular.module("admin.enterprises").factory 'PermalinkChecker', ($q, $http) ->
         if data.length > @MAX_PERMALINK_LENGTH || !data.match(/^[\w-]+$/)
           deferredRequest.resolve
             permalink: permalink
-            available: "Error"
+            available: t('js.error')
         else
           deferredRequest.resolve
             permalink: data
-            available: "Available"
+            available: t('available')
       ).error (data,status) =>
         if status == 409
           deferredRequest.resolve
             permalink: data
-            available: "Unavailable"
+            available: t('js.unavailable')
         else
           # Something went wrong or request was aborted
           deferredRequest.reject()

app/assets/javascripts/admin/index_utils/services/pending_changes.js.coffee

@@ -21,16 +21,16 @@ angular.module("admin.indexUtils").factory "pendingChanges", ($q, resources, Sta
     submitAll: (form=null) =>
       all = []
       @errors = []
-      StatusMessage.display('progress', "Saving...")
+      StatusMessage.display('progress', t('js.saving'))
       for id, objectChanges of @pendingChanges
         for attrName, change of objectChanges
           all.push @submit(change)
       $q.all(all).then =>
         if @errors.length == 0
-          StatusMessage.display('success', "All changes saved successfully")
+          StatusMessage.display('success', t('js.all_changes_saved_successfully'))
           form.$setPristine() if form?
         else
-          StatusMessage.display('failure', "Oh no! I was unable to save your changes")
+          StatusMessage.display('failure', t('js.oh_no'))
       all
 
     submit: (change) ->

app/assets/javascripts/admin/index_utils/services/spree_api_auth.js.coffee

@@ -10,7 +10,7 @@ angular.module("admin.indexUtils").factory "SpreeApiAuth", ($q, $http, SpreeApiK
           deferred.resolve()
 
       .error (response) ->
-        error = response?.error || "You are unauthorised to access this page."
+        error = response?.error || t('js.unauthorized')
         deferred.reject(error)
 
       deferred.promise

app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee

@@ -51,13 +51,13 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
 
   $scope.$watch 'bulk_order_form.$dirty', (newVal, oldVal) ->
     if newVal == true
-      StatusMessage.display 'notice', "You have unsaved changes"
+      StatusMessage.display 'notice', t('js.unsaved_changes')
 
   $scope.submit = ->
     if $scope.bulk_order_form.$valid
-      StatusMessage.display 'progress', "Saving..."
+      StatusMessage.display 'progress', t('js.saving')
       $q.all(LineItems.saveAll()).then(->
-        StatusMessage.display 'success', "All changes saved"
+        StatusMessage.display 'success', t('js.all_changes_saved')
         $scope.bulk_order_form.$setPristine()
       ).catch ->
         StatusMessage.display 'failure', t "unsaved_changes_error"

app/assets/javascripts/admin/order_cycles/controllers/create.js.coffee

@@ -84,7 +84,7 @@ angular.module('admin.orderCycles')
 
     $scope.submit = ($event, destination) ->
       $event.preventDefault()
-      StatusMessage.display 'progress', "Saving..."
+      StatusMessage.display 'progress', t('js.saving')
       OrderCycle.create(destination)
 
     $scope.cancel = (destination) ->

app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee

@@ -87,11 +87,11 @@ angular.module('admin.orderCycles')
 
     $scope.submit = (destination) ->
       $event.preventDefault()
-      StatusMessage.display 'progress', "Saving..."
+      StatusMessage.display 'progress', t('js.saving')
 
     $scope.submit = ($event, destination) ->
       $event.preventDefault()
-      StatusMessage.display 'progress', "Saving..."
+      StatusMessage.display 'progress', t('js.saving')
       OrderCycle.update(destination, $scope.order_cycle_form)
 
     $scope.cancel = (destination) ->

app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee

@@ -49,7 +49,7 @@ angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl"
 
   $scope.submit = ($event, destination) ->
     $event.preventDefault()
-    StatusMessage.display 'progress', "Saving..."
+    StatusMessage.display 'progress', t('js.saving')
     OrderCycle.mirrorIncomingToOutgoingProducts()
     OrderCycle.create(destination)
 

app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee

@@ -42,7 +42,7 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl",
 
   $scope.submit = ($event, destination) ->
     $event.preventDefault()
-    StatusMessage.display 'progress', "Saving..."
+    StatusMessage.display 'progress', t('js.saving')
     OrderCycle.mirrorIncomingToOutgoingProducts()
     OrderCycle.update(destination, $scope.order_cycle_form)
 

app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee

@@ -165,13 +165,13 @@ angular.module('admin.orderCycles').factory 'OrderCycle', ($resource, $window, S
           if destination?
             $window.location = destination
           else
-            StatusMessage.display 'success', 'Your order cycle has been updated.'
+            StatusMessage.display 'success', t('js.order_cycles.update_success')
         else
           console.log('Failed to update order cycle')
 
     confirmNoDistributors: ->
       if @order_cycle.outgoing_exchanges.length == 0
-        confirm 'There are no distributors in this order cycle. This order cycle will not be visible to customers until you add one. Would you like to continue saving this order cycle?'
+        confirm t('js.order_cycles.no_distributors')
       else
         true
 

app/assets/javascripts/admin/product_import/controllers/import_options_form.js.coffee

@@ -1,8 +1,7 @@
 angular.module("ofn.admin").controller "ImportOptionsFormCtrl", ($scope, $rootScope, ProductImportService) ->
 
   $scope.toggleResetAbsent = () ->
-    confirmed = confirm 'This will set stock level to zero on all products for this \n' +
-      'enterprise that are not present in the uploaded file.' if $scope.resetAbsent
+    confirmed = confirm t('js.product_import.confirmation') if $scope.resetAbsent
 
     if confirmed or !$scope.resetAbsent
       ProductImportService.updateResetAbsent($scope.supplierId, $scope.resetCount, $scope.resetAbsent)

app/assets/javascripts/admin/resources/services/customers.js.coffee

@@ -24,7 +24,7 @@ angular.module("admin.resources").factory "Customers", ($q, InfoDialog, RequestM
         if errors?
           InfoDialog.open 'error', errors[0]
         else
-          InfoDialog.open 'error', "Could not delete customer: #{customer.email}"
+          InfoDialog.open 'error', t('js.resources.could_not_delete_customer') + ": #{customer.email}"
 
     index: (params) ->
       @clear()

app/assets/javascripts/admin/services/confirm_handler.js.coffee

@@ -1,6 +1,6 @@
 angular.module("ofn.admin").factory "ofnConfirmHandler", (pendingChanges, $compile, $q) ->
   return (scope, callback) ->
-    template = "<div id='dialog-div' style='padding: 10px'><h6>Unsaved changes currently exist, save now or ignore?</h6></div>"
+    template = "<div id='dialog-div' style='padding: 10px'><h6>" + t('js.services.unsaved_changes_message') + "</h6></div>"
     dialogDiv = $compile(template)(scope)
     return ->
       if pendingChanges.changeCount(pendingChanges.pendingChanges) > 0

app/assets/javascripts/admin/services/enterprise_relationships.js.coffee

@@ -26,7 +26,7 @@ angular.module("ofn.admin").factory 'EnterpriseRelationships', ($http, enterpris
 
     permission_presentation: (permission) ->
       switch permission
-        when "add_to_order_cycle" then "add to order cycle"
-        when "manage_products" then "manage products"
-        when "edit_profile" then "edit profile"
-        when "create_variant_overrides" then "add products to inventory"
+        when "add_to_order_cycle" then t('js.services.add_to_order_cycle')
+        when "manage_products" then t('js.services.manage_products')
+        when "edit_profile" then t('js.services.edit_profile')
+        when "create_variant_overrides" then t('js.services.add_products_to_inventory')

app/assets/javascripts/admin/tag_rules/controllers/tag_rules_controller.js.coffee

@@ -2,7 +2,7 @@ angular.module("admin.tagRules").controller "TagRulesCtrl", ($scope, $http, $fil
   $scope.tagGroups = enterprise.tag_groups
   $scope.defaultTagGroup = enterprise.default_tag_group
 
-  $scope.visibilityOptions = [ { id: "visible", name: "VISIBLE" }, { id: "hidden", name: "NOT VISIBLE" } ]
+  $scope.visibilityOptions = [ { id: "visible", name: t('js.tag_rules.visible')  }, { id: "hidden", name: t('js.tag_rules.not_visible') } ]
 
   $scope.updateRuleCounts = ->
     index = $scope.defaultTagGroup.rules.length
@@ -57,4 +57,4 @@ angular.module("admin.tagRules").controller "TagRulesCtrl", ($scope, $http, $fil
         .success ->
           tagGroup.rules.splice(index, 1)
           $scope.updateRuleCounts()
-          $scope.enterprise_form.$setDirty()
+          $scope.enterprise_form.$setDirty()

app/assets/javascripts/admin/tag_rules/directives/new_rule_dialog.js.coffee

@@ -9,10 +9,10 @@ angular.module("admin.tagRules").directive 'newTagRuleDialog', ($compile, $templ
 
     scope.ruleTypes = [
       # { id: "DiscountOrder", name: 'Apply a discount to orders' }
-      { id: "FilterProducts", name: 'Show or Hide variants in my shopfront' }
-      { id: "FilterShippingMethods", name: 'Show or Hide shipping methods at checkout' }
-      { id: "FilterPaymentMethods", name: 'Show or Hide payment methods at checkout' }
-      { id: "FilterOrderCycles", name: 'Show or Hide order cycles in my shopfront' }
+      { id: "FilterProducts", name: t('js.tag_rules.show_hide_variants') }
+      { id: "FilterShippingMethods", name: t('js.tag_rules.show_hide_shipping') }
+      { id: "FilterPaymentMethods", name: t('js.tag_rules.show_hide_payment') }
+      { id: "FilterOrderCycles", name: t('js.tag_rules.show_hide_order_cycles') }
     ]
 
     scope.ruleType = scope.ruleTypes[0].id

app/assets/javascripts/admin/variant_overrides/controllers/variant_overrides_controller.js.coffee

@@ -15,11 +15,11 @@ angular.module("admin.variantOverrides").controller "AdminVariantOverridesCtrl",
   $scope.currentView = -> Views.currentView
 
   $scope.views = Views.setViews
-    inventory:    { name: "Inventory Products", visible: true }
-    hidden:       { name: "Hidden Products",    visible: false }
-    new:          { name: "New Products",       visible: false }
+    inventory:    { name: t('js.variant_overrides.inventory_products'), visible: true }
+    hidden:       { name: t('js.variant_overrides.hidden_products'),    visible: false }
+    new:          { name: t('js.variant_overrides.new_products'),       visible: false }
 
-  $scope.bulkActions = [ name: "Reset Stock Levels To Defaults", callback: 'resetStock' ]
+  $scope.bulkActions = [ name: t('js.variant_overrides.reset_stock_levels'), callback: 'resetStock' ]
 
   $scope.columns = Columns.columns
 
@@ -52,22 +52,22 @@ angular.module("admin.variantOverrides").controller "AdminVariantOverridesCtrl",
 
   $scope.displayDirty = ->
     if DirtyVariantOverrides.count() > 0
-      num = if DirtyVariantOverrides.count() == 1 then "one override" else "#{DirtyVariantOverrides.count()} overrides"
-      StatusMessage.display 'notice', "Changes to #{num} remain unsaved."
+      num = if DirtyVariantOverrides.count() == 1 then t('js.variant_overrides.one_override')  else "#{DirtyVariantOverrides.count()} " + t('js.variant_overrides.overrides')
+      StatusMessage.display 'notice', t('js.variant_overrides.changes_to') + ' ' + num + ' ' + t('js.variant_overrides.remain_unsaved')
     else
       StatusMessage.clear()
 
   $scope.update = ->
     if DirtyVariantOverrides.count() == 0
-      StatusMessage.display 'alert', 'No changes to save.'
+      StatusMessage.display 'alert', t('js.variant_overrides.no_changes_to_save')
     else
-      StatusMessage.display 'progress', 'Saving...'
+      StatusMessage.display 'progress', t('js.saving')
       DirtyVariantOverrides.save()
       .success (updatedVos) ->
         DirtyVariantOverrides.clear()
         VariantOverrides.updateIds updatedVos
         $scope.variant_overrides_form.$setPristine()
-        StatusMessage.display 'success', 'Changes saved.'
+        StatusMessage.display 'success', t('js.changes_saved')
         VariantOverrides.updateData updatedVos # Refresh page data
       .error (data, status) ->
         StatusMessage.display 'failure', $scope.updateError(data, status)
@@ -75,32 +75,32 @@ angular.module("admin.variantOverrides").controller "AdminVariantOverridesCtrl",
 
   $scope.updateError = (data, status) ->
     if status == 401
-      "I couldn't get authorisation to save those changes, so they remain unsaved."
+      t('js.variant_overrides.no_authorisation')
 
     else if status == 400 && data.errors?
       errors = []
       for field, field_errors of data.errors
         errors = errors.concat field_errors
       errors = errors.join ', '
-      "I had some trouble saving: #{errors}"
+      t('js.variant_overrides.some_trouble', {errors: errors})
     else
-      "Oh no! I was unable to save your changes."
+      t('js.oh_no')
 
   $scope.resetStock = ->
     if DirtyVariantOverrides.count() > 0
-      StatusMessage.display 'alert', 'Save changes first.'
+      StatusMessage.display 'alert', t('js.save_changes_first')
       $timeout ->
         $scope.displayDirty()
       , 3000 # 3 second delay
     else
       return unless $scope.hub_id?
-      StatusMessage.display 'progress', 'Changing on hand stock levels...'
+      StatusMessage.display 'progress', t('js.variant_overrides.changing_on_hand_stock')
       $http
         method: "POST"
         url: "/admin/variant_overrides/bulk_reset"
         data: { hub_id: $scope.hub_id }
       .success (updatedVos) ->
         VariantOverrides.updateData updatedVos
-        StatusMessage.display 'success', 'Stocks reset to defaults.'
+        StatusMessage.display 'success', t('js.variant_overrides.stock_reset')
       .error (data, status) ->
         $timeout -> StatusMessage.display 'failure', $scope.updateError(data, status)

app/assets/javascripts/darkswarm/all.js.coffee

@@ -16,7 +16,7 @@
 #= require ../shared/angular-local-storage.js
 #= require ../shared/angular-slideables.js
 #= require angularjs-file-upload
-
+#= require i18n/translations
 
 #= require angular-rails-templates
 #= require_tree ../templates

app/assets/javascripts/darkswarm/controllers/registration/registration_controller.js.coffee

@@ -5,7 +5,20 @@ Darkswarm.controller "RegistrationCtrl", ($scope, RegistrationService, Enterpris
 
   $scope.steps = ['details', 'contact', 'type', 'about', 'images', 'social']
 
-  $scope.countries = availableCountries
+  # Filter countries without states since the form requires a state to be selected.
+  # Consider changing the form to require a state only if a country requires them (Spree option).
+  # Invalid countries still need to be filtered (better server-side).
+  $scope.countries = availableCountries.filter (country) ->
+    country.states.length > 0
+
+  $scope.countriesById = $scope.countries.reduce (obj, country) ->
+    obj[country.id] = country
+    obj
+  , {}
+
+  $scope.setDefaultCountry = (id) ->
+    country = $scope.countriesById[id]
+    $scope.enterprise.country = country if country
 
   $scope.countryHasStates = ->
     $scope.enterprise.country.states.length > 0

app/assets/javascripts/darkswarm/filters/filter_products.js.coffee

@@ -5,4 +5,4 @@ Darkswarm.filter 'products', (Matcher) ->
     return products if text == ""
     products.filter (product) =>
       propertiesToMatch = [product.name, product.variant_names, product.supplier.name, product.primary_taxon.name]
-      Matcher.match propertiesToMatch, text
+      Matcher.matchBeginning propertiesToMatch, text

app/assets/javascripts/darkswarm/i18n.js.erb

@@ -1,9 +0,0 @@
-<%# Defines a global I18n object containing the language of the current locale %>
-<%
-  # Invalidate this asset if locale changes.
-  Dir[Rails.root.join('config', 'locales', "#{I18n.default_locale}.yml").to_s].each do |f|
-    depend_on(f)
-  end
-%>
-<%- I18n.backend.send(:init_translations) unless I18n.backend.initialized? %>
-window.I18n = <%= I18n.backend.send(:translations)[I18n.default_locale].with_indifferent_access.to_json.html_safe %>

app/assets/javascripts/darkswarm/i18n.translate.js.coffee

@@ -1,17 +1,11 @@
+# Old aliases before i18n-js was introduced.
+# TODO - delete it after everything is moved to i18n-js
+
 # Declares the translation function t.
 # You can use translate('login') or t('login') in Javascript.
 window.translate = (key, options = {}) ->
   unless 'I18n' of window
     console.log 'The I18n object is undefined. Cannot translate text.'
     return key
-  dict = I18n
-  parts = key.split '.'
-  while (parts.length)
-    part = parts.shift()
-    return key unless part of dict
-    dict = dict[part]
-  text = dict
-  for name, value of options
-    text = text.split("%{#{name}}").join(value)
-  text
+  I18n.t(key, options)
 window.t = window.translate

app/assets/javascripts/darkswarm/services/authentication_service.js.coffee

@@ -25,9 +25,7 @@ Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location, Redir
     isActive: Navigation.isActive
 
     close: ->
-      if location.pathname in ["/", "/checkout"]
-        Navigation.navigate "/"
-      else
+      if location.pathname in ["/register", "/register/auth"]
         Loading.message = t 'going_back_to_home_page'
         location.hash = ""
         location.pathname = "/"

app/assets/javascripts/darkswarm/services/matcher.js.coffee

@@ -1,7 +1,14 @@
 Darkswarm.factory "Matcher", ->
-  # Match text fragment in an array of strings.
   new class Matcher
+
+    # Match text fragment in an array of strings.
     match: (properties, text)->
       properties.some (prop)->
         prop ||= ""
         prop.toLowerCase().indexOf(text.toLowerCase()) != -1
+
+    # Return true if text occurs at the beginning of any word present in an array of strings
+    matchBeginning: (properties, text) ->
+      text = text.trim()
+      regexp = new RegExp("(?:^|[\\s-])#{text}", "i")
+      properties.some (prop) -> (prop || "").search(regexp) >= 0

app/assets/javascripts/darkswarm/services/products.js.coffee

@@ -42,9 +42,10 @@ Darkswarm.factory 'Products', ($resource, Enterprises, Dereferencer, Taxons, Pro
     registerVariants: ->
       for product in @products
         if product.variants
+          product.variant_names = ""
           product.variants = for variant in product.variants
             variant = Variants.register variant
             if product.name != variant.name_to_display
-              product.variant_names += variant.name_to_display
+              product.variant_names += variant.name_to_display + " "
             variant.product = product
             variant

app/assets/javascripts/templates/admin/info_dialog.html.haml

@@ -6,4 +6,4 @@
       {{ message }}
   .action-buttons.text-center
     %button{ ng: { click: "close()" } }
-      OK
+      = t(:ok)

app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml

@@ -7,7 +7,7 @@
           'ng-model' => 'exchange.select_all_variants',
           'ng-change' => 'setExchangeVariants(exchange, incomingExchangeVariantsFor(exchange.enterprise_id), exchange.select_all_variants)',
           'id' => 'order_cycle_outgoing_exchange_{{ $parent.$index }}_select_all_variants' }
-        Select all
+        = t('admin.select_all')
 
     .exchange-products
       -# Scope product list based on permissions the current user has to view variants in this exchange

app/assets/javascripts/templates/admin/panels/exchange_supplied_products.html.haml

@@ -7,7 +7,7 @@
           'ng-model' => 'exchange.select_all_variants',
           'ng-change' => 'setExchangeVariants(exchange, suppliedVariants(exchange.enterprise_id), exchange.select_all_variants)',
           'id' => 'order_cycle_incoming_exchange_{{ $index }}_select_all_variants' }
-        Select all
+        = t('admin.select_all')
 
     .exchange-products
       -# No need to scope product list based on permissions, because if an incoming exchange is visible,
@@ -36,7 +36,7 @@
               'ofn-sync-distributions' => '{{ product.master_id }}',
               'id' => 'order_cycle_incoming_exchange_{{ $parent.$index }}_variants_{{ product.master_id }}',
               'ng-disabled' => '!order_cycle.editable_variants_for_incoming_exchanges.hasOwnProperty(exchange.enterprise_id) || order_cycle.editable_variants_for_incoming_exchanges[exchange.enterprise_id].indexOf(product.master_id) < 0' }
-            Obsolete master
+            = t('admin.obsolete_master')
 
         .exchange-product-variant{'ng-repeat' => 'variant in product.variants'}
           %label

app/assets/javascripts/templates/admin/panels/exchange_tags.html.haml

@@ -1,5 +1,6 @@
 .row.exchange-tags
   .sixteen.columns.alpha.omega
-    %span.text-normal Tags
+    %span.text-normal
+      = t('admin.tags')
     %br
     %tags-with-translation.fullwidth{ object: 'object' }

app/assets/javascripts/templates/admin/tag_rules/filter_order_cycles_input.html.haml

@@ -7,4 +7,5 @@
     id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_order_cycles_visibility",
     name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_order_cycles_visibility]",
     ng: { value: "'hidden'", if: "rule.is_default" } }
-  %span.text-normal{ ng: { if: "rule.is_default" } } not visible
+  %span.text-normal{ ng: { if: "rule.is_default" } }
+    =t(:not_visible)

app/assets/javascripts/templates/admin/tag_rules/filter_payment_methods_input.html.haml

@@ -7,4 +7,5 @@
     id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_payment_methods_visibility",
     name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_payment_methods_visibility]",
     ng: { value: "'hidden'", if: "rule.is_default" } }
-  %span.text-normal{ ng: { if: "rule.is_default" } } not visible
+  %span.text-normal{ ng: { if: "rule.is_default" } }
+    = t(:not_visible)

app/assets/javascripts/templates/admin/tag_rules/filter_products_input.html.haml

@@ -7,4 +7,5 @@
     id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_variants_visibility",
     name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_variants_visibility]",
     ng: { value: "'hidden'", if: "rule.is_default" } }
-  %span.text-normal{ ng: { if: "rule.is_default" } } not visible
+  %span.text-normal{ ng: { if: "rule.is_default" } }
+    = t(:not_visible)

app/assets/javascripts/templates/admin/tag_rules/filter_shipping_methods_input.html.haml

@@ -7,4 +7,6 @@
     id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_shipping_methods_visibility",
     name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_shipping_methods_visibility]",
     ng: { value: "'hidden'", if: "rule.is_default" } }
-  %span.text-normal{ ng: { if: "rule.is_default" } } not visible
+  %span.text-normal{ ng: { if: "rule.is_default" } }
+    = t(:not_visible)
+

app/assets/javascripts/templates/partials/enterprise_details.html.haml

@@ -11,7 +11,7 @@
         %span.filter-shopfront.property-selectors.pad-top
           %ul.inline-block
             %li{"ng-repeat" => "property in enterprise.supplied_properties"}
-              %a.button.tiny{"ng-bind" => "property.presentation"}
+              %a.button.tiny.disabled{"ng-bind" => "property.presentation"}
 
       .about-container.pad-top
         %img.enterprise-logo{"ng-src" => "{{::enterprise.logo}}", "ng-if" => "::enterprise.logo"}

app/assets/javascripts/templates/single_line_selectors.html.haml

@@ -5,7 +5,7 @@
   %li.more
     %a.dropdown{ data: { dropdown: "{{ 'show-more-' + selectorName }}" }, ng: { class: "{active: selectedOverFlowSelectors().length > 0}" } }
       %span
-        + {{ overFlowSelectors().length }} more
+        = t('js.more_items', count: "{{ overFlowSelectors().length }}")
       %i.ofn-i_052-point-down
     .f-dropdown.text-right.content{ ng: { attr: { id: "{{ 'show-more-' + selectorName }}" } } }
       %ul

app/assets/stylesheets/admin/openfoodnetwork.css.scss

@@ -28,8 +28,8 @@ text-angular .ta-editor {
   left: 275px;
 }
 
-span.error, div.error {
-	color: #DA5354;
+span.error, div.error:not(.flash) {
+  color: #DA5354;
 }
 
 /* Fix conflict between Spree and elRTE's styles */

app/assets/stylesheets/darkswarm/embedded_shopfront.css.scss

@@ -0,0 +1,71 @@
+body.embedded {
+  nav.top-bar {
+    ul.left, ul.center, ul.right li.current_hub {
+      display: none;
+    }
+
+    ul.right {
+      width: auto !important;
+      li {
+        float: left;
+        line-height: 4.6875rem;
+        height: 4.6875rem;
+        vertical-align: top;
+      }
+      li.powered-by {
+        display: inline-block;
+      }
+    }
+
+    &.show-for-large-up {
+      display: inherit !important;
+    }
+    &.show-for-medium-down {
+      display: none !important;
+    }
+  }
+
+  footer {
+    display: none;
+  }
+}
+
+nav.top-bar ul.right li.powered-by {
+  display: none;
+  margin-right: 0.4rem;
+  opacity: 0.6;
+
+  img {
+    height: 1.8em;
+    margin: 0px 0.4em 0.4em 0px;
+  }
+  span, a {
+    font-family: "Oswald", sans-serif;
+    font-size: 1rem;
+    font-weight: 300;
+    color: #555;
+    padding: 0 !important;
+  }
+  a:hover {
+    color: #000;
+  }
+}
+
+.blocked-cookies {
+  text-align: center;
+  margin-bottom: 0 !important;
+
+  &.hidden {
+    display: none;
+  }
+
+  a.button.allow {
+    background-color: rgba(0,0,0,0.25);
+    margin-bottom: 0.4em;
+
+    &:hover {
+      background-color: rgba(0,0,0,0.35);
+    }
+  }
+
+}

app/assets/stylesheets/darkswarm/menu.css.scss

@@ -117,6 +117,13 @@ nav {
   padding: 9px 0 0 9px;
 }
 
+.top-bar .ofn-logo img {
+  height: auto;
+  width: auto;
+  max-height: 51px;
+  max-width: 250px;
+}
+
 .left-off-canvas-menu {
   background-color: white;
 }

app/assets/stylesheets/darkswarm/mixins.scss

@@ -15,6 +15,10 @@
 @mixin panepadding {
   padding-top: 100px;
   padding-bottom: 100px;
+
+  @media all and (max-width: 640px) {
+    padding-top: 25px;
+  }
 }
 
 @mixin paneWhiteText {

app/assets/stylesheets/darkswarm/producer_node.css.scss

@@ -32,6 +32,11 @@
       color: $clr-turquoise;
     }
 
+    .vertical-align-middle {
+      display: flex;
+      align-items: center;
+    }
+
     a {
       &:hover, &:active, &:focus {
         color: $clr-turquoise-bright;

app/controllers/admin/accounts_and_billing_settings_controller.rb

@@ -15,11 +15,11 @@ class Admin::AccountsAndBillingSettingsController < Spree::Admin::BaseController
 
   def start_job
     if @update_account_invoices_job || @finalize_account_invoices_job
-      flash[:error] = "A task is already running, please wait until it has finished"
+      flash[:error] = I18n.t(:accounts_and_billing_task_already_running_error)
     else
       new_job = "#{params[:job][:name]}".camelize.constantize.new
       Delayed::Job.enqueue new_job
-      flash[:success] = "Task Queued"
+      flash[:success] = I18n.t(:accounts_and_billing_start_task_notice)
     end
 
     redirect_to_edit

app/controllers/admin/contents_controller.rb

@@ -1,12 +1,12 @@
 module Admin
   class ContentsController < Spree::Admin::BaseController
     def edit
-      @preference_sections = [{name: 'Header', preferences: [:logo, :logo_mobile, :logo_mobile_svg]},
-                              {name: 'Home page', preferences: [:home_hero, :home_show_stats]},
-                              {name: 'Producer signup page', preferences: [:producer_signup_pricing_table_html, :producer_signup_case_studies_html, :producer_signup_detail_html]},
-                              {name: 'Hub signup page', preferences: [:hub_signup_pricing_table_html, :hub_signup_case_studies_html, :hub_signup_detail_html]},
-                              {name: 'Group signup page', preferences: [:group_signup_pricing_table_html, :group_signup_case_studies_html, :group_signup_detail_html]},
-                              {name: 'Footer and External Links', preferences: [:footer_logo,
+      @preference_sections = [{name: I18n.t('admin.contents.edit.header'), preferences: [:logo, :logo_mobile, :logo_mobile_svg]},
+                              {name: I18n.t('admin.contents.edit.home_page'), preferences: [:home_hero, :home_show_stats]},
+                              {name: I18n.t('admin.contents.edit.producer_signup_page'), preferences: [:producer_signup_pricing_table_html, :producer_signup_case_studies_html, :producer_signup_detail_html]},
+                              {name: I18n.t('admin.contents.edit.hub_signup_page'), preferences: [:hub_signup_pricing_table_html, :hub_signup_case_studies_html, :hub_signup_detail_html]},
+                              {name: I18n.t('admin.contents.edit.group_signup_page'), preferences: [:group_signup_pricing_table_html, :group_signup_case_studies_html, :group_signup_detail_html]},
+                              {name: I18n.t('admin.contents.edit.footer_and_external_links'), preferences: [:footer_logo,
                                                              :footer_facebook_url, :footer_twitter_url, :footer_instagram_url, :footer_linkedin_url, :footer_googleplus_url, :footer_pinterest_url,
                                                              :footer_email, :community_forum_url, :footer_links_md, :footer_about_url, :footer_tos_url]}]
     end
@@ -21,7 +21,7 @@ module Admin
       # Save any uploaded images
       ContentConfig.save
 
-      flash[:success] = t(:successfully_updated, :resource => "Your content")
+      flash[:success] = t(:successfully_updated, :resource => I18n.t('admin.contents.edit.your_content'))
 
       redirect_to main_app.edit_admin_content_path
     end

app/controllers/admin/enterprise_fees_controller.rb

@@ -35,7 +35,7 @@ module Admin
         if params.key? :enterprise_id
           redirect_path = main_app.admin_enterprise_fees_path(enterprise_id: params[:enterprise_id])
         end
-        redirect_to redirect_path, :notice => 'Your enterprise fees have been updated.'
+        redirect_to redirect_path, :notice => I18n.t(:enterprise_fees_update_notice)
 
       else
         render :index
@@ -49,7 +49,7 @@ module Admin
       product_distribution = ProductDistribution.where(:enterprise_fee_id => @object).first
       if product_distribution
         p = product_distribution.product
-        error = "That enterprise fee cannot be deleted as it is referenced by a product distribution: #{p.id} - #{p.name}."
+        error = I18n.t(:enterprise_fees_destroy_error, id: p.id, name: p.name)
 
         respond_with(@object) do |format|
           format.html do

app/controllers/admin/enterprise_groups_controller.rb

@@ -52,7 +52,6 @@ module Admin
       @owner_email = @enterprise_group.andand.owner.andand.email || ""
     end
 
-
     def collection
       EnterpriseGroup.by_position
     end

app/controllers/admin/enterprises_controller.rb

@@ -57,7 +57,7 @@ module Admin
 
     def register
       if params[:sells] == 'unspecified'
-        flash[:error] = "Please select a package"
+        flash[:error] = I18n.t(:enterprise_register_package_error)
         return render :welcome, layout: "spree/layouts/bare_admin"
       end
 
@@ -68,10 +68,10 @@ module Admin
       end
 
       if @enterprise.update_attributes(attributes)
-        flash[:success] = "Congratulations! Registration for #{@enterprise.name} is complete!"
+        flash[:success] = I18n.t(:enterprise_register_success_notice, enterprise: @enterprise.name)
         redirect_to admin_path
       else
-        flash[:error] = "Could not complete registration for #{@enterprise.name}"
+        flash[:error] = I18n.t(:enterprise_register_error, enterprise: @enterprise.name)
         render :welcome, layout: "spree/layouts/bare_admin"
       end
     end
@@ -80,19 +80,19 @@ module Admin
       @enterprise_set = EnterpriseSet.new(collection, params[:enterprise_set])
       touched_enterprises = @enterprise_set.collection.select(&:changed?)
       if @enterprise_set.save
-        flash[:success] = "Enterprises updated successfully"
+        flash[:success] = I18n.t(:enterprise_bulk_update_success_notice)
 
         # 18-3-2015: It seems that the form for this action sometimes loads bogus values for
         # the 'sells' field, and submitting that form results in a bunch of enterprises with
         # values that have mysteriously changed. This statement is here to help debug that
         # issue, and should be removed (along with its display in index.html.haml) when the
         # issue has been resolved.
-        flash[:action] = "Updated #{pluralize(touched_enterprises.count, 'enterprise')}: #{touched_enterprises.map(&:name).join(', ')}"
+        flash[:action] = "#{I18n.t(:updated)} #{pluralize(touched_enterprises.count, 'enterprise')}: #{touched_enterprises.map(&:name).join(', ')}"
 
         redirect_to main_app.admin_enterprises_path
       else
         @enterprise_set.collection.select! { |e| touched_enterprises.include? e }
-        flash[:error] = 'Update failed'
+        flash[:error] = I18n.t(:enterprise_bulk_update_error)
         render :index
       end
     end

app/controllers/admin/order_cycles_controller.rb

@@ -45,7 +45,7 @@ module Admin
         if @order_cycle.save
           OpenFoodNetwork::OrderCycleFormApplicator.new(@order_cycle, spree_current_user).go!
 
-          flash[:notice] = 'Your order cycle has been created.'
+          flash[:notice] = I18n.t(:order_cycles_create_notice)
           format.html { redirect_to admin_order_cycles_path }
           format.json { render :json => {:success => true} }
         else
@@ -64,7 +64,7 @@ module Admin
             # Only update apply exchange information if it is actually submmitted
             OpenFoodNetwork::OrderCycleFormApplicator.new(@order_cycle, spree_current_user).go!
           end
-          flash[:notice] = 'Your order cycle has been updated.' if params[:reloading] == '1'
+          flash[:notice] = I18n.t(:order_cycles_update_notice) if params[:reloading] == '1'
           format.html { redirect_to main_app.edit_admin_order_cycle_path(@order_cycle) }
           format.json { render :json => {:success => true}  }
         else
@@ -76,7 +76,7 @@ module Admin
     def bulk_update
       @order_cycle_set = params[:order_cycle_set] && OrderCycleSet.new(params[:order_cycle_set])
       if @order_cycle_set.andand.save
-        redirect_to main_app.admin_order_cycles_path, :notice => 'Order cycles have been updated.'
+        redirect_to main_app.admin_order_cycles_path, notice: I18n.t(:order_cycles_bulk_update_notice)
       else
         render :index
       end
@@ -85,14 +85,14 @@ module Admin
     def clone
       @order_cycle = OrderCycle.find params[:id]
       @order_cycle.clone!
-      redirect_to main_app.admin_order_cycles_path, :notice => "Your order cycle #{@order_cycle.name} has been cloned."
+      redirect_to main_app.admin_order_cycles_path, notice: I18n.t(:order_cycles_clone_notice, name: @order_cycle.name)
     end
 
     # Send notifications to all producers who are part of the order cycle
     def notify_producers
       Delayed::Job.enqueue OrderCycleNotificationJob.new(params[:id].to_i)
 
-      redirect_to main_app.admin_order_cycles_path, :notice => 'Emails to be sent to producers have been queued for sending.'
+      redirect_to main_app.admin_order_cycles_path, notice: I18n.t(:order_cycles_email_to_producers_notice)
     end
 
 
@@ -100,10 +100,10 @@ module Admin
     def collection
       ocs = if params[:as] == "distributor"
         OrderCycle.ransack(params[:q]).result.
-        involving_managed_distributors_of(spree_current_user).order('updated_at DESC')
+          involving_managed_distributors_of(spree_current_user).order('updated_at DESC')
       elsif params[:as] == "producer"
         OrderCycle.ransack(params[:q]).result.
-        involving_managed_producers_of(spree_current_user).order('updated_at DESC')
+          involving_managed_producers_of(spree_current_user).order('updated_at DESC')
       else
         OrderCycle.ransack(params[:q]).result.accessible_by(spree_current_user)
       end
@@ -115,7 +115,7 @@ module Admin
     end
 
     def collection_actions
-      [:index]
+      [:index, :bulk_update]
     end
 
     private
@@ -138,12 +138,12 @@ module Admin
       available_coordinators = permitted_coordinating_enterprises_for(@order_cycle).select(&:confirmed?)
       case available_coordinators.count
       when 0
-        flash[:error] = "None of your enterprises have permission to coordinate an order cycle"
+        flash[:error] = I18n.t(:order_cycles_no_permission_to_coordinate_error)
         redirect_to main_app.admin_order_cycles_path
       when 1
         @order_cycle.coordinator = available_coordinators.first
       else
-        flash[:error] = "You don't have permission to create an order cycle coordinated by that enterprise" if params[:coordinator_id]
+        flash[:error] = I18n.t(:order_cycles_no_permission_to_create_error) if params[:coordinator_id]
         render :set_coordinator
       end
     end
@@ -153,7 +153,7 @@ module Admin
         yield
       rescue ActiveRecord::InvalidForeignKey
         redirect_to main_app.admin_order_cycles_url
-        flash[:error] = "That order cycle has been selected by a customer and cannot be deleted. To prevent customers from accessing it, please close it instead."
+        flash[:error] = I18n.t(:order_cycles_no_permission_to_delete_error)
       end
     end
 
@@ -179,9 +179,5 @@ module Admin
     def ams_prefix_whitelist
       [:basic]
     end
-
-    def collection_actions
-      [:index, :bulk_update]
-    end
   end
 end

app/controllers/admin/product_import_controller.rb

@@ -25,7 +25,7 @@ class Admin::ProductImportController < Spree::Admin::BaseController
 
   def validate_upload_presence
     unless params[:file] || (params[:filepath] && File.exist?(params[:filepath]))
-      redirect_to '/admin/product_import', notice: 'File not found or could not be opened'
+      redirect_to '/admin/product_import', notice: I18n.t(:product_import_file_not_found_notice)
       return
     end
   end
@@ -39,7 +39,7 @@ class Admin::ProductImportController < Spree::Admin::BaseController
 
   def check_spreadsheet_has_data(importer)
     unless importer.item_count
-      redirect_to '/admin/product_import', notice: 'No data found in spreadsheet'
+      redirect_to '/admin/product_import', notice: I18n.t(:product_import_no_data_in_spreadsheet_notice)
       return
     end
   end
@@ -59,4 +59,4 @@ class Admin::ProductImportController < Spree::Admin::BaseController
   def model_class
     ProductImporter
   end
-end
+end

app/controllers/admin/resource_controller.rb

@@ -4,7 +4,6 @@ module Admin
       "#{controller_name.classify}".constantize
     end
 
-
     # URL helpers
     def new_object_url(options = {})
       if parent_data.present?

app/controllers/admin/variant_overrides_controller.rb

@@ -12,7 +12,6 @@ module Admin
     def index
     end
 
-
     def bulk_update
       # Ensure we're authorised to update all variant overrides
       @vo_set.collection.each { |vo| authorize! :update, vo }

app/controllers/api/order_cycles_controller.rb

@@ -11,10 +11,10 @@ module Api
     def accessible
       @order_cycles = if params[:as] == "distributor"
         OrderCycle.ransack(params[:q]).result.
-        involving_managed_distributors_of(current_api_user).order('updated_at DESC')
+          involving_managed_distributors_of(current_api_user).order('updated_at DESC')
       elsif params[:as] == "producer"
         OrderCycle.ransack(params[:q]).result.
-        involving_managed_producers_of(current_api_user).order('updated_at DESC')
+          involving_managed_producers_of(current_api_user).order('updated_at DESC')
       else
         OrderCycle.ransack(params[:q]).result.accessible_by(current_api_user)
       end

app/controllers/application_controller.rb

@@ -3,6 +3,8 @@ require 'open_food_network/referer_parser'
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
+  prepend_before_filter :restrict_iframes
+
   include EnterprisesHelper
   helper CssSplitter::ApplicationHelper
 
@@ -18,13 +20,74 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def shopfront_session
+    session[:safari_fix] = true
+    render 'shop/shopfront_session', layout: false
+  end
+
+  def enable_embedded_styles
+    session[:embedded_shopfront] = true
+    render json: {}, status: 200
+  end
+
+  def disable_embedded_styles
+    session.delete :embedded_shopfront
+    session.delete :shopfront_redirect
+    render json: {}, status: 200
+  end
+
+  protected
+
+  def after_sign_in_path_for(resource_or_scope)
+    return session[:shopfront_redirect] if session[:shopfront_redirect]
+    stored_location_for(resource_or_scope) || signed_in_root_path(resource_or_scope)
+  end
+
+  def after_sign_out_path_for(_resource_or_scope)
+    session[:shopfront_redirect] ? session[:shopfront_redirect] : root_path
+  end
+
   private
 
+  def restrict_iframes
+    response.headers['X-Frame-Options'] = 'DENY'
+    response.headers['Content-Security-Policy'] = "frame-ancestors 'none'"
+  end
+
+  def enable_embedded_shopfront
+    whitelist = Spree::Config[:embedded_shopfronts_whitelist]
+    return unless Spree::Config[:enable_embedded_shopfronts] && whitelist.present?
+    return if request.referer && URI(request.referer).scheme != 'https' && !Rails.env.test?
+
+    response.headers.delete 'X-Frame-Options'
+    response.headers['Content-Security-Policy'] = "frame-ancestors #{whitelist}"
+
+    check_embedded_request
+    set_embedded_layout
+  end
+
+  def check_embedded_request
+    return unless params[:embedded_shopfront]
+
+    # Show embedded shopfront CSS
+    session[:embedded_shopfront] = true
+
+    # Get shopfront slug and set redirect path
+    if params[:controller] == 'enterprises' && params[:action] == 'shop' && params[:id]
+      slug = params[:id]
+      session[:shopfront_redirect] = '/' + slug + '/shop?embedded_shopfront=true'
+    end
+  end
+
+  def set_embedded_layout
+    return unless session[:embedded_shopfront]
+    @shopfront_layout = 'embedded'
+  end
+
   def action
     params[:action].to_sym
   end
 
-
   def require_distributor_chosen
     unless @distributor = current_distributor
       redirect_to spree.root_path
@@ -62,7 +125,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-
   # All render calls within the block will be performed with the specified format
   # Useful for rendering html within a JSON response, particularly if the specified
   # template or partial then goes on to render further partials without specifying

app/controllers/base_controller.rb

@@ -8,6 +8,7 @@ class BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::RespondWith
 
+  include I18nHelper
   include EnterprisesHelper
   include OrderCyclesHelper
 
@@ -17,9 +18,9 @@ class BaseController < ApplicationController
   # include Spree::ProductsHelper so that method is available on the controller
   include Spree::ProductsHelper
 
+  before_filter :set_locale
   before_filter :check_order_cycle_expiry
 
-
   private
 
   def set_order_cycles
@@ -29,7 +30,7 @@ class BaseController < ApplicationController
     end
 
     @order_cycles = OrderCycle.with_distributor(@distributor).active
-    .order(@distributor.preferred_shopfront_order_cycle_order)
+      .order(@distributor.preferred_shopfront_order_cycle_order)
 
     applicator = OpenFoodNetwork::TagRuleApplicator.new(@distributor, "FilterOrderCycles", current_customer.andand.tag_list)
     applicator.filter!(@order_cycles)

app/controllers/checkout_controller.rb

@@ -9,6 +9,7 @@ class CheckoutController < Spree::CheckoutController
   prepend_before_filter :require_distributor_chosen
 
   skip_before_filter :check_registration
+  before_filter :enable_embedded_shopfront
 
   include OrderCyclesHelper
   include EnterprisesHelper
@@ -88,7 +89,7 @@ class CheckoutController < Spree::CheckoutController
 
   def check_order_for_phantom_fees
     phantom_fees = @order.adjustments.joins('LEFT OUTER JOIN spree_line_items ON spree_line_items.id = spree_adjustments.source_id').
-    where("originator_type = 'EnterpriseFee' AND source_type = 'Spree::LineItem' AND spree_line_items.id IS NULL")
+      where("originator_type = 'EnterpriseFee' AND source_type = 'Spree::LineItem' AND spree_line_items.id IS NULL")
 
     if phantom_fees.any?
       Bugsnag.notify(RuntimeError.new("Phantom Fees"), {
@@ -123,7 +124,6 @@ class CheckoutController < Spree::CheckoutController
     false
   end
 
-
   def update_failed
     clear_ship_address
     respond_to do |format|
@@ -168,8 +168,8 @@ class CheckoutController < Spree::CheckoutController
 
     customer_preferred_bill_address, customer_preferred_ship_address = @order.customer.bill_address, @order.customer.ship_address if @order.customer
 
-    @order.bill_address ||= customer_preferred_bill_address ||= preferred_bill_address || last_used_bill_address || Spree::Address.default
-    @order.ship_address ||= customer_preferred_ship_address ||= preferred_ship_address || last_used_ship_address || Spree::Address.default
+    @order.bill_address ||= customer_preferred_bill_address || preferred_bill_address || last_used_bill_address || Spree::Address.default
+    @order.ship_address ||= customer_preferred_ship_address || preferred_ship_address || last_used_ship_address || Spree::Address.default
   end
 
   def after_payment

app/controllers/discourse_sso_controller.rb

@@ -30,7 +30,6 @@ class DiscourseSsoController < ApplicationController
 
   def sso_url
     secret = discourse_sso_secret!
-    discourse_url = discourse_url!
     sso = Discourse::SingleSignOn.parse(request.query_string, secret)
     sso.email = spree_current_user.email
     sso.username = spree_current_user.login

app/controllers/enterprises_controller.rb

@@ -10,6 +10,7 @@ class EnterprisesController < BaseController
   before_filter :check_stock_levels, only: :shop
 
   before_filter :clean_permalink, only: :check_permalink
+  before_filter :enable_embedded_shopfront
 
   respond_to :js, only: :permalink_checker
 

app/controllers/home_controller.rb

@@ -1,6 +1,8 @@
 class HomeController < BaseController
   layout 'darkswarm'
 
+  before_filter :enable_embedded_shopfront
+
   def index
     if ContentConfig.home_show_stats
       @num_distributors = Enterprise.is_distributor.activated.visible.count

app/controllers/producers_controller.rb

@@ -1,6 +1,8 @@
 class ProducersController < BaseController
   layout 'darkswarm'
 
+  before_filter :enable_embedded_shopfront
+
   def index
   end
 end

app/controllers/shop_controller.rb

@@ -2,8 +2,8 @@ require 'open_food_network/cached_products_renderer'
 
 class ShopController < BaseController
   layout "darkswarm"
-  before_filter :require_distributor_chosen
-  before_filter :set_order_cycles
+  before_filter :require_distributor_chosen, :set_order_cycles, except: :changeable_orders_alert
+  before_filter :enable_embedded_shopfront
 
   def show
     redirect_to main_app.enterprise_shop_path(current_distributor)

app/controllers/shops_controller.rb

@@ -1,6 +1,8 @@
 class ShopsController < BaseController
   layout 'darkswarm'
 
+  before_filter :enable_embedded_shopfront
+
   def index
   end
 end

app/controllers/spree/admin/adjustments_controller_decorator.rb

@@ -23,12 +23,11 @@ module Spree
           @tax_rate_id = tr_yielding_matching_tax || tr_valid_for_order
 
           if tr_yielding_matching_tax.nil?
-            @adjustment.errors.add :tax_rate_id, "^Please check that the tax rate for this adjustment is correct."
+            @adjustment.errors.add :tax_rate_id, I18n.t(:adjustments_tax_rate_error)
           end
         end
       end
 
-
       def set_included_tax
         if params[:tax_rate_id].present?
           tax_rate = TaxRate.find params[:tax_rate_id]

app/controllers/spree/admin/base_controller_decorator.rb

@@ -1,6 +1,9 @@
 require 'spree/core/controller_helpers/respond_with_decorator'
 
 Spree::Admin::BaseController.class_eval do
+  include I18nHelper
+
+  before_filter :set_locale
   before_filter :warn_invalid_order_cycles
 
   # Warn the user when they have an active order cycle with hubs that are not ready
@@ -51,13 +54,9 @@ Spree::Admin::BaseController.class_eval do
     distributor_names = distributors.map(&:name).join ', '
 
     if distributors.count > 1
-      "The hubs #{distributor_names} are listed in an active order cycle, " +
-        "but do not have valid shipping and payment methods. " +
-        "Until you set these up, customers will not be able to shop at these hubs."
+      I18n.t(:active_distributors_not_ready_for_checkout_message_plural, distributor_names: distributor_names)
     else
-      "The hub #{distributor_names} is listed in an active order cycle, " +
-        "but does not have valid shipping and payment methods. " +
-        "Until you set these up, customers will not be able to shop at this hub."
+      I18n.t(:active_distributors_not_ready_for_checkout_message_singular, distributor_names: distributor_names)
     end
   end
 

app/controllers/spree/admin/orders_controller_decorator.rb

@@ -112,9 +112,9 @@ Spree::Admin::OrdersController.class_eval do
 
       # Replaced this search to filter orders to only show those distributed by current user (or all for admin user)
       @search.result.includes([:user, :shipments, :payments]).
-          distributed_by_user(spree_current_user).
-          page(params[:page]).
-          per(params[:per_page] || Spree::Config[:orders_per_page])
+        distributed_by_user(spree_current_user).
+        page(params[:page]).
+        per(params[:per_page] || Spree::Config[:orders_per_page])
     end
   end
 

app/controllers/spree/admin/reports_controller_decorator.rb

@@ -18,55 +18,40 @@ Spree::Admin::ReportsController.class_eval do
 
   include Spree::ReportsHelper
 
-  REPORT_TYPES = {
-    orders_and_fulfillment: [
-      ['Order Cycle Supplier Totals',:order_cycle_supplier_totals],
-      ['Order Cycle Supplier Totals by Distributor',:order_cycle_supplier_totals_by_distributor],
-      ['Order Cycle Distributor Totals by Supplier',:order_cycle_distributor_totals_by_supplier],
-      ['Order Cycle Customer Totals',:order_cycle_customer_totals]
-    ],
-    products_and_inventory: [
-      ['All products', :all_products],
-      ['Inventory (on hand)', :inventory],
-      ['LettuceShare', :lettuce_share]
-    ],
-    customers: [
-      ["Mailing List", :mailing_list],
-      ["Addresses", :addresses]
-    ],
-    order_cycle_management: [
-      ["Payment Methods Report", :payment_methods],
-      ["Delivery Report", :delivery]
-    ],
-    sales_tax: [
-      ["Tax Types", :tax_types],
-      ["Tax Rates", :tax_rates]
-    ],
-    packing: [
-      ["Pack By Customer", :pack_by_customer],
-      ["Pack By Supplier", :pack_by_supplier]
-    ]
-  }
-
   # Fetches user's distributors, suppliers and order_cycles
   before_filter :load_data, only: [:customers, :products_and_inventory, :order_cycle_management, :packing]
 
-  # Render a partial for orders and fulfillment description
-  respond_override :index => { :html => { :success => lambda {
-    @reports[:orders_and_fulfillment][:description] =
-      render_to_string(partial: 'orders_and_fulfillment_description', layout: false, locals: {report_types: REPORT_TYPES[:orders_and_fulfillment]}).html_safe
-    @reports[:products_and_inventory][:description] =
-      render_to_string(partial: 'products_and_inventory_description', layout: false, locals: {report_types: REPORT_TYPES[:products_and_inventory]}).html_safe
-    @reports[:customers][:description] =
-      render_to_string(partial: 'customers_description', layout: false, locals: {report_types: REPORT_TYPES[:customers]}).html_safe
-    @reports[:order_cycle_management][:description] =
-      render_to_string(partial: 'order_cycle_management_description', layout: false, locals: {report_types: REPORT_TYPES[:order_cycle_management]}).html_safe
-    @reports[:packing][:description] =
-        render_to_string(partial: 'packing_description', layout: false, locals: {report_types: REPORT_TYPES[:packing]}).html_safe
-    @reports[:sales_tax][:description] =
-        render_to_string(partial: 'sales_tax_description', layout: false, locals: {report_types: REPORT_TYPES[:sales_tax]}).html_safe
-} } }
-
+  def report_types
+    {
+      orders_and_fulfillment: [
+        [I18n.t('admin.reports.supplier_totals'), :order_cycle_supplier_totals],
+        [I18n.t('admin.reports.supplier_totals_by_distributor'), :order_cycle_supplier_totals_by_distributor],
+        [I18n.t('admin.reports.totals_by_supplier'), :order_cycle_distributor_totals_by_supplier],
+        [I18n.t('admin.reports.customer_totals'), :order_cycle_customer_totals]
+      ],
+      products_and_inventory: [
+        [I18n.t('admin.reports.all_products'), :all_products],
+        [I18n.t('admin.reports.inventory'), :inventory],
+        [I18n.t('admin.reports.lettuce_share'), :lettuce_share]
+      ],
+      customers: [
+        [I18n.t('admin.reports.mailing_list'), :mailing_list],
+        [I18n.t('admin.reports.addresses'), :addresses]
+      ],
+      order_cycle_management: [
+        [I18n.t('admin.reports.payment_methods'), :payment_methods],
+        [I18n.t('admin.reports.delivery'), :delivery]
+      ],
+      sales_tax: [
+        [I18n.t('admin.reports.tax_types'), :tax_types],
+        [I18n.t('admin.reports.tax_rates'), :tax_rates]
+      ],
+      packing: [
+        [I18n.t('admin.reports.pack_by_customer'), :pack_by_customer],
+        [I18n.t('admin.reports.pack_by_supplier'), :pack_by_supplier]
+      ]
+    }
+  end
 
   # Overide spree reports list.
   def index
@@ -76,7 +61,7 @@ Spree::Admin::ReportsController.class_eval do
 
   # This action is short because we refactored it like bosses
   def customers
-    @report_types = REPORT_TYPES[:customers]
+    @report_types = report_types[:customers]
     @report_type = params[:report_type]
     @report = OpenFoodNetwork::CustomersReport.new spree_current_user, params
     render_report(@report.header, @report.table, params[:csv], "customers_#{timestamp}.csv")
@@ -95,13 +80,12 @@ Spree::Admin::ReportsController.class_eval do
     @suppliers = my_suppliers | my_distributors.map { |d| Spree::Product.in_distributor(d) }.flatten.map(&:supplier).uniq
     @order_cycles = OrderCycle.active_or_complete.accessible_by(spree_current_user).order('orders_close_at DESC')
 
-    @report_types = REPORT_TYPES[:order_cycle_management]
+    @report_types = report_types[:order_cycle_management]
     @report_type = params[:report_type]
 
     # -- Build Report with Order Grouper
     @report = OpenFoodNetwork::OrderCycleManagementReport.new spree_current_user, params
     @table = @report.table_items
-    csv_file_name = "#{params[:report_type]}_#{timestamp}.csv"
 
     render_report(@report.header, @table, params[:csv], "order_cycle_management_#{timestamp}.csv")
   end
@@ -119,14 +103,13 @@ Spree::Admin::ReportsController.class_eval do
     # My suppliers and any suppliers supplying products I distribute
     @suppliers = my_suppliers | my_distributors.map { |d| Spree::Product.in_distributor(d) }.flatten.map(&:supplier).uniq
     @order_cycles = OrderCycle.active_or_complete.accessible_by(spree_current_user).order('orders_close_at DESC')
-    @report_types = REPORT_TYPES[:packing]
+    @report_types = report_types[:packing]
     @report_type = params[:report_type]
 
     # -- Build Report with Order Grouper
     @report = OpenFoodNetwork::PackingReport.new spree_current_user, params
     order_grouper = OpenFoodNetwork::OrderGrouper.new @report.rules, @report.columns
     @table = order_grouper.table(@report.table_items)
-    csv_file_name = "#{params[:report_type]}_#{timestamp}.csv"
 
     render_report(@report.header, @table, params[:csv], "packing_#{timestamp}.csv")
   end
@@ -145,9 +128,9 @@ Spree::Admin::ReportsController.class_eval do
     orders.select{ |order| orders_with_hidden_details.include? order }.each do |order|
       # TODO We should really be hiding customer code here too, but until we
       # have an actual association between order and customer, it's a bit tricky
-      order.bill_address.andand.assign_attributes(firstname: "HIDDEN", lastname: "", phone: "", address1: "", address2: "", city: "", zipcode: "", state: nil)
-      order.ship_address.andand.assign_attributes(firstname: "HIDDEN", lastname: "", phone: "", address1: "", address2: "", city: "", zipcode: "", state: nil)
-      order.assign_attributes(email: "HIDDEN")
+      order.bill_address.andand.assign_attributes(firstname: I18n.t('admin.reports.hidden'), lastname: "", phone: "", address1: "", address2: "", city: "", zipcode: "", state: nil)
+      order.ship_address.andand.assign_attributes(firstname: I18n.t('admin.reports.hidden'), lastname: "", phone: "", address1: "", address2: "", city: "", zipcode: "", state: nil)
+      order.assign_attributes(email: I18n.t('admin.reports.hidden'))
     end
 
     @report = OpenFoodNetwork::OrderAndDistributorReport.new orders
@@ -226,9 +209,9 @@ Spree::Admin::ReportsController.class_eval do
     @suppliers = permissions.visible_enterprises_for_order_reports.is_primary_producer
 
     @order_cycles = OrderCycle.active_or_complete.
-    involving_managed_distributors_of(spree_current_user).order('orders_close_at DESC')
+      involving_managed_distributors_of(spree_current_user).order('orders_close_at DESC')
 
-    @report_types = REPORT_TYPES[:orders_and_fulfillment]
+    @report_types = report_types[:orders_and_fulfillment]
     @report_type = params[:report_type]
 
     @include_blank = I18n.t(:all)
@@ -244,7 +227,7 @@ Spree::Admin::ReportsController.class_eval do
   end
 
   def products_and_inventory
-    @report_types = REPORT_TYPES[:products_and_inventory]
+    @report_types = report_types[:products_and_inventory]
     if params[:report_type] != 'lettuce_share'
       @report = OpenFoodNetwork::ProductsAndInventoryReport.new spree_current_user, params
     else
@@ -254,7 +237,7 @@ Spree::Admin::ReportsController.class_eval do
   end
 
   def users_and_enterprises
-    # @report_types = REPORT_TYPES[:users_and_enterprises]
+    # @report_types = report_types[:users_and_enterprises]
     @report = OpenFoodNetwork::UsersAndEnterprisesReport.new params
     render_report(@report.header, @report.table, params[:csv], "users_and_enterprises_#{timestamp}.csv")
   end
@@ -273,7 +256,6 @@ Spree::Admin::ReportsController.class_eval do
     render_report(@report.header, @report.table, params[:csv], "xero_invoices_#{timestamp}.csv")
   end
 
-
   def render_report(header, table, create_csv, csv_file_name)
     unless create_csv
       render :html => table
@@ -316,19 +298,33 @@ Spree::Admin::ReportsController.class_eval do
 
   def authorized_reports
     reports = {
-      :orders_and_distributors => {:name => "Orders And Distributors", :description => "Orders with distributor details"},
-      :bulk_coop => {:name => "Bulk Co-Op", :description => "Reports for Bulk Co-Op orders"},
-      :payments => {:name => "Payment Reports", :description => "Reports for Payments"},
-      :orders_and_fulfillment => {:name => "Orders & Fulfillment Reports", :description => ''},
-      :customers => {:name => "Customers", :description => 'Customer details'},
-      :products_and_inventory => {:name => "Products & Inventory", :description => ''},
-      :sales_total => { :name => "Sales Total", :description => "Sales Total For All Orders" },
-      :users_and_enterprises => { :name => "Users & Enterprises", :description => "Enterprise Ownership & Status" },
-      :order_cycle_management => {:name => "Order Cycle Management", :description => ''},
-      :sales_tax => { :name => "Sales Tax", :description => "Sales Tax For Orders" },
-      :xero_invoices => { :name => "Xero Invoices", :description => 'Invoices for import into Xero' },
-      :packing => { :name => "Packing Reports", :description => '' }
+      :orders_and_distributors => {:name => I18n.t('admin.reports.orders_and_distributors.name'), :description => I18n.t('admin.reports.orders_and_distributors.description')},
+      :bulk_coop => {:name => I18n.t('admin.reports.bulk_coop.name'), :description => I18n.t('admin.reports.bulk_coop.description')},
+      :payments => {:name => I18n.t('admin.reports.payments.name'), :description => I18n.t('admin.reports.payments.description')},
+      :orders_and_fulfillment => {:name => I18n.t('admin.reports.orders_and_fulfillment.name'), :description => ''},
+      :customers => {:name => I18n.t('admin.reports.customers.name'), :description => ''},
+      :products_and_inventory => {:name => I18n.t('admin.reports.products_and_inventory.name'), :description => ''},
+      :sales_total => {:name => I18n.t('admin.reports.sales_total.name'), :description => I18n.t('admin.reports.sales_total.description')},
+      :users_and_enterprises => {:name => I18n.t('admin.reports.users_and_enterprises.name'), :description => I18n.t('admin.reports.users_and_enterprises.description')},
+      :order_cycle_management => {:name => I18n.t('admin.reports.order_cycle_management.name'), :description => ''},
+      :sales_tax => {:name => I18n.t('admin.reports.sales_tax.name'), :description => ''},
+      :xero_invoices => {:name => I18n.t('admin.reports.xero_invoices.name'), :description => I18n.t('admin.reports.xero_invoices.description')},
+      :packing => {:name => I18n.t('admin.reports.packing.name'), :description => ''}
     }
+
+    reports[:orders_and_fulfillment][:description] =
+      render_to_string(partial: 'orders_and_fulfillment_description', layout: false, locals: {report_types: report_types[:orders_and_fulfillment]}).html_safe
+    reports[:products_and_inventory][:description] =
+      render_to_string(partial: 'products_and_inventory_description', layout: false, locals: {report_types: report_types[:products_and_inventory]}).html_safe
+    reports[:customers][:description] =
+      render_to_string(partial: 'customers_description', layout: false, locals: {report_types: report_types[:customers]}).html_safe
+    reports[:order_cycle_management][:description] =
+      render_to_string(partial: 'order_cycle_management_description', layout: false, locals: {report_types: report_types[:order_cycle_management]}).html_safe
+    reports[:packing][:description] =
+        render_to_string(partial: 'packing_description', layout: false, locals: {report_types: report_types[:packing]}).html_safe
+    reports[:sales_tax][:description] =
+        render_to_string(partial: 'sales_tax_description', layout: false, locals: {report_types: report_types[:sales_tax]}).html_safe
+
     # Return only reports the user is authorized to view.
     reports.select { |action| can? action, :report }
   end

app/controllers/spree/admin/search_controller_decorator.rb

@@ -19,7 +19,7 @@ Spree::Admin::SearchController.class_eval do
   def customers
     if spree_current_user.enterprises.pluck(:id).include? params[:distributor_id].to_i
       @customers = Customer.ransack({m: 'or', email_start: params[:q], name_start: params[:q]})
-                        .result.where(enterprise_id: params[:distributor_id])
+        .result.where(enterprise_id: params[:distributor_id])
     else
       @customers = []
     end

app/controllers/spree/admin/shipping_methods_controller_decorator.rb

@@ -38,7 +38,7 @@ module Spree
       def do_not_destroy_referenced_shipping_methods
         order = Order.where(:shipping_method_id => @object).first
         if order
-          flash[:error] = "That shipping method cannot be deleted as it is referenced by an order: #{order.number}."
+          flash[:error] = I18n.t(:shipping_method_destroy_error, number: order.number)
           redirect_to collection_url and return
         end
       end

app/controllers/spree/checkout_controller_decorator.rb

@@ -4,6 +4,8 @@ Spree::CheckoutController.class_eval do
 
   include CheckoutHelper
 
+  before_filter :enable_embedded_shopfront
+
   def edit
     flash.keep
     redirect_to main_app.checkout_path

app/controllers/spree/orders_controller_decorator.rb

@@ -4,6 +4,7 @@ Spree::OrdersController.class_eval do
   after_filter  :populate_variant_attributes, only: :populate
   before_filter :update_distribution, only: :update
   before_filter :filter_order_params, only: :update
+  before_filter :enable_embedded_shopfront
 
   prepend_before_filter :require_order_cycle, only: :edit
   prepend_before_filter :require_distributor_chosen, only: :edit
@@ -31,7 +32,6 @@ Spree::OrdersController.class_eval do
     end
   end
 
-
   def update
     @insufficient_stock_lines = []
     @order = order_to_update
@@ -71,7 +71,6 @@ Spree::OrdersController.class_eval do
     end
   end
 
-
   def populate
     # Without intervention, the Spree::Adjustment#update_adjustable callback is called many times
     # during cart population, for both taxation and enterprise fees. This operation triggers a
@@ -99,7 +98,6 @@ Spree::OrdersController.class_eval do
     end
   end
 
-
   # Report the stock levels in the order for all variant ids requested
   def stock_levels(order, variant_ids)
     stock_levels = li_stock_levels(order)
@@ -135,7 +133,7 @@ Spree::OrdersController.class_eval do
       distributor = Enterprise.is_distributor.find params[:order][:distributor_id]
       @order.set_distributor! distributor
 
-      flash[:notice] = 'Your hub has been selected.'
+      flash[:notice] = I18n.t(:order_choosing_hub_notice)
       redirect_to request.referer
 
     elsif params[:commit] == 'Choose Order Cycle'
@@ -143,7 +141,7 @@ Spree::OrdersController.class_eval do
       order_cycle = OrderCycle.active.find params[:order][:order_cycle_id]
       @order.set_order_cycle! order_cycle
 
-      flash[:notice] = 'Your order cycle has been selected.'
+      flash[:notice] = I18n.t(:order_choosing_hub_notice)
       redirect_to request.referer
     end
   end
@@ -242,7 +240,7 @@ Spree::OrdersController.class_eval do
     return unless order_to_update.andand.complete?
 
     items = params[:order][:line_items_attributes]
-    .andand.select{ |k,attrs| attrs["quantity"].to_i > 0 }
+      .andand.select{ |k,attrs| attrs["quantity"].to_i > 0 }
 
     if items.empty?
       flash[:error] = I18n.t(:orders_cannot_remove_the_final_item)

app/controllers/spree/paypal_controller_decorator.rb

@@ -2,6 +2,7 @@ Spree::PaypalController.class_eval do
   include CheckoutHelper
 
   after_filter :reset_order_when_complete, only: :confirm
+  before_filter :enable_embedded_shopfront
 
   def cancel
     flash[:notice] = t('flash.cancel', :scope => 'paypal')

app/controllers/spree/users_controller_decorator.rb

@@ -1,3 +1,5 @@
 Spree::UsersController.class_eval do
   layout 'darkswarm'
+
+  before_filter :enable_embedded_shopfront
 end

app/helpers/admin/image_settings_helper.rb

@@ -5,12 +5,12 @@ module Admin
     end
 
     def admin_image_settings_geometry_from_style(style)
-      geometry, format = admin_image_settings_split_style style
+      geometry, _format = admin_image_settings_split_style style
       geometry
     end
 
     def admin_image_settings_format_from_style(style)
-      geometry, format = admin_image_settings_split_style style
+      _geometry, format = admin_image_settings_split_style style
       format
     end
 

app/helpers/application_helper.rb

@@ -11,7 +11,6 @@ module ApplicationHelper
     form_for(name, *(args << options.merge(:builder => AngularFormBuilder)), &block)
   end
 
-
   # Pass URL helper calls on to spree where applicable so that we don't need to use
   # spree.foo_path in any view rendered from non-spree-namespaced controllers.
   def method_missing(method, *args, &block)

app/helpers/checkout_helper.rb

@@ -80,7 +80,6 @@ module CheckoutHelper
     available_countries.map { |c| [c.name, c.id] }
   end
 
-
   def validated_input(name, path, args = {})
     attributes = {
       required: true,

app/helpers/enterprises_helper.rb

@@ -48,7 +48,7 @@ module EnterprisesHelper
 
   def enterprise_type_name(enterprise)
     if enterprise.sells == 'none'
-      enterprise.producer_profile_only ? 'Profile' : 'Supplier Only'
+      enterprise.producer_profile_only ? I18n.t(:profile) : I18n.t(:supplier_only)
     else
       "Has Shopfront"
     end
@@ -56,7 +56,7 @@ module EnterprisesHelper
 
   def enterprise_confirm_delete_message(enterprise)
     if enterprise.supplied_products.present?
-      "This will also delete the #{pluralize enterprise.supplied_products.count, 'product'} that this enterprise supplies. Are you sure you want to continue?"
+      I18n.t(:enterprise_confirm_delete_message, product: pluralize(enterprise.supplied_products.count, 'product'))
     else
       t(:are_you_sure)
     end

app/helpers/i18n_helper.rb

@@ -0,0 +1,7 @@
+module I18nHelper
+  private
+
+  def set_locale
+    I18n.locale = params[:locale] || I18n.default_locale
+  end
+end

app/helpers/order_cycles_helper.rb

@@ -43,7 +43,6 @@ module OrderCyclesHelper
     end
   end
 
-
   def order_cycle_options
     @order_cycles.
       with_distributor(current_distributor).
@@ -86,14 +85,14 @@ module OrderCyclesHelper
       disabled_message = nil
       if options[:shipping_and_payment_methods] && (e.shipping_methods.empty? || e.payment_methods.available.empty?)
         if e.shipping_methods.empty? && e.payment_methods.available.empty?
-          disabled_message = 'no shipping or payment methods'
+          disabled_message = I18n.t(:no_shipping_or_payment)
         elsif e.shipping_methods.empty?
-          disabled_message = 'no shipping methods'
+          disabled_message = I18n.t(:no_shipping)
         elsif e.payment_methods.available.empty?
-          disabled_message = 'no payment methods'
+          disabled_message = I18n.t(:no_payment)
         end
       elsif options[:confirmed] && !e.confirmed?
-        disabled_message = 'unconfirmed'
+        disabled_message = I18n.t(:unconfirmed)
       end
 
       if disabled_message

app/helpers/spree/products_helper_decorator.rb

@@ -6,21 +6,18 @@ module Spree
       "(#{Spree::Money.new(variant.price).to_s})"
     end
 
-
     def product_has_variant_unit_option_type?(product)
       product.option_types.any? { |option_type| variant_unit_option_type? option_type }
     end
 
-
     def variant_unit_option_type?(option_type)
       Spree::Product.all_variant_unit_option_types.include? option_type
     end
 
-
     def product_variant_unit_options
-      [['Weight', 'weight'],
-       ['Volume', 'volume'],
-       ['Items', 'items']]
+      [[I18n.t(:weight), 'weight'],
+       [I18n.t(:volume), 'volume'],
+       [I18n.t(:items), 'items']]
     end
   end
 end

app/helpers/spree/reports_helper.rb

@@ -25,8 +25,8 @@ module Spree
     end
 
     def xero_report_types
-      [['Summary', 'summary'],
-       ['Detailed', 'detailed']]
+      [[I18n.t(:summary), 'summary'],
+       [I18n.t(:detailed), 'detailed']]
     end
 
     def currency_symbol

app/jobs/finalize_account_invoices.rb

@@ -1,3 +1,17 @@
+# This class is part of the system that charges hubs for using OFN. It does so
+# by creating orders. These are not orders for food that customers place, but
+# instead are orders for OFN usage, so to speak. Thus, they're technically not
+# "shipped" anywhere, so they're just given a default shipping method.
+#
+# The "orders" used by this class are not real orders, they are basically
+# "invoices" that enterprise owners need to pay for use of an open food network
+# instance. The amount that the enterprise owner is charged is configurable by
+# the instance, and can be based on a combination of a percentage of their
+# turnover, fixed fees, caps and floors and trial periods. This "orders" hold
+# the billing information for a particular enterprise owner for a given month.
+#
+# We assign them also a default shipping method because there is a validation
+# on Spree::Shipment that requires it.
 class FinalizeAccountInvoices
   attr_reader :year, :month, :start_date, :end_date
 

app/jobs/update_account_invoices.rb

@@ -37,7 +37,7 @@ class UpdateAccountInvoices
       if billable_periods.any?
         oldest_enterprise = billable_periods.first.enterprise
         address = oldest_enterprise.address.dup
-        first, space, last = (oldest_enterprise.contact || "").partition(' ')
+        first, _space, last = (oldest_enterprise.contact || "").partition(' ')
         address.update_attributes(phone: oldest_enterprise.phone) if oldest_enterprise.phone.present?
         address.update_attributes(firstname: first, lastname: last) if first.present? && last.present?
         account_invoice.order.update_attributes(bill_address: address, ship_address: address)

app/jobs/update_billable_periods.rb

@@ -106,8 +106,8 @@ class UpdateBillablePeriods
     end
 
     obsolete_billable_periods.includes({ account_invoice: :order}).
-    where('spree_orders.state <> \'complete\' OR account_invoices.order_id IS NULL').
-    each(&:delete)
+      where('spree_orders.state <> \'complete\' OR account_invoices.order_id IS NULL').
+      each(&:delete)
   end
 
   private

app/mailers/producer_mailer.rb

@@ -10,7 +10,7 @@ class ProducerMailer < Spree::BaseMailer
     @total = total_from_line_items(line_items)
     @tax_total = tax_total_from_line_items(line_items)
 
-    subject = "[#{Spree::Config.site_name}] Order cycle report for #{producer.name}"
+    subject = "[#{Spree::Config.site_name}] #{I18n.t('producer_mailer.order_cycle.subject', producer: producer.name)}"
 
     if has_orders? order_cycle, producer
       mail(to: @producer.email,

app/mailers/spree/base_mailer_decorator.rb

@@ -12,7 +12,6 @@ Spree::BaseMailer.class_eval do
       'test@example.com'
   end
 
-
   def roadie_options
     # This lets us specify assets using relative paths in email templates
     super.merge(url_options: {host: URI(spree.root_url).host })

app/models/billable_period.rb

@@ -25,7 +25,7 @@ class BillablePeriod < ActiveRecord::Base
   def label
     enterprise_version = enterprise.version_at(begins_at)
     category = enterprise_version.category.to_s.titleize
-    category += (trial ? " Trial" : "")
+    category += (trial ? " #{I18n.t(:trial)}" : "")
 
     "#{enterprise_version.name} (#{category})"
   end

app/models/cart.rb

@@ -3,8 +3,6 @@ class Cart < ActiveRecord::Base
   belongs_to :user,   :class_name => Spree.user_class
 
   def add_variant variant_id, quantity, distributor, order_cycle, currency
-    variant = Spree::Variant.find(variant_id)
-
     order = create_or_find_order_for_distributor distributor, order_cycle, currency
 
     @populator = Spree::OrderPopulator.new(order, currency)

app/models/content_configuration.rb

@@ -17,19 +17,19 @@ class ContentConfiguration < Spree::Preferences::FileConfiguration
   has_attached_file :home_hero, default_url: "/assets/home/home.jpg"
 
   # Producer sign-up page
-  preference :producer_signup_pricing_table_html, :text, default: "(TODO: Pricing table)"
-  preference :producer_signup_case_studies_html, :text, default: "(TODO: Case studies)"
-  preference :producer_signup_detail_html, :text, default: "(TODO: Detail)"
+  preference :producer_signup_pricing_table_html, :text, default: I18n.t(:content_configuration_pricing_table)
+  preference :producer_signup_case_studies_html, :text, default: I18n.t(:content_configuration_case_studies)
+  preference :producer_signup_detail_html, :text, default: I18n.t(:content_configuration_detail)
 
   # Hubs sign-up page
-  preference :hub_signup_pricing_table_html, :text, default: "(TODO: Pricing table)"
-  preference :hub_signup_case_studies_html, :text, default: "(TODO: Case studies)"
-  preference :hub_signup_detail_html, :text, default: "(TODO: Detail)"
+  preference :hub_signup_pricing_table_html, :text, default: I18n.t(:content_configuration_pricing_table)
+  preference :hub_signup_case_studies_html, :text, default: I18n.t(:content_configuration_case_studies)
+  preference :hub_signup_detail_html, :text, default: I18n.t(:content_configuration_detail)
 
   # Groups sign-up page
-  preference :group_signup_pricing_table_html, :text, default: "(TODO: Pricing table)"
-  preference :group_signup_case_studies_html, :text, default: "(TODO: Case studies)"
-  preference :group_signup_detail_html, :text, default: "(TODO: Detail)"
+  preference :group_signup_pricing_table_html, :text, default: I18n.t(:content_configuration_pricing_table)
+  preference :group_signup_case_studies_html, :text, default: I18n.t(:content_configuration_case_studies)
+  preference :group_signup_detail_html, :text, default: I18n.t(:content_configuration_detail)
 
   # Footer
   preference :footer_logo, :file

app/models/customer.rb

@@ -41,7 +41,7 @@ class Customer < ActiveRecord::Base
 
   def check_for_orders
     return true unless orders.any?
-    errors[:base] << "Delete failed: customer has associated orders"
+    errors[:base] << I18n.t('admin.customers.destroy.has_associated_orders')
     false
   end
 end