gettext 1.93.0 → 2.0.0

data/bin/rgettext

@@ -15,7 +15,7 @@ begin
 rescue LoadError
   begin
     require 'rubygems'
-    require_gem 'gettext/rgettext'
+    require 'gettext/tools/rgettext'
   rescue LoadError
     raise 'Ruby-GetText-Package are not installed.'
   end

data/bin/rmsgfmt

@@ -11,11 +11,11 @@
 =end
 
 begin
-  require 'gettext/rmsgfmt'
+  require 'gettext/tools/rmsgfmt'
 rescue LoadError
   begin
     require 'rubygems'
-    require_gem 'gettext/rmsgfmt'
+    require 'gettext/tools/rmsgfmt'
   rescue LoadError
     raise 'Ruby-GetText-Package are not installed.'
   end

data/bin/rmsgmerge

@@ -2,7 +2,7 @@
 =begin
   rmsgmerge - ruby version of msgmerge
 
-  Copyright (C) 2005  Masao Mutoh
+  Copyright (C) 2005-2009  Masao Mutoh
  
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
@@ -11,11 +11,11 @@
 =end
 
 begin
-  require 'gettext/rmsgmerge'
+  require 'gettext/tools/rmsgmerge'
 rescue LoadError
   begin
     require 'rubygems'
-    require_gem 'gettext/rmsgmerge'
+    require 'gettext/tools/rmsgmerge'
   rescue LoadError
     raise 'Ruby-GetText-Package are not installed.'
   end

data/gettext.gemspec

@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{gettext}
+  s.version = "2.0.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Masao Mutoh"]
+  s.date = %q{2009-02-06}
+  s.description = %q{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.}
+  s.email = %q{mutomasa at gmail.com}
+  s.executables = ["rgettext", "rmsgmerge", "rmsgfmt"]
+  s.extra_rdoc_files = ["lib/gettext.rb", "lib/gettext/tools.rb", "lib/gettext/core_ext/string.rb", "lib/gettext/version.rb", "README.rdoc"]
+  s.files = ["Manifest", "po/hr/rgettext.po", "po/cs/rgettext.po", 
+	"po/el/rgettext.po", "po/bs/rgettext.po", "po/et/rgettext.po", "po/vi/rgettext.po", "po/pt_BR/rgettext.po", "po/nb/rgettext.po", "po/ko/rgettext.po", "po/lv/rgettext.po", "po/ru/rgettext.po", "po/zh_TW/rgettext.po", "po/rgettext.pot", "po/ca/rgettext.po", "po/de/rgettext.po", "po/de/#rails.po#", "po/es/rgettext.po", "po/eo/rgettext.po", "po/nl/rgettext.po", "po/sr/rgettext.po", "po/hu/rgettext.po", "po/zh/rgettext.po", "po/ja/rgettext.po", "po/ja/rails.po.old", "po/bg/rgettext.po", "po/ua/rgettext.po", "po/fr/rgettext.po", "po/sv/rgettext.po", "po/it/rgettext.po", "lib/gettext.rb", "lib/gettext/cgi.rb", "lib/gettext/utils.rb", "lib/gettext/class_info.rb", "lib/gettext/tools.rb", "lib/gettext/core_ext/iconv.rb", "lib/gettext/core_ext/string.rb", "lib/gettext/poparser.rb", "lib/gettext/version.rb", "lib/gettext/mofile.rb", "lib/gettext/parser/glade.rb", "lib/gettext/parser/erb.rb", "lib/gettext/parser/ruby.rb", "lib/gettext/textdomain.rb", "lib/gettext/textdomain_manager.rb", "lib/gettext/tools/rgettext.rb", "lib/gettext/tools/rmsgmerge.rb", "lib/gettext/tools/rmsgfmt.rb", "test/test_textdomain.rb", "test/po/po/plural.po", "test/po/cr/plural.po", "test/po/sl/plural.po", "test/po/li/plural.po", "test/po/ir/plural.po", "test/po/ja/sgettext.po", "test/po/ja/test2.po", "test/po/ja/pgettext.po", "test/po/ja/test1.po", "test/po/ja/nsgettext.po", "test/po/ja/plural_error.po", "test/po/ja/plural.po", "test/po/ja/test6.po", "test/po/ja/rubyparser.po", "test/po/ja/npgettext.po", "test/po/fr/test2.po", "test/po/fr/test1.po", "test/po/fr/plural_error.po", "test/po/fr/plural.po", "test/po/fr/test6.po", "test/po/la/plural_error.po", "test/po/la/plural.po", "test/po/da/plural_error.po", "test/po/da/plural.po", "test/test_textdomain_toplevel.rb", "test/test_gettext.rb", "test/test_parser.rb", "test/README", "test/test_string.rb", "test/Rakefile", "test/test_class_info.rb", "test/test_textdomain_multi.rb", "test/testlib/simple.rb", "test/testlib/gettext.rb", "test/testlib/gladeparser.glade", "test/testlib/npgettext.rb", "test/testlib/multi_textdomain.rb", "test/testlib/erb.rhtml", "test/testlib/nsgettext.rb", "test/testlib/erb.rxml", "test/testlib/pgettext.rb", "test/testlib/helper.rb", "test/testlib/N_.rb", "test/testlib/ngettext.rb", "test/testlib/sgettext.rb", "bin/rgettext", "bin/rmsgmerge", "bin/rmsgfmt", "Rakefile", "README.rdoc", "ChangeLog", "src/poparser.ry", "samples/cgi/po/hr/main.po", "samples/cgi/po/hr/hellolib.po", "samples/cgi/po/hr/helloerb1.po", "samples/cgi/po/hr/helloerb2.po", "samples/cgi/po/cs/main.po", "samples/cgi/po/cs/hellolib.po", "samples/cgi/po/cs/helloerb1.po", "samples/cgi/po/cs/helloerb2.po", "samples/cgi/po/hellolib.pot", "samples/cgi/po/el/main.po", "samples/cgi/po/el/hellolib.po", "samples/cgi/po/el/helloerb1.po", "samples/cgi/po/el/helloerb2.po", "samples/cgi/po/bs/main.po", "samples/cgi/po/bs/hellolib.po", "samples/cgi/po/bs/helloerb1.po", "samples/cgi/po/bs/helloerb2.po", "samples/cgi/po/vi/main.po", "samples/cgi/po/vi/hellolib.po", "samples/cgi/po/vi/helloerb1.po", "samples/cgi/po/vi/helloerb2.po", "samples/cgi/po/pt_BR/main.po", "samples/cgi/po/pt_BR/hellolib.po", "samples/cgi/po/pt_BR/helloerb1.po", "samples/cgi/po/pt_BR/helloerb2.po", "samples/cgi/po/nb/main.po", "samples/cgi/po/nb/hellolib.po", "samples/cgi/po/nb/helloerb1.po", "samples/cgi/po/nb/helloerb2.po", "samples/cgi/po/ko/main.po", "samples/cgi/po/ko/hellolib.po", "samples/cgi/po/ko/helloerb1.po", "samples/cgi/po/ko/helloerb2.po", "samples/cgi/po/lv/main.po", "samples/cgi/po/lv/hellolib.po", "samples/cgi/po/lv/helloerb1.po", "samples/cgi/po/lv/helloerb2.po", "samples/cgi/po/ru/main.po", "samples/cgi/po/ru/hellolib.po", "samples/cgi/po/ru/helloerb1.po", "samples/cgi/po/ru/helloerb2.po", "samples/cgi/po/zh_TW/main.po", "samples/cgi/po/zh_TW/hellolib.po", "samples/cgi/po/zh_TW/helloerb1.po", "samples/cgi/po/zh_TW/helloerb2.po", "samples/cgi/po/ca/main.po", "samples/cgi/po/ca/hellolib.po", "samples/cgi/po/ca/helloerb1.po", "samples/cgi/po/ca/helloerb2.po", "samples/cgi/po/de/main.po", "samples/cgi/po/de/hellolib.po", "samples/cgi/po/de/helloerb1.po", "samples/cgi/po/de/helloerb2.po", "samples/cgi/po/es/main.po", "samples/cgi/po/es/hellolib.po", "samples/cgi/po/es/helloerb1.po", "samples/cgi/po/es/helloerb2.po", "samples/cgi/po/eo/main.po", "samples/cgi/po/eo/hellolib.po", "samples/cgi/po/eo/helloerb1.po", "samples/cgi/po/eo/helloerb2.po", "samples/cgi/po/nl/main.po", "samples/cgi/po/nl/hellolib.po", "samples/cgi/po/nl/helloerb1.po", "samples/cgi/po/nl/helloerb2.po", "samples/cgi/po/sr/main.po", "samples/cgi/po/sr/hellolib.po", "samples/cgi/po/sr/helloerb1.po", "samples/cgi/po/sr/helloerb2.po", "samples/cgi/po/hu/main.po", "samples/cgi/po/hu/hellolib.po", "samples/cgi/po/hu/helloerb1.po", "samples/cgi/po/hu/helloerb2.po", "samples/cgi/po/helloerb1.pot", "samples/cgi/po/helloerb2.pot", "samples/cgi/po/zh/main.po", "samples/cgi/po/zh/hellolib.po", "samples/cgi/po/zh/helloerb1.po", "samples/cgi/po/zh/helloerb2.po", "samples/cgi/po/ja/main.po", "samples/cgi/po/ja/hellolib.po", "samples/cgi/po/ja/helloerb1.po", "samples/cgi/po/ja/helloerb2.po", "samples/cgi/po/bg/main.po", "samples/cgi/po/bg/hellolib.po", "samples/cgi/po/bg/helloerb1.po", "samples/cgi/po/bg/helloerb2.po", "samples/cgi/po/main.pot", "samples/cgi/po/ua/main.po", "samples/cgi/po/ua/hellolib.po", "samples/cgi/po/ua/helloerb1.po", "samples/cgi/po/ua/helloerb2.po", "samples/cgi/po/fr/main.po", "samples/cgi/po/fr/hellolib.po", "samples/cgi/po/fr/helloerb1.po", "samples/cgi/po/fr/helloerb2.po", "samples/cgi/po/it/main.po", "samples/cgi/po/it/hellolib.po", "samples/cgi/po/it/helloerb1.po", "samples/cgi/po/it/helloerb2.po", "samples/cgi/hellolib.rb", "samples/cgi/helloerb1.cgi", "samples/cgi/cookie.cgi", "samples/cgi/README", "samples/cgi/other.rhtml", "samples/cgi/Rakefile", "samples/cgi/gettext.css", "samples/cgi/helloerb2.cgi", "samples/cgi/http.rb", "samples/cgi/helloerb.rhtml", "samples/cgi/index.cgi", "samples/po/hello_plural.pot", "samples/po/hr/hello_glade2.po", "samples/po/hr/hello_plural.po", "samples/po/hr/hello_noop.po", "samples/po/hr/hello.po", "samples/po/hr/hello2.po", "samples/po/hr/hello_tk.po", "samples/po/hr/hello_gtk.po", "samples/po/cs/hello_glade2.po", "samples/po/cs/hello_plural.po", "samples/po/cs/hello_noop.po", "samples/po/cs/hello.po", "samples/po/cs/hello2.po", "samples/po/cs/hello_tk.po", "samples/po/cs/hello_gtk.po", "samples/po/el/hello_glade2.po", "samples/po/el/hello_plural.po", "samples/po/el/hello_noop.po", "samples/po/el/hello.po", "samples/po/el/hello2.po", "samples/po/el/hello_tk.po", "samples/po/el/hello_gtk.po", "samples/po/bs/hello_glade2.po", "samples/po/bs/hello_plural.po", "samples/po/bs/hello_noop.po", "samples/po/bs/hello.po", "samples/po/bs/hello2.po", "samples/po/bs/hello_tk.po", "samples/po/bs/hello_gtk.po", "samples/po/vi/hello_glade2.po", "samples/po/vi/hello_plural.po", "samples/po/vi/hello_noop.po", "samples/po/vi/hello.po", "samples/po/vi/hello2.po", "samples/po/vi/hello_tk.po", "samples/po/vi/hello_gtk.po", "samples/po/pt_BR/hello_glade2.po", "samples/po/pt_BR/hello_plural.po", "samples/po/pt_BR/hello_noop.po", "samples/po/pt_BR/hello.po", "samples/po/pt_BR/hello2.po", "samples/po/pt_BR/hello_tk.po", "samples/po/pt_BR/hello_gtk.po", "samples/po/nb/hello_glade2.po", "samples/po/nb/hello_plural.po", "samples/po/nb/hello_noop.po", "samples/po/nb/hello.po", "samples/po/nb/hello2.po", "samples/po/nb/hello_tk.po", "samples/po/nb/hello_gtk.po", "samples/po/hello_noop.pot", "samples/po/ko/hello_glade2.po", "samples/po/ko/hello_plural.po", "samples/po/ko/hello_noop.po", "samples/po/ko/hello.po", "samples/po/ko/hello2.po", "samples/po/ko/hello_tk.po", "samples/po/ko/hello_gtk.po", "samples/po/lv/hello_glade2.po", "samples/po/lv/hello_plural.po", "samples/po/lv/hello_noop.po", "samples/po/lv/hello.po", "samples/po/lv/hello2.po", "samples/po/lv/hello_tk.po", "samples/po/lv/hello_gtk.po", "samples/po/ru/hello_glade2.po", "samples/po/ru/hello_plural.po", "samples/po/ru/hello_noop.po", "samples/po/ru/hello.po", "samples/po/ru/hello2.po", "samples/po/ru/hello_tk.po", "samples/po/ru/hello_gtk.po", "samples/po/zh_TW/hello_glade2.po", "samples/po/zh_TW/hello_plural.po", "samples/po/zh_TW/hello_noop.po", "samples/po/zh_TW/hello.po", "samples/po/zh_TW/hello2.po", "samples/po/zh_TW/hello_tk.po", "samples/po/zh_TW/hello_gtk.po", "samples/po/ca/hello_glade2.po", "samples/po/ca/hello_plural.po", "samples/po/ca/hello_noop.po", "samples/po/ca/hello.po", "samples/po/ca/hello2.po", "samples/po/ca/hello_tk.po", "samples/po/ca/hello_gtk.po", "samples/po/hello2.pot", "samples/po/de/hello_glade2.po", "samples/po/de/hello_plural.po", "samples/po/de/hello_noop.po", "samples/po/de/hello.po", "samples/po/de/hello2.po", "samples/po/de/hello_tk.po", "samples/po/de/hello_gtk.po", "samples/po/es/hello_glade2.po", "samples/po/es/hello_plural.po", "samples/po/es/hello_noop.po", "samples/po/es/hello.po", "samples/po/es/hello2.po", "samples/po/es/hello_tk.po", "samples/po/es/hello_gtk.po", "samples/po/hello_gtk.pot", "samples/po/eo/hello_glade2.po", "samples/po/eo/hello_plural.po", "samples/po/eo/hello_noop.po", "samples/po/eo/hello.po", "samples/po/eo/hello2.po", "samples/po/eo/hello_tk.po", "samples/po/eo/hello_gtk.po", "samples/po/nl/hello_glade2.po", "samples/po/nl/hello_plural.po", "samples/po/nl/hello_noop.po", "samples/po/nl/hello.po", "samples/po/nl/hello2.po", "samples/po/nl/hello_tk.po", "samples/po/nl/hello_gtk.po", "samples/po/sr/hello_glade2.po", "samples/po/sr/hello_plural.po", "samples/po/sr/hello_noop.po", "samples/po/sr/hello.po", "samples/po/sr/hello2.po", "samples/po/sr/hello_tk.po", "samples/po/sr/hello_gtk.po", "samples/po/hello.pot", "samples/po/hu/hello_glade2.po", "samples/po/hu/hello_plural.po", "samples/po/hu/hello_noop.po", "samples/po/hu/hello.po", "samples/po/hu/hello2.po", "samples/po/hu/hello_tk.po", "samples/po/hu/hello_gtk.po", "samples/po/zh/hello_glade2.po", "samples/po/zh/hello_plural.po", "samples/po/zh/hello_noop.po", "samples/po/zh/hello.po", "samples/po/zh/hello2.po", "samples/po/zh/hello_tk.po", "samples/po/zh/hello_gtk.po", "samples/po/test.rb", "samples/po/ja/hello_glade2.po", "samples/po/ja/hello_plural.po", "samples/po/ja/hello_noop.po", "samples/po/ja/hello.po", "samples/po/ja/hello2.po", "samples/po/ja/hello_tk.po", "samples/po/ja/hello_gtk.po", "samples/po/bg/hello_glade2.po", "samples/po/bg/hello_plural.po", "samples/po/bg/hello_noop.po", "samples/po/bg/hello.po", "samples/po/bg/hello2.po", "samples/po/bg/hello_tk.po", "samples/po/bg/hello_gtk.po", "samples/po/ua/hello_glade2.po", "samples/po/ua/hello_plural.po", "samples/po/ua/hello_noop.po", "samples/po/ua/hello.po", "samples/po/ua/hello2.po", "samples/po/ua/hello_tk.po", "samples/po/ua/hello_gtk.po", "samples/po/fr/hello_glade2.po", "samples/po/fr/hello_plural.po", "samples/po/fr/hello_noop.po", "samples/po/fr/hello.po", "samples/po/fr/hello2.po", "samples/po/fr/hello_tk.po", "samples/po/fr/hello_gtk.po", "samples/po/hello_tk.pot", "samples/po/sv/hello_glade2.po", "samples/po/sv/hello_plural.po", "samples/po/sv/hello_noop.po", "samples/po/sv/hello.po", "samples/po/sv/hello2.po", "samples/po/sv/hello_tk.po", "samples/po/sv/hello_gtk.po", "samples/po/hello_glade2.pot", "samples/po/it/hello_glade2.po", "samples/po/it/hello_plural.po", "samples/po/it/hello_noop.po", "samples/po/it/hello.po", "samples/po/it/hello2.po", "samples/po/it/hello_tk.po", "samples/po/it/hello_gtk.po", "samples/hello_noop.rb", "samples/hello_plural.rb", "samples/makemo.rb", "samples/hello_glade2.glade", "samples/hello.rb", "samples/hello_gtk2.rb", "samples/README", "samples/hello_glade2.rb", "samples/hello2.rb", "samples/hello_tk.rb", "gettext.gemspec"]
+  s.has_rdoc = true
+  s.homepage = %q{http://gettext.rubyforge.org/}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "GetText", "--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{gettext}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Ruby-GetText-Package is a libary and tools to localize messages.}
+  s.test_files = ["test/test_textdomain.rb", "test/test_textdomain_toplevel.rb", "test/test_gettext.rb", "test/test_parser.rb", "test/test_string.rb", "test/test_class_info.rb", "test/test_textdomain_multi.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<locale>, [">= 0"])
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<locale>, [">= 0"])
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<locale>, [">= 0"])
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
+end

data/lib/gettext.rb

@@ -1,10 +1,10 @@
 =begin
   gettext.rb - GetText module
 
-  Copyright (C) 2001-2008  Masao Mutoh
+  Copyright (C) 2001-2009  Masao Mutoh
   Copyright (C) 2001-2003  Masahiro Sakai
 
-      Masao Mutoh       <mutoh@highway.ne.jp>
+      Masao Mutoh       <mutomasa at gmail.com>
       Masahiro Sakai    <s01397ms@sfc.keio.ac.jp>
 
   You may redistribute it and/or modify it under the same
@@ -13,233 +13,90 @@
   $Id: gettext.rb,v 1.46 2008/09/13 18:23:55 mutoh Exp $
 =end
 
-require 'rbconfig'
-require 'gettext/version'
-require 'gettext/mo'
+begin gem 'locale', '>=0.9'; rescue LoadError;end
 require 'locale'
-require 'gettext/textdomainmanager'
-require 'gettext/string'
+raise "Insall locale as gem or uninstall old gettext" unless Locale.respond_to? :candidates
+
+require 'gettext/version'
+require 'gettext/textdomain_manager'
 
 module GetText
   # If the textdomain isn't bound when calling GetText.textdomain, this error is raised.
   class NoboundTextDomainError < RuntimeError
+    def initialize(domainname)
+      @domainname = domainname
+    end
+    def message
+      "#{domainname} is not bound."
+    end
   end
 
+  extend self
+
   def self.included(mod)  #:nodoc:
     mod.extend self
   end
 
-  # Max cached object_ids includes dead objects.
-  CACHE_BOUND_TARGET_MAX_SIZE = 50000 #:nodoc:
-
-  @@__cached = ! $DEBUG
-
-  # 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 cached=(val)
-    @@__cached = val
-    GetText::TextDomain.check_mo = ! val
-  end
-
-  # Return the cached value.
-  def cached?
-    @@__cached
-  end
-  
-  # Clear the cached messages.
-  def clear_cache
-    @@__cache_msgids = {}
-    @@__cache_nmsgids = {}
-    @@__cache_target_classes = {}
-    @@__cache_bound_target = {}
-    @@__cache_bound_targets = {}
-  end
-
-  @@__textdomainmanagers = {}
-
-  # call-seq:
   # bindtextdomain(domainname, options = {})
   #
-  # Bind a textdomain(%{path}/%{locale}/LC_MESSAGES/%{domainname}.mo) to your program.
-  # Normally, the texdomain scope becomes a ruby-script-file. 
-  # So you need to call this function each ruby-script-files. 
-  # On the other hand, if you call this function under GetText::Container 
-  # (gettext/container, gettext/erb, gettext/rails), the textdomain scope becomes a Class/Module.
+  # Bind a textdomain(%{path}/%{locale}/LC_MESSAGES/%{domainname}.mo) to 
+  # your program.
+  # Normally, the texdomain scope becomes the class/module(and parent 
+  # classes/included modules).
+  #
   # * domainname: the textdomain name.
   # * options: options as an Hash.
   #   * :path - the path to the mo-files. When the value is nil, it will search default paths such as 
   #     /usr/share/locale, /usr/local/share/locale)
-  #   * :locale - the locale string such as "ja_JP.UTF-8".  Generally, you should use GetText.set_locale instead.
-  #     The value is searched order by:
-  #     the value of this value > System default language.
-  #   * :charset - output charset.  This affect the current textdomain only. Generally, you should use GetText.set_output_charset instead.
-  #     The value is searched order by:
-  #     the value of Locale.set_output_charset > ENV["OUTPUT_CHARSET"] > this value > System default charset.
+  #   * :supported_language_tags - an Array of the supported language tags for this textdomain.
+  #   * :output_charset - The output charset. Same with GetText.set_output_charset. Usually, L10n
+  #     library doesn't use this option. Application may use this once.
   # * Returns: the GetText::TextDomainManager.
-  # Note: Don't use locale_, charset argument(not in options). 
-  # They are remained for backward compatibility. 
   #
-  def bindtextdomain(domainname, options = {}, locale_ = nil, charset = nil)
-    opt = {}
-    if options.kind_of? String
-      # For backward compatibility
-      opt = {:path => options, :locale => locale_, :charset => charset}
-    elsif options
-      opt = options
-    end
-    opt[:locale] = opt[:locale] ? Locale::Object.new(opt[:locale]) : Locale.get
-    opt[:charset] = TextDomainManager.output_charset if TextDomainManager.output_charset
-    opt[:locale].charset = opt[:charset] if opt[:charset]
-    Locale.set_current(opt[:locale])
-    target_key = bound_target
-    manager = @@__textdomainmanagers[target_key]
-    if manager
-      manager.set_locale(opt[:locale]) 
-    else
-      manager = TextDomainManager.new(target_key, opt[:locale])
-      @@__textdomainmanagers[target_key] = manager
-    end
-    manager.add_textdomain(domainname, opt)
-    manager
+  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, options = {}) 
-    ret = nil
-    klass.module_eval {
-      include GetText
-      ret = bindtextdomain(domainname, options)
-    }
-    ret
+  def bindtextdomain_to(klass, domainname, *args) 
+    if args[0].kind_of? Hash
+      options = args[0]
+    else
+      # for backward compatibility.
+      options = {}
+      options[:path] = args[0] if args[0]
+      options[:output_charset] = args[2] if args[2]
+    end
+    unless (klass.kind_of? GetText or klass.include? GetText)
+      klass.__send__(:include, GetText)
+    end
+    TextDomainManager.bind_to(klass, domainname, options)
   end
 
   # Binds a existed textdomain to your program. 
   # This is the same function with GetText.bindtextdomain but simpler(and faster) than bindtextdomain.
-  # Notice that you need to call GetText.bindtextdomain first. If the domainname hasn't bound yet, 
+  # Note that you need to call GetText.bindtextdomain first. If the domainname hasn't bound yet, 
   # raises GetText::NoboundTextDomainError.
   # * domainname: a textdomain name.
   # * Returns: the GetText::TextDomainManager.
-  def textdomain(domainname)
-    domain = TextDomainManager.textdomain(domainname)
-    raise NoboundTextDomainError, "#{domainname} is not bound." unless domain
-    target_key = bound_target
-    manager = @@__textdomainmanagers[target_key]
-    unless manager
-      manager = TextDomainManager.new(target_key, Locale.get)
-      @@__textdomainmanagers[target_key] = manager
-    end
-    manager.set_locale(Locale.get)
-    manager.add_textdomain(domainname)
-    manager
+  def textdomain(domainname) #:nodoc:
+    textdomain_to(self, domainname)
   end
 
   # Includes GetText module and bind an exsited textdomain to a class. 
   # See textdomain for more detail.
   # * klass: the target ruby class.
   # * domainname: the textdomain name.
-  def textdomain_to(klass, domainname) 
-    ret = nil
-    klass.module_eval {
-      include GetText
-      ret = textdomain(domainname)
-    }
-    ret
-  end
 
-  # Iterates bound textdomains.
-  # * klass: a class/module to find. Default is the class of self.
-  # * ignore_targets: Ignore tragets.
-  # * Returns: a bound GetText::TextDomain or nil.
-  def each_textdomain(klass = self, ignore_targets = []) #:nodoc:
-    bound_targets(klass).each do |target|
-      unless ignore_targets.include? target
-	manager = @@__textdomainmanagers[target]
-	if manager
-	  manager.each{ |textdomain|
-	    yield textdomain
-	  }
-	end
-      end
-    end
-    self
+  def textdomain_to(klass, domainname)  #:nodoc:
+    domain = TextDomainManager.textdomain_pool(domainname)
+    raise NoboundTextDomainError.new(domainname) unless domain
+    bindtextdomain_to(klass, domainname)
   end
 
-  @@__cache_target_classes = {}
-
-  def find_targets(klass)  #:nodoc:
-    unless (klass.kind_of? Class or klass.kind_of? Module)
-      klass = klass.class
-    end
-    id = klass.object_id
-    if cached?
-      return @@__cache_target_classes[id] if @@__cache_target_classes[id]
-    end
-
-    ret = []
-    ary = klass.name.split(/::/)
-    while(v = ary.shift)
-      if ret.size == 0
-        if v.kind_of? Class
-          target = v
-        else
-          target = eval(v)
-          return [Object] unless (target = eval(v)) # For anonymous module
-        end
-      else
-        target = ret[0].const_get(v)
-      end
-      ret.unshift(target) if target
-    end
-    @@__cache_target_classes[id] = ret.size > 0 ? ret : [klass]
-  end
-
-  @@__cache_bound_target = {}
-
-  def bound_target(klass = self) # :nodoc:
-    ret = (klass.kind_of? Module) ? klass : klass.class
-    id = ret.object_id
-    if cached?
-     tgt = @@__cache_bound_target[id]
-     return tgt if tgt
-    end
-
-    if ret.name =~ /^\#<|^$/ or ret == GetText
-       #GC for dead object_ids.
-       ret = Object
-       if @@__cache_bound_target.size > CACHE_BOUND_TARGET_MAX_SIZE
-          @@__cache_bound_target.clear
-       end
-    end
-    @@__cache_bound_target[id] = ret
-    ret
-  end
-
-  @@__cache_bound_targets = {}
-
-  def bound_targets(klass)  # :nodoc:
-    id = klass.object_id
-    if cached?
-      if @@__cache_bound_targets[id]
-        return @@__cache_bound_targets[id]
-      end
-    end
-    ret = []
-    klass = bound_target(klass)
-    ary = klass.name.split(/::/)
-    while(v = ary.shift)
-      ret.unshift(((ret.size == 0) ? eval(v) : ret[0].const_get(v)))
-    end
-    @@__cache_bound_targets[id] = ((ret + klass.ancestors + [Object]) & @@__textdomainmanagers.keys).uniq
-  end
- 
-  @@__cache_msgids = {}
-
   # call-seq:
   #   gettext(msgid)
   #   _(msgid)
@@ -261,7 +118,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)
-    sgettext(msgid, nil)
+    TextDomainManager.get(self).translate_singluar_message(self, msgid)
   end
 
   # call-seq:
@@ -272,36 +129,13 @@ module GetText
   # it returns a last part of msgid separeted "div".
   #
   # * msgid: the message id.
-  # * div: separator or nil.
+  # * separator: separator or nil for no seperation.
   # * Returns: the localized text by msgid. If there are no localized text, 
-  #   it returns a last part of msgid separeted "div".
+  #   it returns a last part of the msgid separeted by "seperator".
+  #   <tt>Movie|Location -> Location</tt>
   # See: http://www.gnu.org/software/gettext/manual/html_mono/gettext.html#SEC151
-  def sgettext(msgid, div = '|')
-    cached_key = [bound_target, Locale.current, msgid]
-    if cached?
-      if @@__cache_msgids[cached_key]
-        return @@__cache_msgids[cached_key]
-      end
-    end
-    msg = nil
-
-    # Use "for"(not "each") to support JRuby 1.1.0.
-    for target in bound_targets(self)
-      manager = @@__textdomainmanagers[target]
-      for textdomain in manager.textdomains
-        msg = textdomain[1].gettext(msgid)
-        break if msg
-      end
-      break if msg
-    end
-
-    msg ||= msgid
-    if div and msg == msgid
-      if index = msg.rindex(div)
-	msg = msg[(index + 1)..-1]
-      end
-    end
-    @@__cache_msgids[cached_key] = msg
+  def sgettext(msgid, seperator = "|")
+    TextDomainManager.get(self).translate_singluar_message(self, msgid, seperator)
   end
 
   # call-seq:
@@ -318,11 +152,9 @@ module GetText
   #   it returns msgid.
   # See: http://www.gnu.org/software/autoconf/manual/gettext/Contexts.html
   def pgettext(msgctxt, msgid)
-    sgettext(msgctxt + "\004" + msgid, "\004")
+    TextDomainManager.get(self).translate_singluar_message(self, "#{msgctxt}\004#{msgid}", "\004")
   end
 
-  @@__cache_nmsgids = {}
-
   # call-seq:
   #   ngettext(msgid, msgid_plural, n)
   #   ngettext(msgids, n)  # msgids = [msgid, msgid_plural]
@@ -337,8 +169,27 @@ module GetText
   # * n: a number used to determine the plural form.
   # * 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(arg1, arg2, arg3 = nil)
-    nsgettext(arg1, arg2, arg3, nil)
+  def ngettext(msgid, msgid_plural, n = nil)
+    TextDomainManager.get(self).translate_plural_message(self, msgid, msgid_plural, n)
+  end
+
+  # call-seq:
+  #   nsgettext(msgid, msgid_plural, n, div = "|")
+  #   nsgettext(msgids, n, div = "|")  # msgids = [msgid, msgid_plural]
+  #   ns_(msgid, msgid_plural, n, div = "|")
+  #   ns_(msgids, n, div = "|")  # msgids = [msgid, msgid_plural]
+  #
+  # The nsgettext is similar to the ngettext.
+  # But if there are no localized text, 
+  # it returns a last part of msgid separeted "div".
+  #
+  # * msgid: the singular form with "div". (e.g. "Special|An apple")
+  # * msgid_plural: the plural form. (e.g. "%{num} Apples")
+  # * n: a number used to determine the plural form.
+  # * 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)
   end
 
   # call-seq:
@@ -355,29 +206,32 @@ module GetText
   # * n: a number used to determine the plural form.
   # * 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 npgettext(msgctxt, arg1, arg2 = nil, arg3 = nil)
-    if arg1.kind_of?(Array)
-      msgid = arg1[0]
+  def npgettext(msgctxt, msgids, arg2 = nil, arg3 = nil)
+     if msgids.kind_of?(Array)
+      msgid = msgids[0]
       msgid_ctxt = "#{msgctxt}\004#{msgid}"
-      msgid_plural = arg1[1]
+      msgid_plural = msgids[1]
       opt1 = arg2
       opt2 = arg3
     else
-      msgid = arg1
+      msgid = msgids
       msgid_ctxt = "#{msgctxt}\004#{msgid}"
       msgid_plural = arg2
       opt1 = arg3
       opt2 = nil
     end
-    ret = nsgettext(msgid_ctxt, msgid_plural, opt1, opt2)
     
-    if ret == msgid_ctxt
-      ret = msgid
+    msgstr = TextDomainManager.get(self).translate_plural_message(self, msgid_ctxt, msgid_plural, opt1, opt2)
+    if msgstr == msgid_ctxt
+      msgid
+    else
+      msgstr
     end
-    ret
   end
-
-  # This function does nothing. But it is required in order to recognize the msgid by rgettext.
+  
+  # makes dynamic translation messages readable for the gettext parser.
+  # <tt>_(fruit)</tt> cannot be understood by the gettext parser. To help the parser find all your translations,
+  # you can add <tt>fruit = N_("Apple")</tt> which does not translate, but tells the parser: "Apple" needs translation.
   # * msgid: the message id.
   # * Returns: msgid.
   def N_(msgid)
@@ -392,230 +246,46 @@ module GetText
     [msgid, msgid_plural]
   end
 
-
-  # call-seq:
-  #   nsgettext(msgid, msgid_plural, n, div = "|")
-  #   nsgettext(msgids, n, div = "|")  # msgids = [msgid, msgid_plural]
-  #   n_(msgid, msgid_plural, n, div = "|")
-  #   n_(msgids, n, div = "|")  # msgids = [msgid, msgid_plural]
-  #
-  # The nsgettext is similar to the ngettext.
-  # But if there are no localized text, 
-  # it returns a last part of msgid separeted "div".
-  #
-  # * msgid: the singular form with "div". (e.g. "Special|An apple")
-  # * msgid_plural: the plural form. (e.g. "%{num} Apples")
-  # * n: a number used to determine the plural form.
-  # * 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(arg1, arg2, arg3 = "|", arg4 = "|")
-    if arg1.kind_of?(Array)
-      msgid = arg1[0]
-      msgid_plural = arg1[1]
-      n = arg2
-      if arg3 and arg3.kind_of? Numeric
-        raise ArgumentError, _("3rd parmeter is wrong: value = %{number}") % {:number => arg3}
-      end
-      div = arg3
-    else
-      msgid = arg1
-      msgid_plural = arg2
-      n = arg3
-      div = arg4
-    end
-
-    cached_key = [bound_target, Locale.current, msgid + "\000" + msgid_plural]
-    msgs = nil
-    if @@__cached
-      if @@__cache_nmsgids.has_key?(cached_key)
-        msgs = @@__cache_nmsgids[cached_key]  # [msgstr, cond_as_string]
-      end
-    end
-    unless msgs
-      # Use "for"(not "each") to support JRuby 1.1.0.
-      for target in bound_targets(self)
-        manager = @@__textdomainmanagers[target]
-        for textdomain in manager.textdomains
-          msgs = textdomain[1].ngettext_data(msgid, msgid_plural)
-          break if msgs
-        end
-        break if msgs
-      end
-      msgs = [[msgid, msgid_plural], "n != 1"] unless msgs
-      @@__cache_nmsgids[cached_key] = msgs
-    end
-    msgstrs = msgs[0]
-    if div and msgstrs[0] == msgid
-      if index = msgstrs[0].rindex(div)
-	msgstrs[0] = msgstrs[0][(index + 1)..-1]
-      end
-    end
-    plural = eval(msgs[1])
-    if plural.kind_of?(Numeric)
-      ret = msgstrs[plural]
-    else
-      ret = plural ? msgstrs[1] : msgstrs[0]
-    end
-    ret
-  end
-
-  # Sets the current locale to the current class/module
-  #
-  # Notice that you shouldn't use this for your own Libraries.
-  # * locale: a locale string or Locale::Object.
-  # * this_target_only: true if you want to change the current class/module only.
-  # Otherwise, this changes the locale of the current class/module and its ancestors.
-  # Default is false.
-  # * Returns: self
-  def set_locale(locale, this_target_only = false)
-    ret = nil
-    if locale
-      if locale.kind_of? Locale::Object
-	ret = locale
-      else
-	ret = Locale::Object.new(locale.to_s)
-      end
-      ret.charset = TextDomainManager.output_charset if TextDomainManager.output_charset
-      Locale.set(ret)
-    else
-      Locale.set(nil)
-      ret = Locale.get
-    end
-    if this_target_only
-      manager = @@__textdomainmanagers[bound_target]
-      if manager
-	manager.set_locale(ret, ! cached?)
-      end
-    else
-      each_textdomain {|textdomain|
-        textdomain.set_locale(ret, ! cached?)
-      }
-    end
-    self
-  end
-
-  # Sets current locale to the all textdomains.
-  #
-  # Note that you shouldn't use this for your own Libraries.
-  # * locale: a locale string or Locale::Object, otherwise nil to use default locale.
-  # * Returns: self
-  def set_locale_all(locale)
-    ret = nil
-    if locale
-      if locale.kind_of? Locale::Object
-	ret = locale
-      else
-	ret = Locale::Object.new(locale.to_s)
-      end
-    else
-      ret = Locale.default
-    end
-    ret.charset = TextDomainManager.output_charset if TextDomainManager.output_charset
-    Locale.set_current(ret)
-    TextDomainManager.each_all {|textdomain|
-      textdomain.set_locale(ret, ! cached?)
-    }
-    self
-  end
-
-  # Sets the default/current locale. This method haves the strongest infulence.
-  # All of the Textdomains are set the new locale. 
-  #
-  # Note that you shouldn't use this for your own Libraries.
-  # * locale: a locale string or Locale::Object
-  # * Returns: a locale string
-  def locale=(locale)
-    Locale.default = locale
-    set_locale_all(locale)
-    Locale.default
-  end
-
   # Sets charset(String) such as "euc-jp", "sjis", "CP932", "utf-8", ... 
   # You shouldn't use this in your own Libraries.
   # * charset: an output_charset
-  # * Returns: charset
+  # * Returns: self
   def set_output_charset(charset)
     TextDomainManager.output_charset = charset
     self
   end
 
-  # Same as GetText.set_output_charset
-  # * charset: an output_charset
-  # * Returns: charset
-  def output_charset=(charset)
-    TextDomainManager.output_charset = charset
-  end
-
   # Gets the current output_charset which is set using GetText.set_output_charset.
   # * Returns: output_charset.
   def output_charset
-    TextDomainManager.output_charset || locale.charset
+    TextDomainManager.output_charset
   end
 
-  # Gets the current locale.
-  # * Returns: a current Locale::Object
-  def locale
-    Locale.current
-  end
-
-  # Add default locale path.
-  # * path: a new locale path. (e.g.) "/usr/share/locale/%{locale}/LC_MESSAGES/%{name}.mo"
-  #   ('locale' => "ja_JP", 'name' => "textdomain")
-  # * Returns: the new DEFAULT_LOCALE_PATHS
-  def add_default_locale_path(path)
-    TextDomain.add_default_locale_path(path)
+  def set_locale(lang)
+    Locale.clear
+    Locale.current = lang
   end
 
-  # Show the current textdomain information. This function is for debugging.
-  # * options: options as a Hash.
-  #   * :with_messages - show informations with messages of the current mo file. Default is false.
-  #   * :out - An output target. Default is STDOUT.
-  #   * :with_paths - show the load paths for mo-files.
-  def current_textdomain_info(options = {})
-    opts = {:with_messages => false, :with_paths => false, :out => STDOUT}.merge(options)
-    ret = nil
-    each_textdomain {|textdomain|
-      opts[:out].puts "TextDomain name: \"#{textdomain.name}\""
-      opts[:out].puts "TextDomain current locale: \"#{textdomain.current_locale}\""
-      opts[:out].puts "TextDomain current mo filename: \"#{textdomain.current_mo.filename}\""
-      if opts[:with_paths]
-	opts[:out].puts "TextDomain locale file paths:"
-	textdomain.locale_paths.each do |v|
-	  opts[:out].puts "  #{v}"
-	end
-      end
-      if opts[:with_messages]
-	opts[:out].puts "The messages in the mo file:"
-	textdomain.current_mo.each{|k, v|
-	  opts[:out].puts "  \"#{k}\": \"#{v}\""
-	}
-      end
-    }
-  end
-
-  # for testing.
-  def remove_all_textdomains
-    clear_cache
-    @@__textdomainmanagers = {}
+  def locale
+    Locale.current[0]
   end
 
-  alias :setlocale :locale= #:nodoc:
+  alias :locale= :set_locale #:nodoc:
   alias :_ :gettext   #:nodoc:
   alias :n_ :ngettext #:nodoc:
   alias :s_ :sgettext #:nodoc:
   alias :ns_ :nsgettext #:nodoc:
   alias :np_ :npgettext #:nodoc:
 
-unless defined? "XX"
+  alias :output_charset= :set_output_charset #:nodoc:
+
+unless defined? XX
   # This is the workaround to conflict p_ methods with the xx("double x") library.
   # http://rubyforge.org/projects/codeforpeople/
   alias :p_ :pgettext #:nodoc:
-  module_function :p_
 end
 
-  module_function :bindtextdomain, :textdomain, :each_textdomain, :cached=, :cached?, :clear_cache, 
-  :N_, :gettext, :_, :ngettext, :n_, :sgettext, :s_, :nsgettext, :ns_, :pgettext, :npgettext, :np_,
-  :bound_target, :bound_targets, :find_targets,
-  :setlocale, :set_locale, :locale=, :set_locale_all, :locale, 
-  :set_output_charset, :output_charset=, :output_charset, :current_textdomain_info, :remove_all_textdomains 
+  # for backward compatibility
+  alias :set_locale_all :set_locale #:nodoc:
+  alias :setlocale :set_locale #:nodoc:
 end