grosser-fast_gettext 0.3.5 → 0.3.6

data/README.markdown

@@ -100,6 +100,9 @@ plural definition (see spec/locale/en/test_plural.po or [Plural expressions for
 If you only use one text domain, setting `FastGettext.default_text_domain = 'app'`
 is sufficient and no more `text_domain=` is needed
 
+###default_locale
+If the simple rule of "first `availble_locale` or 'en'" is not suficcient for you, simply set `FastGettext.default_locale = 'de'`.
+
 ###Plugins
 Want a yml, xml, database version ?
 Write your own TranslationRepository!

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 3
-:patch: 5
+:patch: 6

data/lib/fast_gettext/storage.rb

@@ -61,7 +61,7 @@ module FastGettext
     end
 
     def locale
-      _locale || (available_locales||[]).first || 'en'
+      _locale || ( default_locale || (available_locales||[]).first || 'en' )
     end
 
     def locale=(new_locale)
@@ -79,6 +79,17 @@ module FastGettext
       self.locale = new_locale
       locale
     end
+    
+    @@default_locale = nil
+    def default_locale=(new_locale)
+      new_locale = best_locale_in(new_locale)
+      @@default_locale = new_locale
+      update_current_cache
+    end
+
+    def default_locale
+      @@default_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

data/spec/fast_gettext/storage_spec.rb

@@ -5,7 +5,14 @@ include FastGettext::Storage
 
 describe 'Storage' do
   before do
+    #reset everything to nil
     self.default_text_domain = nil
+    self.default_locale = nil
+    self.available_locales = nil
+    send(:_locale=,nil)#nil is not allowed to be set...
+    default_locale.should be_nil
+    available_locales.should be_nil
+    locale.should == 'en'
   end
 
   def thread_save(method)
@@ -32,12 +39,38 @@ describe 'Storage' do
     self.translation_repositories[:x].should == 2
   end
 
+  describe :default_locale do
+    it "stores default_locale non-thread-safe" do
+      thread_save(:default_locale).should == false
+    end
+
+    it "does not overwrite locale" do
+      self.locale = 'de'
+      self.default_locale = 'yy'
+      self.locale.should == 'de'
+    end
+
+    it "falls back to default if locale is missing" do
+      self.default_locale = 'yy'
+      self.locale.should == 'yy'
+    end
+
+    it "does not set non-available-locales as default" do
+      self.available_locales = ['xx']
+      self.default_locale = 'yy'
+      self.default_locale.should == nil
+    end
+
+    it "can set default_locale to nil" do
+      self.default_locale = 'xx'
+      self.default_locale = nil
+      default_locale.should be_nil
+    end
+  end
+
   describe :default_text_domain do
     it "stores default_text_domain non-thread-safe" do
-      self.default_text_domain=1
-      t = Thread.new{self.default_text_domain=2}
-      t.join
-      self.default_text_domain.should == 2
+      thread_save(:default_text_domain).should == false
     end
 
     it "uses default_text_domain when text_domain is not set" do
@@ -158,6 +191,13 @@ describe 'Storage' do
       FastGettext.current_cache['abc'].should == 'abc'
     end
 
+    it "cache is restored through setting of default_locale" do
+      FastGettext.send(:_locale=,nil)#reset locale to nil
+      FastGettext.default_locale = 'de'
+      FastGettext.locale.should == 'de'
+      FastGettext.current_cache['abc'].should == 'abc'
+    end
+
     it "stores a translation permanently" do
       FastGettext.locale = 'de'
       FastGettext.current_cache['abc'].should == 'abc'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Michael Grosser