grosser-fast_gettext 0.2.11 → 0.3.0

data/README.markdown

@@ -56,7 +56,7 @@ small translation file <-> large translation file
 
 Thread Safety and Rails
 =======================
-`text_domains` repository are not stored thread-save, so that they can be added inside the `environment.rb`,
+Parsed `text_domains` are not stored thread-save, so that they can be added inside the `environment.rb`,
 and do not need to be readded for every thread (parsing takes time...).
 
 ###Rails
@@ -89,8 +89,13 @@ Updating translations
 =====================
 ATM you have to use the [original GetText](http://github.com/mutoh/gettext) to create and manage your po/mo-files.
 
-Plugins
-=======
+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).
+
+###Plugins
 Want a yml, xml, database version ?
 Write your own TranslationRepository!
     #fast_gettext/translation_repository/xxx.rb

data/VERSION.yml

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

data/lib/fast_gettext/mo_file.rb

@@ -19,14 +19,20 @@ module FastGettext
       @data[key]
     end
 
-    def plural(singular,plural,count)
-      translations = plural_translations(singular,plural)
+    #returns the plural forms or all singlgular translations that where found
+    def plural(*msgids)
+      translations = plural_translations(msgids)
+      return translations unless translations.empty?
+      msgids.map{|msgid| self[msgid] || msgid} #try to translate each id
+    end
 
-      if count == 1
-        translations[0] || self[singular]
-      else
-        translations[1] || self[plural]
+    def pluralisation_rule
+      #gettext uses 0 as default rule, which would turn off all pluralisation, very clever...
+      #additionally parsing fails when directly accessing po files, so this line was taken from gettext/mofile
+      (@data['']||'').split("\n").each do |line|
+        return lambda{|n|eval($2)} if /^Plural-Forms:\s*nplurals\s*\=\s*(\d*);\s*plural\s*\=\s*([^;]*)\n?/ =~ line
       end
+      nil
     end
 
     def self.empty
@@ -47,12 +53,12 @@ module FastGettext
     end
 
     def split_plurals(singular_plural)
-      singular_plural.split(PLURAL_SEPERATOR,2)
+      singular_plural.split(PLURAL_SEPERATOR)
     end
 
     # Car, Cars => [Auto,Autos] or []
-    def plural_translations(singular,plural)
-      plurals = self[singular+PLURAL_SEPERATOR+plural]
+    def plural_translations(msgids)
+      plurals = self[msgids*PLURAL_SEPERATOR]
       if plurals then split_plurals(plurals) else [] end
     end
   end

data/lib/fast_gettext/translation.rb

@@ -4,6 +4,7 @@ module FastGettext
   #  - direct translation queries to the current repository
   #  - handle untranslated values
   #  - understand / enforce namespaces
+  #  - decide which plural form is used
   module Translation
     extend self
 
@@ -22,13 +23,15 @@ module FastGettext
     end
 
     #translate pluralized
-    def n_(singular,plural,count)
-      if translation = FastGettext.current_repository.plural(singular,plural,count)
-        translation
-      else
-        #TODO remove this repeated logic, e.g. return :plural / :singular or raise an exception ?
-        count == 1 ? singular : plural
-      end
+    # some languages have up to 4 plural forms...
+    # n_(singular, plural, plural form 2, ..., count)
+    # n_('apple','apples',3)
+    def n_(*msgids)
+      count = msgids.pop
+      
+      translations = FastGettext.current_repository.plural(*msgids)
+      selected = FastGettext.current_repository.pluralisation_rule.call(count)
+      translations[selected] || msgids[selected] || msgids.last
     end
 
     #translate, but discard namespace if nothing was found
@@ -47,8 +50,8 @@ module FastGettext
     end
 
     #tell gettext: this string need translation (will be found during parsing)
-    def Nn_(singular,plural)
-      [singular,plural]
+    def Nn_(*msgids)
+      msgids
     end
   end
 end

data/lib/fast_gettext/translation_repository/base.rb

@@ -5,11 +5,17 @@ module FastGettext
     #  - fallback as empty repository, that cannot translate anything but does not crash
     class Base
       attr_accessor :locale
+      attr_writer :pluralisation_rule
+
       def initialize(name,options={})
         @name = name
         @options = options
       end
 
+      def pluralisation_rule
+        @pluralisation_rule || lambda{|n| n==1 ? 0 : 1}
+      end
+
       def available_locales
         []
       end
@@ -18,8 +24,8 @@ module FastGettext
         current_translations[key]
       end
 
-      def plural(singular,plural,count)
-        current_translations.plural(singular,plural,count)
+      def plural(*msgids)
+        current_translations.plural(*msgids)
       end
 
       protected

data/lib/fast_gettext/translation_repository/mo.rb

@@ -6,18 +6,27 @@ module FastGettext
     #  - provide access to translations in mo files
     class Mo < Base
       def initialize(name,options={})
-        # parse all .mo files with the right name, that sit in locale/LC_MESSAGES folders
-        find_files_in_locale_folders(File.join('LC_MESSAGES',"#{name}.mo"),options[:path]) do |locale,file|
-          @files[locale] = MoFile.new(file)
-        end
+        find_and_store_files(name,options)
+        super
       end
 
       def available_locales
         @files.keys
       end
 
+      def pluralisation_rule
+        current_translations.pluralisation_rule || super
+      end
+
       protected
 
+      def find_and_store_files(name,options)
+        # parse all .mo files with the right name, that sit in locale/LC_MESSAGES folders
+        find_files_in_locale_folders(File.join('LC_MESSAGES',"#{name}.mo"),options[:path]) do |locale,file|
+          @files[locale] = MoFile.new(file)
+        end
+      end
+
       def current_translations
         @files[FastGettext.locale] || MoFile.empty
       end

data/lib/fast_gettext/translation_repository/po.rb

@@ -6,7 +6,8 @@ module FastGettext
     #  - find and store po files
     #  - provide access to translations in po files
     class Po < Mo
-      def initialize(name,options={})
+      protected
+      def find_and_store_files(name,options)
         require File.join(File.dirname(__FILE__),'..','..','..','vendor','poparser')
         require 'fast_gettext/mo_file'
         find_files_in_locale_folders("#{name}.po",options[:path]) do |locale,file|

data/spec/fast_gettext/mo_file_spec.rb

@@ -16,8 +16,13 @@ describe MoFile do
     de['Car|Model'].should == nil
   end
   it "finds pluralized values" do
-    de.plural('Axis','Axis',1).should == 'Achse' #singular
-    de.plural('Axis','Axis',2).should == 'Achsen' #plurals
+    de.plural('Axis','Axis').should == ['Achse','Achsen']
+  end
+  it "returns singular translations when pluralisation could not be found" do
+    de.plural('Axis','Axis','Axis').should == ['Achse','Achse','Achse']
+  end
+  it "returns ids when not plural and singular translations could not be found" do
+    de.plural('Axis','Axis','NOTFOUND').should == ['Achse','Achse','NOTFOUND']
   end
   it "can access plurals through []" do
     de['Axis'].should == 'Achse' #singular

data/spec/fast_gettext/translation_repository/base_spec.rb

@@ -15,6 +15,6 @@ describe 'FastGettext::TranslationRepository::Base' do
   end
   it "cannot pluralize" do
     @rep.locale = 'de'
-    @rep.plural('Axis','Axis',2).should == nil
+    @rep.plural('Axis','Axis').should == ['Axis','Axis']
   end
 end

data/spec/fast_gettext/translation_repository/mo_spec.rb

@@ -16,6 +16,16 @@ describe 'FastGettext::TranslationRepository::Mo' do
   end
   it "can pluralize" do
     FastGettext.locale = 'de'
-    @rep.plural('Axis','Axis',2).should == 'Achsen'
+    @rep.plural('Axis','Axis').should == ['Achse','Achsen']
+  end
+  it "stores pluralisation rule" do
+    @rep.pluralisation_rule = lambda{|n|n+1}
+    @rep.pluralisation_rule.call(3).should == 4
+  end
+  it "has access to the mo repositories pluralisation rule" do
+    FastGettext.locale = 'en'
+    rep = FastGettext::TranslationRepository.build('plural_test',:path=>File.join(current_folder,'..','..','locale'))
+    rep['car'].should == 'Test'#just check it is loaded correctly
+    rep.pluralisation_rule.call(2).should == 3
   end
 end

data/spec/fast_gettext/translation_repository/po_spec.rb

@@ -16,6 +16,12 @@ describe 'FastGettext::TranslationRepository::Po' do
   end
   it "can pluralize" do
     FastGettext.locale = 'de'
-    @rep.plural('Axis','Axis',2).should == 'Achsen'
+    @rep.plural('Axis','Axis').should == ['Achse','Achsen']
+  end
+  it "has access to the mo repositories pluralisation rule" do
+    FastGettext.locale = 'en'
+    rep = FastGettext::TranslationRepository.build('plural_test',:path=>File.join(current_folder,'..','..','locale'),:type=>:po)
+    rep['car'].should == 'Test'#just check it is loaded correctly
+    rep.pluralisation_rule.call(2).should == 3
   end
 end

data/spec/fast_gettext/translation_spec.rb

@@ -38,10 +38,26 @@ describe FastGettext::Translation do
       n_('Axis','Axis',2).should == 'Achsen'
       n_('Axis','Axis',0).should == 'Achsen'
     end
+
+    it "supports abstract pluralisation rules" do
+      begin
+        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 "returns the appropriate msgid if no translation was found" do
       n_('NOTFOUND','NOTFOUNDs',1).should == 'NOTFOUND'
       n_('NOTFOUND','NOTFOUNDs',2).should == 'NOTFOUNDs'
     end
+
+    it "returns the last msgid when no translation was found and msgids where to short" do
+      FastGettext.current_repository.pluralisation_rule = lambda{|x|4}
+      n_('Apple','Apples',2).should == 'Apples'
+    end
   end
 
   describe :s_ do

data/spec/locale/en/plural_test.po

@@ -0,0 +1,20 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: version 0.0.1\n"
+"POT-Creation-Date: 2009-02-26 19:50+0100\n"
+"PO-Revision-Date: 2009-02-18 15:42+0100\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n==2?3:4;\n"
+
+msgid "car"
+msgstr "Test"

data/vendor/CHANGELOG

@@ -0,0 +1 @@
+0.3 -- pluralisation methods accept/return n plural forms, contrary to singular/plural before

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.2.11
+  version: 0.3.0
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-28 00:00:00 -08:00
+date: 2009-03-09 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -51,7 +51,9 @@ files:
 - spec/locale/de/test.po
 - spec/locale/en
 - spec/locale/en/LC_MESSAGES
+- spec/locale/en/LC_MESSAGES/plural_test.mo
 - spec/locale/en/LC_MESSAGES/test.mo
+- spec/locale/en/plural_test.po
 - spec/locale/en/test.po
 - spec/spec_helper.rb
 - spec/vendor
@@ -59,6 +61,7 @@ files:
 - spec/vendor/fake_load_path/iconv.rb
 - spec/vendor/iconv_spec.rb
 - spec/vendor/string_spec.rb
+- vendor/CHANGELOG
 - vendor/README.rdoc
 - vendor/empty.mo
 - vendor/iconv.rb