Use Spree i18n namespace.

futhr · Apr 5, 2014 · fa82bcc · fa82bcc
1 parent 3bbfec3
commit fa82bcc
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 32 deletions.
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -1,12 +1,13 @@
 ---
 en:
-  price_table: Prices (space seperated)
-  weight_table: Weights (space seperated)
-  postal_service: Postal Service
-  max_item_weight: Max weight of one item
-  max_item_width: Max width of one item
-  max_item_length: Max length of one item
-  handling_fee: Handling fee
-  handling_max: "Amount, over which handling fee won't be applied"
-  min_price: Minimum total of the order
-  default_weight: Default weight
+  spree:
+    price_table: Prices (space seperated)
+    weight_table: Weights (space seperated)
+    postal_service: Postal Service
+    max_item_weight: Max weight of one item
+    max_item_width: Max width of one item
+    max_item_length: Max length of one item
+    handling_fee: Handling fee
+    handling_max: "Amount, over which handling fee won't be applied"
+    min_price: Minimum total of the order
+    default_weight: Default weight
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
@@ -1,12 +1,13 @@
 ---
 pt:
-  price_table: Preços (separados por espaços)
-  weight_table: Pesos (separados por espaços)
-  postal_service: Serviço Postal
-  max_item_weight: Peso máximo por item
-  max_item_width: Peso máxima por item
-  max_item_length: Comprimento máximo por item
-  handling_fee: Taxa de tratamento
-  handling_max: Valor a partir do qual a taxa de tratamento não é aplicada
-  min_price: Preço mínimo
-  default_weight: Peso por omissão
+  spree:
+    price_table: Preços (separados por espaços)
+    weight_table: Pesos (separados por espaços)
+    postal_service: Serviço Postal
+    max_item_weight: Peso máximo por item
+    max_item_width: Peso máxima por item
+    max_item_length: Comprimento máximo por item
+    handling_fee: Taxa de tratamento
+    handling_max: Valor a partir do qual a taxa de tratamento não é aplicada
+    min_price: Preço mínimo
+    default_weight: Peso por omissão
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
@@ -1,12 +1,13 @@
 ---
 sv:
-  price_table: Priser (mellanrums separerade)
-  weight_table: Vikter (mellanrums separerade)
-  postal_service: Post Service
-  max_item_weight: Max vikt på ett objekt
-  max_item_width: Max bredd på ett objekt
-  max_item_length: Max längd på ett objekt
-  handling_fee: Hantering avgift
-  handling_max: "Belopp, över vilken expeditionsavgift inte skall tillämpas"
-  min_price: Minsta belopp
-  default_weight: Förvald vikt
+  spree:
+    price_table: Priser (mellanrums separerade)
+    weight_table: Vikter (mellanrums separerade)
+    postal_service: Post Service
+    max_item_weight: Max vikt på ett objekt
+    max_item_width: Max bredd på ett objekt
+    max_item_length: Max längd på ett objekt
+    handling_fee: Hantering avgift
+    handling_max: "Belopp, över vilken expeditionsavgift inte skall tillämpas"
+    min_price: Minsta belopp
+    default_weight: Förvald vikt
diff --git a/lib/spree/calculator/postal_service.rb b/lib/spree/calculator/postal_service.rb
@@ -20,7 +20,7 @@ class Spree::Calculator::PostalService < Spree::Calculator
                   :preferred_default_weight
 
   def self.description
-    I18n.t(:postal_service)
+    Spree.t(:postal_service)
   end
 
   def self.register

diff --git a/spec/lib/postal_service_spec.rb b/spec/lib/postal_service_spec.rb
@@ -15,7 +15,7 @@
     context 'in any language' do
       before { I18n.locale = :pt }
       specify do
-        postal_service_calculator.description.should == I18n.t(:postal_service)
+        postal_service_calculator.description.should == Spree.t(:postal_service)
       end
     end
   end