From 27fdfb60af61ca2fdd1ed7484df028502b894b69 Mon Sep 17 00:00:00 2001 From: Steve Pettitt Date: Sat, 9 Apr 2016 09:41:21 +0100 Subject: [PATCH] Override incorrect Spree GB translations for state/county --- config/locales/en-GB.yml | 5 +++++ db/schema.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 7301ef4f2c..d2fc055895 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -10,6 +10,11 @@ en-GB: password: confirmation: you have successfully registered too_short: pick a longer name + attributes: + spree/order: + payment_state: Payment State + shipment_state: Shipment State + devise: failure: invalid: | diff --git a/db/schema.rb b/db/schema.rb index c8887ad86e..dc54bd8f3d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -683,9 +683,9 @@ ActiveRecord::Schema.define(:version => 20160401043927) do t.string "email" t.text "special_instructions" t.integer "distributor_id" - t.integer "order_cycle_id" t.string "currency" t.string "last_ip_address" + t.integer "order_cycle_id" t.integer "cart_id" t.integer "customer_id" end