grosser-fast_gettext 0.3.0 → 0.3.1

data/README.markdown

@@ -34,8 +34,8 @@ Start translating
 Disable translation errors(like no text domain setup) while doing e.g. console session / testing
     FastGettext.silence_errors
 
-Speed
-=====
+Performance
+===========
 50_000 translations speed / memory
 small translation file <-> large translation file
     Baseline: (doing nothing in a loop)
@@ -93,7 +93,7 @@ Advanced features
 =================
 ###Abnormal pluralisation
 Pluralisation rules can be set directly via a lambda (see code/specs), or by using the Gettext
-plural definition (see spec/locale/en/test_plural.po or [GNU Gettext documentation](http://www.gnu.org/software/libtool/manual/libc/Advanced-gettext-functions.html).
+plural definition (see spec/locale/en/test_plural.po or [Plural expressions for all languages](http://translate.sourceforge.net/wiki/l10n/pluralforms).
 
 ###Plugins
 Want a yml, xml, database version ?
@@ -102,7 +102,7 @@ Write your own TranslationRepository!
     module FastGettext
       module TranslationRepository
         class Wtf
-          define initialize(name,options), available_locales, [key], plural(singular,plural,count)
+          define initialize(name,options), available_locales, [key], plural(*msgids)
         end
       end
     end

data/VERSION.yml

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

data/lib/fast_gettext/po_file.rb

@@ -0,0 +1,14 @@
+require 'fast_gettext/mo_file'
+module FastGettext
+  # Responsibility:
+  #  - abstract po files for Po Repository
+  # TODO refactor...
+  class PoFile
+    def self.to_mo_file(file)
+      require File.join(File.dirname(__FILE__),'..','..','vendor','poparser')
+      mo_file = FastGettext::GetText::MOFile.new
+      FastGettext::GetText::PoParser.new.parse(File.read(file),mo_file)
+      MoFile.new(mo_file)
+    end
+  end
+end

data/lib/fast_gettext/translation.rb

@@ -31,6 +31,7 @@ module FastGettext
       
       translations = FastGettext.current_repository.plural(*msgids)
       selected = FastGettext.current_repository.pluralisation_rule.call(count)
+      selected = selected ? 1 : 0 unless selected.is_a? Numeric #convert booleans to numbers
       translations[selected] || msgids[selected] || msgids.last
     end
 

data/lib/fast_gettext/translation_repository/po.rb

@@ -8,12 +8,9 @@ module FastGettext
     class Po < Mo
       protected
       def find_and_store_files(name,options)
-        require File.join(File.dirname(__FILE__),'..','..','..','vendor','poparser')
-        require 'fast_gettext/mo_file'
+        require 'fast_gettext/po_file'
         find_files_in_locale_folders("#{name}.po",options[:path]) do |locale,file|
-          mo_file = FastGettext::GetText::MOFile.new
-          FastGettext::GetText::PoParser.new.parse(File.read(file),mo_file)
-          @files[locale] = MoFile.new(mo_file)
+          @files[locale] = PoFile.to_mo_file(file)
         end
       end
     end

data/spec/fast_gettext/translation_spec.rb

@@ -33,22 +33,33 @@ describe FastGettext::Translation do
   end
 
   describe :n_ do
+    before do
+      FastGettext.current_repository.pluralisation_rule = lambda{|n|n==1?0:1}
+    end
+
     it "translates pluralized" do
       n_('Axis','Axis',1).should == 'Achse'
       n_('Axis','Axis',2).should == 'Achsen'
       n_('Axis','Axis',0).should == 'Achsen'
     end
 
-    it "supports abstract pluralisation rules" do
-      begin
+    describe "pluralisations rules" do
+      it "supports abstract pluralisation rules" do
         FastGettext.current_repository.pluralisation_rule = lambda{|n|2}
         n_('a','b','c','d',4).should == 'c'
-      ensure
-        #restore default
-        FastGettext.current_repository.pluralisation_rule = lambda{|n|n==1?0:1}
       end
-    end
 
+      it "supports false as singular" do
+        FastGettext.current_repository.pluralisation_rule = lambda{|n|n!=2}
+        n_('singular','plural','c','d',2).should == 'singular'
+      end
+
+      it "supports true as plural" do
+        FastGettext.current_repository.pluralisation_rule = lambda{|n|n==2}
+        n_('singular','plural','c','d',2).should == 'plural'
+      end
+    end
+    
     it "returns the appropriate msgid if no translation was found" do
       n_('NOTFOUND','NOTFOUNDs',1).should == 'NOTFOUND'
       n_('NOTFOUND','NOTFOUNDs',2).should == 'NOTFOUNDs'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-09 00:00:00 -07:00
+date: 2009-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ files:
 - lib/fast_gettext
 - lib/fast_gettext.rb
 - lib/fast_gettext/mo_file.rb
+- lib/fast_gettext/po_file.rb
 - lib/fast_gettext/storage.rb
 - lib/fast_gettext/translation.rb
 - lib/fast_gettext/translation_repository