air18n 0.1.55 → 0.1.56

data/lib/air18n.rb

@@ -16,10 +16,6 @@ module Air18n
 
   def self.included(base)
     base.class_eval do
-      # Currencies that correspond to users who want distance unit to be
-      # miles.
-      self.const_set(:MILES_CURRENCIES, ['USD', 'GBP'])
-
       class << self
         extend ActiveSupport::Memoizable
 
@@ -50,10 +46,6 @@ module Air18n
         @currency = 'USD'
         attr_reader :currency
 
-        # Distance unit, 'MI' or 'KM'.
-        @distance_unit = 'KM'
-        attr_reader :distance_unit
-
         # Cache used to store translation data from the database.
         attr_accessor :cache
 

data/lib/air18n/class_methods.rb

@@ -57,6 +57,20 @@ module Air18n
       ret
     end
 
+    # Returns whether or not imperial lengths are appropriate under
+    # I18n.full_locale and I18n.tld_country.
+    def uses_imperial_lengths?
+      uses_imperial_lengths_in_locale_and_country(I18n.full_locale, I18n.tld_country)
+    end
+
+    # Returns whether or not imperial lengths are appropriate for given locale
+    # and country.
+    # Logic is: true in the US and UK when language is English, and false
+    # otherwise.
+    def uses_imperial_lengths_in_locale_and_country?(locale, country)
+      language_from_locale(locale) == :en && [:US, :GB].include?(country)
+    end
+
     # Like ActionView::Helpers::TextHelper#pluralize, except requires that
     # 'count' be a real number, not a string.
     #
@@ -278,7 +292,6 @@ module Air18n
 
     def currency=(c)
       @currency = c
-      @distance_unit = self::MILES_CURRENCIES.include?(c) ? "MI" : "KM"
     end
 
     # Parses a date using the current locale setting.

data/lib/air18n/version.rb

@@ -1,3 +1,3 @@
 module Air18n
-  VERSION = "0.1.55"
+  VERSION = "0.1.56"
 end

data/spec/lib/air18n/air18n_spec.rb

@@ -44,6 +44,13 @@ describe Air18n do
     end
   end
 
+  context 'uses_imperial_lengths?' do
+    I18n.uses_imperial_lengths_in_locale_and_country?(:en, :US).should == true
+    I18n.uses_imperial_lengths_in_locale_and_country?(:en, :GB).should == true
+    I18n.uses_imperial_lengths_in_locale_and_country?(:en, :AU).should == false
+    I18n.uses_imperial_lengths_in_locale_and_country?(:fr, :US).should == false
+  end
+
   context 'Keeping track of default routes context' do
     it 'should start with blank routes context' do
       I18n.translate('default route, key 1', :default => 'value 1', :locale => :en)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: air18n
 version: !ruby/object:Gem::Version
-  version: 0.1.55
+  version: 0.1.56
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n