Merge branch 'master' into using-simple-order-cycle

Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 ruby "1.9.3"
 
 gem 'rails', '3.2.19'
+gem 'rails-i18n', '~> 3.0.0'
 
 gem 'pg'
 gem 'spree', :github => 'openfoodfoundation/spree', :branch => '1-3-stable'

Gemfile.lock

@@ -397,6 +397,9 @@ GEM
       activesupport (= 3.2.19)
       bundler (~> 1.0)
       railties (= 3.2.19)
+    rails-i18n (3.0.1)
+      i18n (~> 0.5)
+      rails (>= 3.0.0, < 4.0.0)
     railties (3.2.19)
       actionpack (= 3.2.19)
       activesupport (= 3.2.19)
@@ -568,6 +571,7 @@ DEPENDENCIES
   rack-livereload
   rack-ssl
   rails (= 3.2.19)
+  rails-i18n (~> 3.0.0)
   representative_view
   roadie-rails (~> 1.0.3)
   rspec-rails

app/mailers/spree/user_mailer_decorator.rb

@@ -2,6 +2,6 @@ Spree::UserMailer.class_eval do
   def signup_confirmation(user)
     @user = user
     mail(:to => user.email, :from => from_address,
-         :subject => 'Welcome to ' + Spree::Config[:site_name])
+         :subject => t(:welcome_to) + Spree::Config[:site_name])
   end
 end

app/views/home/_producer-register.html.haml

@@ -2,9 +2,10 @@
 
   .row
     .small-12.columns.text-center
-      %h2 Aussie Producers
+      %h2
+        = t :producers
       %h5 Want to join the Open Food Network?
-      %br  
+      %br
       %a.neutral-btn.turquoise{href: "/register"}
         Register now
         %i.ofn-i_007-caret-right

app/views/shared/_footer.html.haml

@@ -30,28 +30,29 @@
           %a{href: "/groups"} Groups
     .small-12.medium-2.columns.text-left
       %h4 Producers
-      %p Australian producers are now welcome to join the Open Food Network.
+      %p
+        = t :producers_join
       %p
         %a{href: "/register"} Register now
     .small-12.medium-3.columns.text-left
       %h4 About us
-      %p OFN is a network of independent online food stores that connect farmers and food hubs with individuals and local businesses.  It gives farmers and food hubs an easier and fairer way to distribute their food. 
+      %p OFN is a network of independent online food stores that connect farmers and food hubs with individuals and local businesses.  It gives farmers and food hubs an easier and fairer way to distribute their food.
   .row.landing-page-row
-    .small-12.columns.text-center.pad-top 
+    .small-12.columns.text-center.pad-top
       %hr
       %h5.pad-top
         %a{title: 'Open Food Network', href:'http://www.openfoodnetwork.org', target: '_blank' } openfoodnetwork.org
       %br
       © Copyright 2014 Open Food Foundation
       %p
-        %small 
+        %small
           %a{href:"https://creativecommons.org/licenses/by-sa/3.0/", target: "_blank" } Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
       %p
-        %small 
+        %small
           %a{href:"/Terms-of-service.pdf", target: "_blank" } Site terms & conditions
           |
           %a{href:"https://github.com/openfoodfoundation/openfoodnetwork", target: "_blank" } Open Source & developer info on GitHub
 
           // To be added when Guy's pretty landing page is up:
-          //| 
+          //|
           //%a{href:'' } Developers

config/locales/en-GB.yml

@@ -19,3 +19,5 @@ en-GB:
 
   welcome_to: 'Welcome to '
   search_by_name: Search by name...
+  producers: UK Producers
+  producers_join: UK producers are now welcome to join Open Food Network UK.

config/locales/en.yml

@@ -15,3 +15,5 @@ en:
         confirmation_not_sent: "Could not send a confirmation email."
   home: "OFN"
   search_by_name: Search by name or suburb...
+  producers: Aussie Producers
+  producers_join: Australian producers are now welcome to join the Open Food Network.