Merge branch 'i18n' of https://github.com/folklabs/openfoodnetwork into folklabs-i18n

app/views/home/_beta.en-GB.html.haml

@@ -0,0 +1,13 @@
+#beta.pane
+
+  .row
+    .small-12.columns.text-center
+      %h2 S'cuse us
+      %h5 while we get (more) awesome
+      %p Open Food Network UK is a new service that’s being piloted right now!
+      %p Want to help? Or find out when OFN is coming to you?
+      %strong We’d love to hear from you:
+      %p
+        %a{href: "hello@openfoodnetwork.org".reverse, target: '_blank', mailto: true}  Food buyers
+        |
+        %a{href: "hello@openfoodnetwork.org".reverse, target: '_blank', mailto: true}  Food producers & farmers

app/views/shared/_footer.html.haml

@@ -44,9 +44,9 @@
       %p
         %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
-        
+          |
+          %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

app/views/shared/components/_enterprise_search.html.haml

@@ -2,6 +2,6 @@
   .small-12.columns
     %input{type: :text,
     "ng-model" => "query",
-    placeholder: "Search by name or suburb...",
+    placeholder: t('search_by_name'),
     "ng-debounce" => "150",
     "ofn-disable-enter" => true}

app/views/spree/user_mailer/signup_confirmation.en-GB.text.erb

@@ -0,0 +1,14 @@
+Hello,
+
+Welcome to Open Food Network UK! Your login email is <%= @user.email %>
+
+You can go online and start shopping through food hubs and local producers you like at http://openfoodnetwork.org.uk
+
+We welcome all your questions and feedback; you can use the Send Feedback button on the site or email us at hello@openfoodnetwork.org.
+
+Thanks for getting on board and we look forward to introducing you to many more great farmers, food hubs and food!
+
+Cheers,
+
+The Open Food Network UK team
+

config/locales/en-GB.yml

@@ -0,0 +1,21 @@
+# Localization file for British English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en-GB:
+  activerecord:
+    errors:
+      models:
+        spree/user:
+          attributes:
+            password:
+              confirmation: you have successfully registered
+              too_short: pick a longer name
+  devise:
+    failure:
+      invalid: |
+        Invalid email or password.
+        Were you a guest last time?  Perhaps you need to create an account or reset your password.
+  home: "OFN"
+
+  welcome_to: 'Welcome to '
+  search_by_name: Search by name...

config/locales/en.yml

@@ -8,3 +8,4 @@ en:
         Invalid email or password.
         Were you a guest last time?  Perhaps you need to create an account or reset your password.
   home: "OFN"
+  search_by_name: Search by name or suburb...