gettext 2.0.0 → 2.0.1

data/ChangeLog

@@ -1,3 +1,18 @@
+= Ruby-GetText-Package-2.0.1 (2009-04-17)
+ * Fixed bugs
+   * doesn't work with ruby-1.8.5. [Reported by Dan Coutu]
+   * GetText.locale= can't keep the locale. [Reported by Adam Ilan]
+   * Break backward compatibility of bindtextdomain
+	       [Reported by Mamoru Tasaka(#24947), Mathieu Blondel]
+   * Other trivial fixes/improvement.
+ * 1.8 times faster than 2.0.0.
+ * GetText::LocalePath is separated from GetText::TextDomainManager.
+   Improve to find the locale path.
+ * Enhance to support ruby-1.9.x [by OZAWA Sakuro]
+
+Thanks to:
+   OZAWA Sakuro, Tietew, Adam Ilan, Mamoru Tasaka, Mathieu Blondel.
+	
 = Ruby-GetText-Package-2.0.0 (2009-03-21)
  * Separate this library to locale and rails-support to locale, 
    locale_rails, gettext_activerecord, gettext_rails.

data/README.rdoc

@@ -60,7 +60,7 @@ Rails / ActiveRecord specific code now lives in locale_rails[http://github.com/m
     * (for compiling src/rmsgfmt.ry only)
 
 == Install
-* Uninstall old gettext if exists. (You need to do this when updating 1.93.0 -> 2.0.0)
+* Uninstall old gettext if exists. (You need to do this when updating 1.93.0 -> 2.0.1)
     (sudo/su on POSIX system)
     gem uninstall gettext
 
@@ -220,32 +220,32 @@ This program is licenced under the same licence as Ruby.
 
 == Status of translations
 * Bosnian(bs)               - 1.90.0 (old)
-* Bulgarian(bg)             - 2.0.0 (new)
-* Catalan(ca)               - 2.0.0
+* Bulgarian(bg)             - 2.0.1
+* Catalan(ca)               - 2.0.1
 * Croatian(hr)              - 1.90.0 (old)
-* Chinese(zh_CN)            - 2.0.0
-* Chinese(zh_TW)            - 2.0.0
+* Chinese(zh_CN)            - 2.0.1
+* Chinese(zh_TW)            - 2.0.1
 * Czech(cs)                 - 1.9.0 (old)
 * Dutch(nl)                 - 1.90.0 (old)
 * English(default)          - 1.90.0 (old)
-* Esperanto(eo)             - 2.0.0
-* Estonian(et)              - 2.0.0
-* French(fr)                - 2.0.0
-* German(de)                - 2.0.0
-* Greek(el)                 - 2.0.0 
-* Hungarian(hu)             - 2.0.0
+* Esperanto(eo)             - 2.0.1
+* Estonian(et)              - 2.0.1
+* French(fr)                - 2.0.1
+* German(de)                - 2.0.1
+* Greek(el)                 - 2.0.1 
+* Hungarian(hu)             - 2.0.1
 * Italian(it)               - 1.6.0 (old)
-* Japanese(ja)              - 2.0.0
+* Japanese(ja)              - 2.0.1
 * Korean(ko)                - 1.9.0 (old)
-* Latvian(lv)               - 2.0.0 (new)
-* Norwegian(nb)             - 2.0.0
-* Portuguese(Brazil)(pt_BR) - 2.0.0
-* Russian(ru)               - 2.0.0
+* Latvian(lv)               - 2.0.1 
+* Norwegian(nb)             - 2.0.1
+* Portuguese(Brazil)(pt_BR) - 2.0.1
+* Russian(ru)               - 2.0.1
 * Serbian(sr)               - 1.91.0 (old)
-* Spanish(es)               - 2.0.0
+* Spanish(es)               - 2.0.1
 * Swedish(sv)               - 0.8.0 (too much old)
-* Ukrainian(ua)             - 2.0.0
-* Vietnamese(vi)            - 2.0.0
+* Ukrainian(ua)             - 2.0.1
+* Vietnamese(vi)            - 2.0.1
 
 == Maintainer
 Masao Mutoh <mutomasa at gmail.com>

data/Rakefile

@@ -172,7 +172,7 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.executables = Dir.entries('bin').delete_if {|item| /^\.|CVS|~$/ =~ item }
   s.bindir = 'bin'
-  s.add_dependency('locale', '>= 2.0.0')
+  s.add_dependency('locale', '>= 2.0.1')
   s.has_rdoc = true
   s.description = <<-EOF
         Ruby-GetText-Package is a GNU GetText-like program for Ruby.
@@ -216,13 +216,13 @@ Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Ruby-GetText-Package API Reference"
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README', 'ChangeLog')
+  rdoc.rdoc_files.include('README.rdoc', 'ChangeLog')
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.template = allison if allison.size > 0
 }
 
 desc "Publish the release files to RubyForge."
-task :release => [ :package ] do
+task :release => [:makemo, :package ] do
   require 'rubyforge'
 
   rubyforge = RubyForge.new

data/lib/gettext.rb

@@ -13,9 +13,19 @@
   $Id: gettext.rb,v 1.46 2008/09/13 18:23:55 mutoh Exp $
 =end
 
-begin gem 'locale', '>=0.9'; rescue LoadError;end
+if respond_to? :gem
+  begin
+    begin
+      gem 'locale', '>=0.9' 
+    rescue Gem::LoadError
+    end
+  rescue NoMethodError
+  else LoadError
+  end
+end
+
 require 'locale'
-raise "Insall locale as gem or uninstall old gettext" unless Locale.respond_to? :candidates
+raise "Install locale as gem or uninstall old gettext" unless Locale.respond_to? :candidates
 
 require 'gettext/version'
 require 'gettext/textdomain_manager'
@@ -27,7 +37,7 @@ module GetText
       @domainname = domainname
     end
     def message
-      "#{domainname} is not bound."
+      "#{@domainname} is not bound."
     end
   end
 
@@ -53,27 +63,27 @@ module GetText
   #     library doesn't use this option. Application may use this once.
   # * Returns: the GetText::TextDomainManager.
   #
-  def bindtextdomain(domainname, options = {})
-    bindtextdomain_to(self, domainname, options)
+  def bindtextdomain(domainname, *options)
+    bindtextdomain_to(self, domainname, *options)
   end
 
   # Includes GetText module and bind a textdomain to a class.
   # * klass: the target ruby class.
   # * domainname: the textdomain name.
   # * options: options as an Hash. See GetText.bindtextdomain.
-  def bindtextdomain_to(klass, domainname, *args) 
-    if args[0].kind_of? Hash
-      options = args[0]
+  def bindtextdomain_to(klass, domainname, *options) 
+    if options[0].kind_of? Hash
+      opts = options[0]
     else
       # for backward compatibility.
-      options = {}
-      options[:path] = args[0] if args[0]
-      options[:output_charset] = args[2] if args[2]
+      opts = {}
+      opts[:path] = options[0] if options[0]
+      opts[:output_charset] = options[2] if options[2]
     end
     unless (klass.kind_of? GetText or klass.include? GetText)
       klass.__send__(:include, GetText)
     end
-    TextDomainManager.bind_to(klass, domainname, options)
+    TextDomainManager.bind_to(klass, domainname, opts)
   end
 
   # Binds a existed textdomain to your program. 
@@ -118,7 +128,7 @@ module GetText
   # * msgid: the message id.
   # * Returns: localized text by msgid. If there are not binded mo-file, it will return msgid.
   def gettext(msgid)
-    TextDomainManager.get(self).translate_singluar_message(self, msgid)
+    TextDomainManager.translate_singluar_message(self, msgid)
   end
 
   # call-seq:
@@ -135,7 +145,7 @@ module GetText
   #   <tt>Movie|Location -> Location</tt>
   # See: http://www.gnu.org/software/gettext/manual/html_mono/gettext.html#SEC151
   def sgettext(msgid, seperator = "|")
-    TextDomainManager.get(self).translate_singluar_message(self, msgid, seperator)
+    TextDomainManager.translate_singluar_message(self, msgid, seperator)
   end
 
   # call-seq:
@@ -152,7 +162,7 @@ module GetText
   #   it returns msgid.
   # See: http://www.gnu.org/software/autoconf/manual/gettext/Contexts.html
   def pgettext(msgctxt, msgid)
-    TextDomainManager.get(self).translate_singluar_message(self, "#{msgctxt}\004#{msgid}", "\004")
+    TextDomainManager.translate_singluar_message(self, "#{msgctxt}\004#{msgid}", "\004")
   end
 
   # call-seq:
@@ -170,7 +180,7 @@ module GetText
   # * Returns: the localized text which key is msgid_plural if n is plural(follow plural-rule) or msgid.
   #   "plural-rule" is defined in po-file.
   def ngettext(msgid, msgid_plural, n = nil)
-    TextDomainManager.get(self).translate_plural_message(self, msgid, msgid_plural, n)
+    TextDomainManager.translate_plural_message(self, msgid, msgid_plural, n)
   end
 
   # call-seq:
@@ -189,7 +199,7 @@ module GetText
   # * Returns: the localized text which key is msgid_plural if n is plural(follow plural-rule) or msgid.
   #   "plural-rule" is defined in po-file.
   def nsgettext(msgid, msgid_plural, n="|", seperator = "|")
-    TextDomainManager.get(self).translate_plural_message(self, msgid, msgid_plural, n, seperator)
+    TextDomainManager.translate_plural_message(self, msgid, msgid_plural, n, seperator)
   end
 
   # call-seq:
@@ -221,7 +231,7 @@ module GetText
       opt2 = nil
     end
     
-    msgstr = TextDomainManager.get(self).translate_plural_message(self, msgid_ctxt, msgid_plural, opt1, opt2)
+    msgstr = TextDomainManager.translate_plural_message(self, msgid_ctxt, msgid_plural, opt1, opt2)
     if msgstr == msgid_ctxt
       msgid
     else
@@ -262,7 +272,10 @@ module GetText
   end
 
   def set_locale(lang)
-    Locale.clear
+    Locale.default = lang
+  end
+
+  def set_current_locale(lang)
     Locale.current = lang
   end
 
@@ -271,6 +284,7 @@ module GetText
   end
 
   alias :locale= :set_locale #:nodoc:
+  alias :current_locale= :set_current_locale #:nodoc:
   alias :_ :gettext   #:nodoc:
   alias :n_ :ngettext #:nodoc:
   alias :s_ :sgettext #:nodoc:

data/lib/gettext/class_info.rb

@@ -8,7 +8,7 @@ module GetText
     # normalize the klass name
     def normalize_class(klass)
       ret = (klass.kind_of? Module) ? klass : klass.class
-      if ret.name =~ /^\#<|^$/ or ret == GetText
+      if ret.name.to_s =~ /^\#<|^$/ or ret == GetText
         ret = Object
       end
       ret
@@ -47,8 +47,11 @@ module GetText
     # (klass's ancestors, included modules and nested modules)
     def related_classes(klass, all_classes = [])
       ret = related_classes_internal(klass, all_classes)
-      (ret + [Object]).uniq
+      unless ret.include? Object
+        ret += [Object]
+      end
+      ret
     end
     memoize :related_classes
   end
-end
+end

data/lib/gettext/core_ext/string.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/ruby
 =begin
   string.rb - Extension for String.
 
@@ -9,12 +8,16 @@
 =end
 
 if RUBY_VERSION < "1.9.0"
-
 # Extension for String class. This feature is included in Ruby 1.9 or later.
 #
 # String#% method which accept "named argument". The translator can know 
 # the meaning of the msgids using "named argument" instead of %s/%d style.
 class String
+
+  unless respond_to? :bytesize  # For older ruby (such as ruby-1.8.5)
+    alias :bytesize :size
+  end
+
   alias :_old_format_m :% # :nodoc:
     
   # call-seq:

data/lib/gettext/locale_path.rb

@@ -9,59 +9,68 @@
 =end
 
 require 'rbconfig'
+require 'gettext/core_ext/string'
 
 module GetText
   # Treats locale-path for mo-files.
   class LocalePath
+    include Locale::Util::Memoizable
+
     # The default locale paths.
     CONFIG_PREFIX = Config::CONFIG['prefix'].gsub(/\/local/, "")
     DEFAULT_RULES = [
+                     "./locale/%{lang}/LC_MESSAGES/%{name}.mo",
+                     "./locale/%{lang}/%{name}.mo",
                      "#{Config::CONFIG['datadir']}/locale/%{lang}/LC_MESSAGES/%{name}.mo",
                      "#{Config::CONFIG['datadir'].gsub(/\/local/, "")}/locale/%{lang}/LC_MESSAGES/%{name}.mo",
                      "#{CONFIG_PREFIX}/share/locale/%{lang}/LC_MESSAGES/%{name}.mo",
                      "#{CONFIG_PREFIX}/local/share/locale/%{lang}/LC_MESSAGES/%{name}.mo"
                     ].uniq
-    
-    # Add default locale path. Usually you should use GetText.add_default_locale_path instead.
-    # * path: a new locale path. (e.g.) "/usr/share/locale/%{lang}/LC_MESSAGES/%{name}.mo"
-    #   ('locale' => "ja_JP", 'name' => "textdomain")
-    # * Returns: the new DEFAULT_LOCALE_PATHS
-    def self.add_default_rule(path)
-      DEFAULT_RULES.unshift(path)
-    end
 
-    @@default_path_rules = []
+    class << self
+      include Locale::Util::Memoizable
 
-    # Returns path rules as an Array. 
-    # (e.g.) ["/usr/share/locale/%{lang}/LC_MESSAGES/%{name}.mo", ...] 
-    def self.default_path_rules 
-      return @@default_path_rules.dup if @@default_path_rules.size > 0
-
-      if ENV["GETTEXT_PATH"]
-        ENV["GETTEXT_PATH"].split(/,/).each {|i| 
-          @@default_path_rules = ["#{i}/%{lang}/LC_MESSAGES/%{name}.mo", "#{i}/%{lang}/%{name}.mo"]
-        }
+      # Add default locale path. Usually you should use GetText.add_default_locale_path instead.
+      # * path: a new locale path. (e.g.) "/usr/share/locale/%{lang}/LC_MESSAGES/%{name}.mo"
+      #   ('locale' => "ja_JP", 'name' => "textdomain")
+      # * Returns: the new DEFAULT_LOCALE_PATHS
+      def add_default_rule(path)
+        DEFAULT_RULES.unshift(path)
       end
-
-      @@default_path_rules += DEFAULT_RULES
       
-      $LOAD_PATH.each {|path|
-        if /(.*)\/lib$/ =~ path
-          @@default_path_rules += [
-                           "#{$1}/data/locale/%{lang}/LC_MESSAGES/%{name}.mo", 
-                           "#{$1}/data/locale/%{lang}/%{name}.mo", 
-                           "#{$1}/locale/%{lang}/%{name}.mo"]
-        end
-      }
-      @@default_path_rules.dup
-    end
+      # Returns path rules as an Array. 
+      # (e.g.) ["/usr/share/locale/%{lang}/LC_MESSAGES/%{name}.mo", ...] 
+      def default_path_rules 
+        default_path_rules = []
 
-    # Clear path_rules for testing.
-    def self.clear
-      @@default_path_rules = nil
+        if ENV["GETTEXT_PATH"]
+          ENV["GETTEXT_PATH"].split(/,/).each {|i| 
+            default_path_rules = ["#{i}/%{lang}/LC_MESSAGES/%{name}.mo", "#{i}/%{lang}/%{name}.mo"]
+          }
+        end
+        
+        default_path_rules += DEFAULT_RULES
+        
+        load_path = $LOAD_PATH
+        if defined? ::Gem
+          load_path += Gem.all_load_paths.map{|v| v =~ /(.*)\/lib$/; $1}
+        end
+        
+        load_path.each {|path|
+          default_path_rules += [
+                                 "#{path}/data/locale/%{lang}/LC_MESSAGES/%{name}.mo", 
+                                 "#{path}/data/locale/%{lang}/%{name}.mo", 
+                                 "#{path}/locale/%{lang}/%{name}.mo"]
+        }
+        # paths existed only.
+        default_path_rules = default_path_rules.select{|path| 
+          Dir.glob(path % {:lang => "*", :name => "*"}).size > 0}.uniq
+        default_path_rules
+      end
+      memoize_dup :default_path_rules
     end
 
-    attr_reader :locale_paths
+    attr_reader :locale_paths, :supported_locales
 
     # Creates a new GetText::TextDomain.
     # * name: the textdomain name.
@@ -70,11 +79,22 @@ module GetText
       @name = name
       
       if topdir
-        @locale_paths = ["#{topdir}/%{lang}/LC_MESSAGES/%{name}.mo", "#{topdir}/%{lang}/%{name}.mo"]
+        path_rules = ["#{topdir}/%{lang}/LC_MESSAGES/%{name}.mo", "#{topdir}/%{lang}/%{name}.mo"]
       else
-        @locale_paths = self.class.default_path_rules
+        path_rules = self.class.default_path_rules
+
+      end
+
+      @locale_paths = {}
+      path_rules.each do |rule|
+        this_path_rules = rule % {:lang => "([^\/]+)", :name => name}
+        Dir.glob(rule %{:lang => "*", :name => name}).each do |path|
+          if /#{this_path_rules}/ =~ path
+            @locale_paths[$1] = path unless @locale_paths[$1]
+          end
+        end
       end
-      @locale_paths.map! {|v| v % {:name => name} }
+      @supported_locales = @locale_paths.keys.sort
     end
 
     # Gets the current path.
@@ -83,25 +103,21 @@ module GetText
       lang_candidates = lang.to_posix.candidates
       search_files = []
 
-      @locale_paths.each {|path|
-        lang_candidates.each{|tag|
-          fname = path % {:lang => tag}
-          if $DEBUG
-            search_files << fname unless search_files.include?(fname)
-          end
-          if File.exist?(fname)
-            warn "GetText::TextDomain#load_mo: mo-file is #{fname}" if $DEBUG
-            return fname
-          end
-        }
-      }
+      lang_candidates.each do |tag|
+        path = @locale_paths[tag.to_s]
+        warn "GetText::TextDomain#load_mo: mo-file is #{path}" if $DEBUG
+        return path if path
+      end
+
       if $DEBUG
         warn "MO file is not found in"
-        search_files.each do |v|
-          warn "  #{v}"
+        @locale_paths.each do |path|
+          warn "  #{path}"
         end
       end
       nil
     end
+    memoize :current_path
+    
   end
 end

data/lib/gettext/mofile.rb

@@ -1,7 +1,7 @@
 =begin
     mofile.rb - A simple class for operating GNU MO file.
 
-    Copyright (C) 2003-2008  Masao Mutoh
+    Copyright (C) 2003-2009  Masao Mutoh
     Copyright (C) 2002  Masahiro Sakai, Masao Mutoh
     Copyright (C) 2001  Masahiro Sakai
 
@@ -12,7 +12,6 @@
     of Ruby.  License of Ruby is included with Ruby distribution in
     the file "README".
 
-    $Id: mo.rb,v 1.10 2008/06/17 16:40:52 mutoh Exp $
 =end
 
 require 'gettext/core_ext/iconv'
@@ -169,11 +168,18 @@ module GetText
       ('1' * number) !~ /^1?$|^(11+?)\1+$/
     end
 
-    def next_prime(seed)
-      require 'mathn'
-      prime = Prime.new
-      while current = prime.succ
-        return current if current > seed
+    begin
+      require 'prime'
+      def next_prime(seed)
+        Prime.instance.find{|x| x > seed }
+      end
+    rescue LoadError
+      def next_prime(seed)
+        require 'mathn'
+        prime = Prime.new
+        while current = prime.succ
+          return current if current > seed
+        end
       end
     end
 
@@ -223,17 +229,17 @@ module GetText
 
       orig_table_data = Array.new()
       ary.each{|item, _|
-        orig_table_data.push(item.size)
+        orig_table_data.push(item.bytesize)
         orig_table_data.push(pos)
-        pos += item.size + 1 # +1 is <NUL>
+        pos += item.bytesize + 1 # +1 is <NUL>
       }
       io.write(orig_table_data.pack('V*'))
 
       trans_table_data = Array.new()
       ary.each{|_, item|
-        trans_table_data.push(item.size)
+        trans_table_data.push(item.bytesize)
         trans_table_data.push(pos)
-        pos += item.size + 1 # +1 is <NUL>
+        pos += item.bytesize + 1 # +1 is <NUL>
       }
       io.write(trans_table_data.pack('V*'))
 

data/lib/gettext/parser/erb.rb

@@ -30,7 +30,10 @@ module GetText
     end
 
     def parse(file, targets = []) # :nodoc:
-      erb = ERB.new(IO.readlines(file).join).src.split(/$/)
+      src = ERB.new(IO.readlines(file).join).src
+      # Remove magic comment prepended by erb in Ruby 1.9.
+      src.sub!(/\A#.*?coding[:=].*?\n/, '') if src.respond_to?(:encode)
+      erb = src.split(/$/)
       RubyParser.parse_lines(file, erb, targets)
     end
 

data/lib/gettext/textdomain.rb

@@ -112,6 +112,9 @@ module GetText
       end
     end
 
+    DEFAULT_PLURAL_CALC = Proc.new{|n| "n != 1"}
+    DEFAULT_SINGLE_CALC = Proc.new{|n| 0}
+
     # Translates the translated string.
     # * lang: Locale::Tag::Simple's subclass.
     # * msgid: the original message.
@@ -126,11 +129,11 @@ module GetText
       elsif msg.include?("\000")
         # [[msgstr[0], msgstr[1], msgstr[2],...], cond]
         mofile = @mofiles[lang.to_posix.to_s]
-        cond = (mofile and mofile != :empty) ? mofile.plural : nil
-        cond ||= "n != 1"
+        cond = (mofile and mofile != :empty) ? Proc.new{|n| eval(mofile.plural)} : nil
+        cond ||= DEFAULT_PLURAL_CALC
         ret = [msg.split("\000"), cond]
       else
-        ret = [[msg], "0"]
+        ret = [[msg], DEFAULT_SINGLE_CALC]
       end
       ret
     end

data/lib/gettext/textdomain_group.rb

@@ -0,0 +1,25 @@
+=begin
+  gettext/textdomain_group - GetText::TextDomainGroup class
+
+  Copyright (C) 2009  Masao Mutoh
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+
+=end
+
+module GetText
+
+  class TextDomainGroup
+    attr_reader :textdomains, :supported_language_tags
+    
+    def initialize(supported_language_tags)
+      @textdomains = []
+      @supported_language_tags = supported_language_tags
+    end
+
+    def add(textdomain)
+      @textdomains.unshift(textdomain) unless @textdomains.include? textdomain
+    end
+  end
+end

data/lib/gettext/textdomain_manager.rb

@@ -8,100 +8,87 @@
 
 =end
 
-require 'gettext/textdomain'
 require 'gettext/class_info'
-require 'locale/util/memoizable'
+require 'gettext/textdomain'
+require 'gettext/textdomain_group'
 
 module GetText
-  class TextDomainManager
-    include Locale::Util::Memoizable
+
+  module TextDomainManager
 
     @@textdomain_pool = {}
-    @@textdomain_manager_pool = {}
+    @@textdomain_group_pool = {}
 
     @@output_charset = nil
     @@gettext_classes = []
 
+    @@singular_message_cache = {}
+    @@plural_message_cache = {}
+    @@cached = ! $DEBUG
+
+    extend self
+    
     # Find textdomain by name
-    def self.textdomain_pool(domainname)
+    def textdomain_pool(domainname)
       @@textdomain_pool[domainname]
     end
 
-    # create or find a textdomain-manager for an given object/class
-    def self.get(obj)
-      klass = ClassInfo.normalize_class(obj)
-      manager = @@textdomain_manager_pool[klass]
-      return manager if manager
-      @@textdomain_manager_pool[klass] = TextDomainManager.new
-    end
-
     # Set the value whether cache messages or not. 
     # true to cache messages, otherwise false.
     #
     # Default is true. If $DEBUG is false, messages are not checked even if
     # this value is true.
-    def self.cached=(val)
+    def cached=(val)
+      @@cached = val
       TextDomain.cached = val
     end
     
     # Return the cached value.
-    def self.cached?
+    def cached?
+      @@cached
       TextDomain.cached?
     end
 
     # Gets the output charset.
-    def self.output_charset
+    def output_charset
       @@output_charset 
     end
-
+    
     # Sets the output charset.The program can have a output charset.
-    def self.output_charset=(charset)
+    def output_charset=(charset)
       @@output_charset = charset
       @@textdomain_pool.each do |key, textdomain|
         textdomain.output_charset = charset
       end
     end
-   
+    
     # bind textdomain to the class.
-    def self.bind_to(klass, domainname, options = {})
+    def bind_to(klass, domainname, options = {})
       warn "Bind the domain '#{domainname}' to '#{klass}'. " if $DEBUG
 
       charset = options[:output_charset] || self.output_charset
       textdomain = create_or_find_textdomain(domainname,options[:path],charset)
 
       target_klass = ClassInfo.normalize_class(klass)
-      get(target_klass).add(textdomain, options[:supported_language_tags])
-      add_to_gettext_classes(target_klass)
-
+      create_or_find_textdomain_group(target_klass, options[:supported_language_tags]).add(textdomain)
+      @@gettext_classes << target_klass unless @@gettext_classes.include? target_klass
+      
       textdomain
     end
-
-    def self.each_textdomains(klass) #:nodoc:
+    
+    def each_textdomains(klass) #:nodoc:
       ClassInfo.related_classes(klass, @@gettext_classes).each do |target|
         msg = nil
-        get(target).textdomains.each do |textdomain|
-          yield textdomain
+        if group = @@textdomain_group_pool[target]
+          lang = Locale.candidates(:supported_language_tags => group.supported_language_tags, 
+                                   :type => :posix)[0]
+          group.textdomains.each do |textdomain|
+            yield textdomain, lang
+          end
         end
       end
     end
 
-    #
-    # Instance methods
-    #
-
-    # Returns the textdoman in the instance.
-    attr_reader :textdomains, :supported_language_tags
-  
-    def initialize
-      @textdomains = []
-      @supported_language_tags = nil
-    end
-
-    def add(textdomain, supported_language_tags)
-      @textdomains.unshift(textdomain) unless @textdomains.include? textdomain
-      @supported_language_tags = supported_language_tags if supported_language_tags
-    end
-
     # Translates msgid, but if there are no localized text, 
     # it returns a last part of msgid separeted "div" or whole of the msgid with no "div".
     #
@@ -109,16 +96,12 @@ module GetText
     # * div: separator or nil.
     # * Returns: the localized text by msgid. If there are no localized text, 
     #   it returns a last part of msgid separeted "div".
-    def translate_singluar_message(klass, msgid, div = '|')
-      lang = Locale.candidates(:supported_language_tags => @supported_language_tags, 
-                               :type => :posix)[0]
-      translate_singluar_message_to(lang, klass, msgid, div)
-    end
-
-    def translate_singluar_message_to(lang, klass, msgid, div = '|') #:nodoc:
-      msg = nil
+    def translate_singluar_message(klass, msgid, div = nil)
+      key = [Locale.current, klass, msgid, div].hash
+      msg = @@singular_message_cache[key]
+      return msg if msg and @@cached
       # Find messages from related classes.
-      self.class.each_textdomains(klass) do |textdomain|
+      each_textdomains(klass) do |textdomain, lang|
         msg = textdomain.translate_singluar_message(lang, msgid)
         break if msg
       end
@@ -130,10 +113,9 @@ module GetText
           msg = msg[(index + 1)..-1]
         end
       end
-      msg
+      @@singular_message_cache[key] = msg
     end
-    memoize :translate_singluar_message_to unless $DEBUG
-
+    
     # This function is similar to the get_singluar_message function 
     # as it finds the message catalogs in the same way. 
     # But it takes two extra arguments for plural form.
@@ -157,12 +139,6 @@ module GetText
     # * n: a number used to determine the plural form.
     # * div: the separator. Default is "|".
     def translate_plural_message(klass, arg1, arg2, arg3 = "|", arg4 = "|")
-      lang = Locale.candidates(:supported_language_tags => @supported_language_tags, 
-                               :type => :posix)[0]
-      translate_plural_message_to(lang, klass, arg1, arg2, arg3, arg4)
-    end
-
-    def translate_plural_message_to(lang, klass, arg1, arg2, arg3 = "|", arg4 = "|")
       # parse arguments
       if arg1.kind_of?(Array)
         msgid = arg1[0]
@@ -179,45 +155,53 @@ module GetText
         div = arg4
       end
 
-      # Find messages from related classes.
-      msgs = nil
-      self.class.each_textdomains(klass) do |textdomain|
-        msgs = textdomain.translate_plural_message(lang, msgid, msgid_plural)
-        break if msgs
-      end
-      
-      # If not found, return msgid.
-      msgs = [[msgid, msgid_plural], "n != 1"] unless msgs
+      key = [Locale.current, klass, msgid, msgid_plural, div].hash
+      msgs = @@plural_message_cache[key]
+      unless (msgs and @@cached)
 
-      msgstrs = msgs[0]
-      if div and msgstrs[0] == msgid and index = msgstrs[0].rindex(div)
-        msgstrs[0] = msgstrs[0][(index + 1)..-1]
+        # Find messages from related classes.
+        msgs = nil
+        each_textdomains(klass) do |textdomain, lang|
+          msgs = textdomain.translate_plural_message(lang, msgid, msgid_plural)
+          break if msgs
+        end
+        
+        msgs = [[msgid, msgid_plural], Proc.new{|n| eval("n != 1")}] unless msgs
+
+        msgstrs = msgs[0]
+        if div and msgstrs[0] == msgid and index = msgstrs[0].rindex(div)
+          msgstrs[0] = msgstrs[0][(index + 1)..-1]
+        end
+        @@plural_message_cache[key] = msgs
       end
 
       # Return the singular or plural message.
-      plural = eval(msgs[1])
+      msgstrs = msgs[0]
+      plural = msgs[1].call(n)
       return msgstrs[plural] if plural.kind_of?(Numeric)
       return plural ? msgstrs[1] : msgstrs[0]
     end
-    memoize :translate_plural_message_to unless $DEBUG
 
     # for testing.
-    def self.clear_all_textdomains
+    def clear_all_textdomains
       @@textdomain_pool = {}
-      @@textdomain_manager_pool = {}
+      @@textdomain_group_pool = {}
       @@gettext_classes = []
+      @@singular_message_cache = {}
+      @@plural_message_cache = {}
     end
-    
-  private
 
-    def self.add_to_gettext_classes(klass)
-      @@gettext_classes << klass unless @@gettext_classes.include? klass
+    def create_or_find_textdomain_group(klass, supported_language_tags = nil) #:nodoc:
+      group = @@textdomain_group_pool[klass]
+      return group if group
+      
+      @@textdomain_group_pool[klass] = TextDomainGroup.new(supported_language_tags)
     end
-
-    def self.create_or_find_textdomain(name, path, charset)#:nodoc:
+    
+    def create_or_find_textdomain(name, path, charset)#:nodoc:
       textdomain = @@textdomain_pool[name]
       return textdomain if textdomain
-
+      
       @@textdomain_pool[name] = TextDomain.new(name, path, charset)
     end
   end

data/lib/gettext/tools.rb

@@ -188,6 +188,25 @@ module GetText
     mo_dir = mo_dir_rule % {:lang => lang}
     File.join(mo_dir, "#{textdomain}.mo")
   end
+
+  # In Ruby 1.9, we must detect proper encoding of a PO file.
+  def po_file_content(po_file)
+    args = [ po_file ]
+    if String.instance_methods.include?(:encode)
+      encoding = detect_po_file_encoding(po_file)
+      args << "r:#{encoding}"
+    end
+    File.open(*args) {|io| io.read }
+  end
+
+  def detect_po_file_encoding(po_file)
+    open(po_file, :encoding => 'ASCII-8BIT') do |input|
+      input.lines.each do |line|
+        return Encoding.find($1) if %r["Content-Type:.*\scharset=(.*)\\n"] =~ line
+      end
+    end
+    Encoding.default_external
+  end
 end
 
 if __FILE__ == $0

data/lib/gettext/tools/rmsgfmt.rb

@@ -34,7 +34,8 @@ module GetText
 
       parser = PoParser.new
       data = MOFile.new
-      parser.parse(File.open(targetfile).read, data)
+
+      parser.parse(po_file_content(targetfile), data)
       data.save_to_file(output_path)
     end
 

data/lib/gettext/version.rb

@@ -8,5 +8,5 @@
   license terms as Ruby.
 =end
 module GetText
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/test/Rakefile

@@ -15,6 +15,6 @@ desc 'Run all tests'
 task :test do
    Dir.glob("**/test_*.rb").each do |path|
     puts ""
-    ruby "-I../lib", "-rubygems", path rescue nil
+    ruby "-I../lib:../../locale/lib", "-rubygems", path rescue nil
    end
 end

data/test/po/{fr/test6.po → ja/test3.po}

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-01-01 02:24:56+0900\n"
+"POT-Creation-Date: 2001-10-28 01:39:53+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: testlib1.rb:10
+#: test.rb:9 test.rb:11
 msgid "language"
-msgstr "french"
-
-#: testlib1.rb:14
-msgid "one is %d."
-msgstr "ONE IS %d."
+msgstr "JAPANESE"

data/test/test_class_info.rb

@@ -66,7 +66,6 @@ class TestClassInfo < Test::Unit::TestCase
   end
 
   def test_rellated_classes_with_all_classes
-    # Evertime Object is returned as the fallback object.
     assert_equal [M1, Object], related_classes(M1, [M1])
     assert_equal [M1, Object], related_classes(M1::M3::M4, [M1])
     assert_equal [M1::M3, Object], related_classes(M1::M3::M4, [M1::M3])

data/test/test_gettext.rb

@@ -1,3 +1,4 @@
+# -*- coding: UTF-8 -*-
 require 'testlib/helper.rb'
 
 require 'testlib/simple.rb'

data/test/test_locale_path.rb

@@ -12,6 +12,8 @@ class TestLocalePath < Test::Unit::TestCase
     assert_equal("japanese", test.test)
     prefix = GetText::LocalePath::CONFIG_PREFIX
     default_locale_dirs = [
+      "./locale/%{lang}/LC_MESSAGES/%{name}.mo",
+      "./locale/%{lang}/%{name}.mo",
       "#{Config::CONFIG['datadir']}/locale/%{lang}/LC_MESSAGES/%{name}.mo",
       "#{Config::CONFIG['datadir'].gsub(/\/local/, "")}/locale/%{lang}/LC_MESSAGES/%{name}.mo",
       "#{prefix}/share/locale/%{lang}/LC_MESSAGES/%{name}.mo",
@@ -26,12 +28,23 @@ class TestLocalePath < Test::Unit::TestCase
   def test_initialize_with_topdir
     testdir = File.dirname(File.expand_path(__FILE__))
     path = GetText::LocalePath.new("test1", "#{testdir}/locale")
-    assert_equal path.locale_paths, ["#{testdir}/locale/%{lang}/LC_MESSAGES/test1.mo", 
-                                     "#{testdir}/locale/%{lang}/test1.mo"]
+    assert_equal path.locale_paths, { "ja" => "#{testdir}/locale/ja/LC_MESSAGES/test1.mo", 
+                                     "fr" => "#{testdir}/locale/fr/LC_MESSAGES/test1.mo"}
     assert_equal path.current_path(Locale::Tag.parse("ja")), "#{testdir}/locale/ja/LC_MESSAGES/test1.mo"
     assert_equal path.current_path(Locale::Tag.parse("ja-JP")), "#{testdir}/locale/ja/LC_MESSAGES/test1.mo"
     assert_equal path.current_path(Locale::Tag.parse("ja_JP.UTF-8")), "#{testdir}/locale/ja/LC_MESSAGES/test1.mo"
     assert_equal path.current_path(Locale::Tag.parse("en")), nil
   end
 
+  def test_supported_locales
+    testdir = File.dirname(File.expand_path(__FILE__))
+    path = GetText::LocalePath.new("test1", "#{testdir}/locale")
+    assert_equal ["fr", "ja"], path.supported_locales
+
+    path = GetText::LocalePath.new("plural", "#{testdir}/locale")
+    assert_equal ["cr", "da", "fr", "ir", "ja", "la", "li", "po", "sl"], path.supported_locales
+
+    path = GetText::LocalePath.new("nodomain", "#{testdir}/locale")
+    assert_equal [], path.supported_locales
+  end
 end

data/test/test_parser.rb

@@ -92,20 +92,20 @@ class TestGetTextParser < Test::Unit::TestCase
 
   def test_rgettext_parse
     GetText::ErbParser.init(:extnames => ['.rhtml', '.rxml'])
-    ary = GetText::RGetText.parse('testlib/erb.rhtml')
+    ary = GetText::RGetText.parse(['testlib/erb.rhtml'])
     assert_equal(['aaa', 'testlib/erb.rhtml:8'], ary[0])
     assert_equal(['aaa\n', 'testlib/erb.rhtml:11'], ary[1])
     assert_equal(['bbb', 'testlib/erb.rhtml:12'], ary[2])
     assert_equal(["ccc1\000ccc2", 'testlib/erb.rhtml:13'], ary[3])
 
-    ary = GetText::RGetText.parse('testlib/erb.rxml')
+    ary = GetText::RGetText.parse(['testlib/erb.rxml'])
     assert_equal(['aaa', 'testlib/erb.rxml:9'], ary[0])
     assert_equal(['aaa\n', 'testlib/erb.rxml:12'], ary[1])
     assert_equal(['bbb', 'testlib/erb.rxml:13'], ary[2])
     assert_equal(["ccc1\000ccc2", 'testlib/erb.rxml:14'], ary[3])
 
 
-    ary = GetText::RGetText.parse('testlib/ngettext.rb')
+    ary = GetText::RGetText.parse(['testlib/ngettext.rb'])
     assert_equal(["ooo\000ppp", 'testlib/ngettext.rb:64', 'testlib/ngettext.rb:65'], ary[12])
     assert_equal(["qqq\000rrr", 'testlib/ngettext.rb:69', 'testlib/ngettext.rb:70'], ary[13])
   end

data/test/test_string.rb

@@ -1,7 +1,7 @@
 require 'testlib/helper.rb'
 
 class TestGetTextString < Test::Unit::TestCase
-  def test_string_sprintf
+  def test_sprintf
     assert_equal("foo is a number", "%{msg} is a number" % {:msg => "foo"})
     assert_equal("bar is a number", "%s is a number" % ["bar"])
     assert_equal("bar is a number", "%s is a number" % "bar")
@@ -11,4 +11,26 @@ class TestGetTextString < Test::Unit::TestCase
     assert_equal("test, 1", "%2$s, %1$d" % [1, "test"])
     assert_raise(ArgumentError) { "%-%" % [1] }
   end
+
+=begin
+  def test_sprintf_lack_argument
+    assert_equal("%{num}, test", "%{num}, %{record}" % {:record => "test"})
+    assert_equal("%{record}", "%{record}" % {:num => 1})
+  end
+
+  def test_sprintf_ruby19
+    assert_equal("1", "%<num>d" % {:num => 1})
+    assert_equal("1", "%<num>#b" % {:num => 1})
+    assert_equal("foo", "%<msg>s" % {:msg => "foo"})
+    assert_equal("1.000000", "%<num>f" % {:num => 1.0})
+    assert_equal("  1", "%<num>3.0f" % {:num => 1.0})
+    assert_equal("100.00", "%<num>2.2f" % {:num => 100.0})
+    assert_equal("0x64", "%<num>#x" % {:num => 100.0})
+  end
+
+  def test_percent
+    assert_equal("% 1", "%% %<num>d" % {:num => 1.0})
+  end
+=end
+
 end

data/test/test_textdomain_bind.rb

@@ -11,7 +11,7 @@ class TestGetTextBind < Test::Unit::TestCase
 
   def test_bindtextdomain
     domain = GetText.bindtextdomain("foo")
-    assert_equal domain, GetText::TextDomainManager.get(GetText).textdomains[0]
+    assert_equal domain, GetText::TextDomainManager.create_or_find_textdomain_group(Object).textdomains[0]
     assert_equal domain, GetText::TextDomainManager.textdomain_pool("foo")
   end
 

data/test/test_textdomain_multi.rb

@@ -2,6 +2,7 @@ require 'testlib/helper.rb'
 require 'testlib/multi_textdomain.rb'
 
 class TestGetTextMulti < Test::Unit::TestCase
+
   def setup
     GetText.locale = "ja_JP.EUC-JP"
   end
@@ -65,5 +66,14 @@ class TestGetTextMulti < Test::Unit::TestCase
     assert_equal("no data", test.test3)   # No po file.
   end
 
+  def test_same_msgid_but_different_textdomain
+    test1 = C12.new  # test1 domain
+    test2 = C51.new  # test3 domain
+    test3 = C52.new  # test3 domain but inherited C11.
+
+    assert_equal("japanese", test1.test)  # Use text1 message
+    assert_equal("JAPANESE", test2.test)  # Use text3 message
+    assert_equal("JAPANESE", test3.test)  # Use text3 message
+  end
 
 end

data/test/test_thread.rb

@@ -15,7 +15,7 @@ class TestThread < Test::Unit::TestCase
     Thread.start do
       @mutex.synchronize {
         Thread.current["language"] = language
-        GetText.locale = tag
+        GetText.current_locale = tag
       }
       (1..10).each do |v|
         assert_equal Thread.current["language"], _("language") 

data/test/testlib/multi_textdomain.rb

@@ -117,3 +117,15 @@ class C4 < C3
     _("no data")
   end
 end
+
+class C51
+  include GetText
+  bindtextdomain("test3", :path => "locale")
+  def test
+    _("language")
+  end
+end
+
+class C52 < C12
+  bindtextdomain("test3", :path => "locale")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gettext
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Masao Mutoh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-22 00:00:00 +09:00
+date: 2009-04-19 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 2.0.1
     version: 
 description: Ruby-GetText-Package is a GNU GetText-like program for Ruby. The catalog file(po-file) is same format with GNU GetText. So you can use GNU GetText tools for maintaining.
 email: mutomasa at gmail.com
@@ -828,6 +828,7 @@ files:
 - lib/gettext/poparser.rb
 - lib/gettext/textdomain.rb
 - lib/gettext/textdomain_manager.rb
+- lib/gettext/textdomain_group.rb
 - lib/gettext/utils.rb
 - lib/gettext/version.rb
 - lib/gettext/mofile.rb
@@ -860,7 +861,6 @@ files:
 - test/po/sl
 - test/po/sl/plural.po
 - test/po/fr
-- test/po/fr/test6.po
 - test/po/fr/plural_error.po
 - test/po/fr/plural.po
 - test/po/fr/test2.po
@@ -868,12 +868,12 @@ files:
 - test/po/li
 - test/po/li/plural.po
 - test/po/ja
-- test/po/ja/test6.po
 - test/po/ja/pgettext.po
 - test/po/ja/sgettext.po
 - test/po/ja/nsgettext.po
 - test/po/ja/plural_error.po
 - test/po/ja/rubyparser.po
+- test/po/ja/test3.po
 - test/po/ja/plural.po
 - test/po/ja/test2.po
 - test/po/ja/npgettext.po
@@ -902,7 +902,6 @@ files:
 - test/locale/sl/LC_MESSAGES/plural.mo
 - test/locale/fr
 - test/locale/fr/LC_MESSAGES
-- test/locale/fr/LC_MESSAGES/test6.mo
 - test/locale/fr/LC_MESSAGES/plural_error.mo
 - test/locale/fr/LC_MESSAGES/test2.mo
 - test/locale/fr/LC_MESSAGES/plural.mo
@@ -912,7 +911,6 @@ files:
 - test/locale/li/LC_MESSAGES/plural.mo
 - test/locale/ja
 - test/locale/ja/LC_MESSAGES
-- test/locale/ja/LC_MESSAGES/test6.mo
 - test/locale/ja/LC_MESSAGES/plural_error.mo
 - test/locale/ja/LC_MESSAGES/pgettext.mo
 - test/locale/ja/LC_MESSAGES/test2.mo
@@ -921,6 +919,7 @@ files:
 - test/locale/ja/LC_MESSAGES/npgettext.mo
 - test/locale/ja/LC_MESSAGES/rubyparser.mo
 - test/locale/ja/LC_MESSAGES/nsgettext.mo
+- test/locale/ja/LC_MESSAGES/test3.mo
 - test/locale/ja/LC_MESSAGES/test1.mo
 - test/locale/cr
 - test/locale/cr/LC_MESSAGES

data/test/po/ja/test6.po

@@ -1,23 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR ORGANIZATION
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-01-01 02:24:56+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\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: ENCODING\n"
-
-#: testlib1.rb:10
-msgid "language"
-msgstr "japanese"
-
-#: testlib1.rb:14
-msgid "one is %d."
-msgstr "ONE IS %d."