grosser-fast_gettext 0.4.10 → 0.4.11

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 4
-:patch: 10
+:patch: 11

data/lib/fast_gettext/storage.rb

@@ -103,8 +103,7 @@ module FastGettext
     
     @@default_locale = nil
     def default_locale=(new_locale)
-      new_locale = best_locale_in(new_locale)
-      @@default_locale = new_locale
+      @@default_locale = best_locale_in(new_locale)
       update_current_cache
     end
 
@@ -117,21 +116,10 @@ module FastGettext
     #IE6/7 de
     #nil if nothing matches
     def best_locale_in(locales)
-      locales = locales.to_s.gsub(/\s/,'')
-
-      #split the locale and seperate it into different languages
-      #[['de-de','de','0.5'], ['en','0.8'], ...]
-      parts = locales.split(',')
-      locales = [[]]
-      parts.each do |part|
-        locales.last << part.split(/;q=/)#add another language or language and weight
-        locales += [] if part.length == 2 #if it could be split we are now in a new locale
-      end
-
-      locales = locales.sort_by{|l|l.last} #sort them by weight which is the last entry
-      locales.flatten.each do |candidate|
-        candidate = candidate.sub(/^([a-zA-Z]{2})[-_]([a-zA-Z]{2})$/){$1.downcase+'_'+$2.upcase}#de-de -> de_DE
-        return candidate if not available_locales or available_locales.include?(candidate)
+      formatted_sorted_locales(locales).each do |candidate|
+        return candidate if not available_locales
+        return candidate if available_locales.include?(candidate)
+        return candidate[0..1] if available_locales.include?(candidate[0..1])#available locales include a langauge
       end
       return nil#nothing found im sorry :P
     end
@@ -144,6 +132,34 @@ module FastGettext
 
     private
 
+    # de-de,DE-CH;q=0.9 -> ['de_DE','de_CH']
+    def formatted_sorted_locales(locales)
+      found = weighted_locales(locales).reject{|x|x.empty?}.sort_by{|l|l.last}.reverse #sort them by weight which is the last entry
+      found.flatten.map{|l| format_locale(l)}
+    end
+
+    #split the locale and seperate it into different languages
+    #de-de,de;q=0.9,en;q=0.8 => [['de-de','de','0.5'], ['en','0.8']]
+    def weighted_locales(locales)
+      locales = locales.to_s.gsub(/\s/,'')
+      found = [[]]
+      locales.split(',').each do |part|
+        if part =~ /;q=/ #contains language and weight ?
+          found.last << part.split(/;q=/)
+          found.last.flatten!
+          found << []
+        else
+          found.last << part
+        end
+      end
+      found
+    end
+
+    #de-de -> de_DE
+    def format_locale(locale)
+      locale.sub(/^([a-zA-Z]{2})[-_]([a-zA-Z]{2})$/){$1.downcase+'_'+$2.upcase}
+    end
+
     def update_current_cache
       caches[text_domain] ||= {}
       caches[text_domain][locale] ||= {}

data/spec/fast_gettext/storage_spec.rb

@@ -149,6 +149,18 @@ describe 'Storage' do
       FastGettext.locale.should == 'en'
     end
 
+    it "sets the locale with the highest wheight" do
+      FastGettext.available_locales = ['en','de']
+      FastGettext.locale = "xx-us;q=0.5,de-de,de;q=0.8,en;q=0.9"
+      FastGettext.locale.should == 'en'
+    end
+
+    it "sets the locale from languages" do
+      FastGettext.available_locales = ['de']
+      FastGettext.locale = "xx-us;q=0.5,de-de;q=0.8,en-uk;q=0.9"
+      FastGettext.locale.should == 'de'
+    end
+
     it "sets locale from comma seperated" do
       FastGettext.available_locales = ['de_DE','en','xx']
       FastGettext.locale = "de,de-de,en"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-30 00:00:00 -07:00
+date: 2009-06-27 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -68,7 +68,7 @@ files:
 - vendor/mofile.rb
 - vendor/poparser.rb
 - vendor/string.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/grosser/fast_gettext
 post_install_message: 
 rdoc_options: 
@@ -92,7 +92,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A simple, fast and threadsafe implementation of GetText
 test_files: 
 - spec/fast_gettext_spec.rb