grosser-fast_gettext 0.2.8 → 0.2.10

data/README.markdown

@@ -8,6 +8,10 @@ Setup
 =====
     sudo gem install grosser-fast_gettext -s http://gems.github.com/
 
+Or from source:
+    git clone git://github.com/grosser/fast_gettext.git
+    cd fast_gettext && rake install
+
 Tell Gettext where your mo-files lie:
     #e.g. for locale/de/LC_MESSAGES/my_app.mo
     FastGettext.add_text_domain('my_app',:path=>'locale')
@@ -70,7 +74,7 @@ then e.g. controllers, so set them inside your application_controller.
       def set_locale
         FastGettext.available_locales = ['de','en',...]
         FastGettext.text_domain = 'frontend'
-        sessions[:locale] = I18n.locale = FastGettext.set_locale(params[:locale] || sessions[:locale] || 'en')
+        sessions[:locale] = I18n.locale = FastGettext.set_locale(params[:locale] || sessions[:locale] || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
       end
 
     #application_helper.rb

data/VERSION.yml

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

data/lib/fast_gettext/storage.rb

@@ -37,8 +37,8 @@ module FastGettext
     end
 
     def locale=(new_locale)
-      new_locale = new_locale.to_s
-      if not available_locales or available_locales.include?(new_locale)
+      new_locale = best_locale_in(new_locale)
+      if new_locale
         write_thread_store(:locale,new_locale)
         update_current_translations
       end
@@ -52,6 +52,30 @@ module FastGettext
       locale
     end
 
+    #Opera: de-DE,de;q=0.9,en;q=0.8
+    #Firefox de-de,de;q=0.8,en-us;q=0.5,en;q=0.3
+    #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.sort!(&: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)
+      end
+      return nil#nothing found im sorry :P
+    end
+
     #turn off translation if none was defined to disable all resulting errors
     def silence_errors
       if not self.current_translations or self.current_translations == NoTextDomainConfigured

data/spec/fast_gettext/storage_spec.rb

@@ -39,6 +39,10 @@ describe Storage do
       self.available_locales = nil
       locale.should == 'en'
     end
+    it "does not change the locale if locales was called with nil" do
+      self.locale = nil
+      locale.should == 'en'
+    end
     it "is the first available_locale if one was set" do
       self.available_locales = ['de']
       locale.should == 'de'
@@ -53,6 +57,27 @@ describe Storage do
       self.available_locales = ['de']
       self.set_locale('en').should == 'de'
     end
+    {
+      'Opera' => "de-DE,de;q=0.9,en;q=0.8",
+      'Firefox' => "de-de,de;q=0.8,en-us;q=0.5,en;q=0.3",
+    }.each do |browser,accept_language|
+      it "sets the locale from #{browser} headers" do
+        FastGettext.available_locales = ['de_DE','de','xx']
+        FastGettext.locale = 'xx'
+        FastGettext.locale = accept_language
+        FastGettext.locale.should == 'de_DE'
+      end
+    end
+    it "sets a unimportant locale if it is the only available" do
+      FastGettext.available_locales = ['en','xx']
+      FastGettext.locale = "de-de,de;q=0.8,en-us;q=0.5,en;q=0.3"
+      FastGettext.locale.should == 'en'
+    end
+    it "sets locale from comma seperated" do
+      FastGettext.available_locales = ['de_DE','en','xx']
+      FastGettext.locale = "de,de-de,en"
+      FastGettext.locale.should == 'de_DE'
+    end
   end
 
   describe :silence_errors do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.10
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-24 00:00:00 -08:00
+date: 2009-02-26 00:00:00 -08:00
 default_executable: 
 dependencies: []