world-flags 0.4.0 → 0.4.1

data/README.md

@@ -280,15 +280,16 @@ before_filter :set_locale
 And it should set the I18n.locale appropriately, trying `params[locale], browser, ip address` in succession, defaulting to `I18n.default_locale`.
 
 
-Under the covers, the `set_locale` filter uses the following method to get the locale:
+Under the covers, the `set_locale` filter uses the `locale_sources`method to get the locale:
 
 ```ruby
-def locales
-  [params[:locale], extract_locale_from_tld, browser_locale, ip_country_code, I18n.default_locale].downcase
+def locale_sources
+  [params[:locale], extract_locale_from_tld, 
+  browser_locale, ip_country_code, I18n.default_locale]
 end
 ```
 
-Note: You can override this method to set which the priority order for getting the user locale.
+Note: You can override this method in your controller to set the priority order for getting the user locale. Each code will be mapped to a locale code using the `WorldFlags#locale` mapping helper method.
 
 For each locale it will check if it is a valid locale. By default it will call `valid_locales` in the controller, which will first try `I18n.available_locales` and then fall-back to `WorldFlags#valid_locales`.
 You can override this behavior by defining you custom `valid_locales` method in the controller.

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/world_flags/helper/locale.rb

@@ -13,8 +13,13 @@ module WorldFlags
         end
       end
 
+      # ensure all country/language/domain types are mapped to their equivalent locale code
       def locales
-        [params[:locale], extract_locale_from_tld, browser_locale, ip_country_code, I18n.default_locale].downcase
+        locale_sources.downcase.map {|loc| WorldFlags.locale(loc) }
+      end
+
+      def locale_sources
+        [params[:locale], extract_locale_from_tld, browser_locale, ip_country_code, I18n.default_locale]
       end
  
       # Get locale from top-level domain or return nil if such locale is not available
@@ -24,9 +29,16 @@ module WorldFlags
       #   127.0.0.1 application.pl
       # in your /etc/hosts file to try this out locally
       def extract_locale_from_tld
-        parsed_locale = request.host.split('.').last
         I18n.available_locales.include?(parsed_locale.to_sym) ? parsed_locale  : nil
       end      
+
+      def parsed_locale
+        WorldFlags.locale(parsed_domain)
+      end
+
+      def parsed_domain
+        request.host.split('.').last
+      end
     end
   end
 end

data/world-flags.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "world-flags"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world-flags
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -194,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1443906191312410055
+      hash: 3849876865143425182
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: