From 5e8664fa56e005855fe8b65826a654a3361f6b77 Mon Sep 17 00:00:00 2001 From: Ruben Gonzalez Date: Fri, 13 Oct 2017 07:43:41 +0200 Subject: [PATCH] Translate reception states and fix translation key --- core/app/models/spree/return_item.rb | 2 +- core/config/locales/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/app/models/spree/return_item.rb b/core/app/models/spree/return_item.rb index a617d928fda..dc5bf459703 100644 --- a/core/app/models/spree/return_item.rb +++ b/core/app/models/spree/return_item.rb @@ -212,7 +212,7 @@ def potential_reception_transitions event_paths.delete(:expired) event_paths.delete(:unexchange) - status_paths.map{ |s| s.to_s.humanize }.zip(event_paths) + status_paths.map{ |s| I18n.t("spree.reception_states.#{s}", default: s.to_s.humanize) }.zip(event_paths) end def part_of_exchange? diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml index 400c13d10ec..a424ef2ca7e 100644 --- a/core/config/locales/en.yml +++ b/core/config/locales/en.yml @@ -1735,7 +1735,7 @@ en: receiving_match: Receiving match reception_states: awaiting: Awaiting - canceled: Canceled + cancelled: Canceled expired: Expired given_to_customer: Given to customer in_transit: In transit