Merge pull request #2283 from rbngzlv/fix-reception-state-translations

Translate reception states and fix translation key
solidusio · Apr 10, 2018 · f3dd1a3 · f3dd1a3
2 parents 812915f + 5e8664f
commit f3dd1a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -1738,7 +1738,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