gettext 1.5.0 → 1.6.0

data/ChangeLog

@@ -1,3 +1,116 @@
+2006-06-09  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/*.rb, samples/po/*: Code cleanup 2. 
+
+2006-06-08  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/version.rb: Increment minor version.
+	* lib/gettext/locale_posix.rb: Code cleanup.
+	* test/testlib5.rb: Added.
+
+2006-06-07  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext.rb: GetText.set_locale accept 2nd parameter.
+	* test/testlib6.rb, test/po/{ja|fr}/test6.po: Added previous test.
+	* samples/*.rb, samples/po/*: Code cleanup. 
+
+2006-06-05  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/hello.rb: Code cleanup.
+	* lib/gettext/rgettext.rb: Show ruby version with -v option.
+	* lib/gettext/rmsgfmt.rb: ditto.
+	* lib/gettext/rmsgmerge.rb: ditto.
+
+2006-06-04  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext.rb: Fixed a bug when options is set nil.
+	* lib/gettext/locale_posix.rb: Fixed the search order of environment
+	variables. Reported by markus koller.
+	* ext/gettext/locale_system.c: Returns nil if locale is not set.
+	* Rakefile: Added makemo task for samples/rails/vendor/plugins/gettext/po.
+	* test/gettext_test_multi_textdomain.rb: Added.
+
+2006-05-31  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/rails/vendor/plugins/gettext/lib/gettext_plugin.rb: Rewrite
+	to support new bindtextdomain.
+	* samples/rails/vendor/plugins/gettext/{po|locale}/*: Move gettext_plugin.{po|mo}
+	from samples/rails/{po|locale}/*. Now Rails plugins can release their po/mo-files
+	under their own directory(/vendor/plugins/plugindir/{po|locale}).
+	* samples/rails/vendor/plugins/gettext/Rakefile, README: Added.
+	* samples/rails/lib/tasks/gettext.rake. Move gettext_plugin target to 
+	/vendor/plugins/gettext/Rakefile.
+	* samples/rails/README: Updated.
+
+2006-05-30  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext.rb: The scope of a textdomain becomes a class/module base
+	  instead of a file base.
+	  Accept plural textdomains in a class/module.
+  	  Changed bindtextdomain arguments with backward compatibility.
+	* lib/gettext/textdomainmanager.rb: Added for manage plural textdomains.
+	* lib/gettext/textdomain.rb: Fix wrong DEFAULT_LOCALE_PATHS if ruby is 
+	  installed non-standard path.
+	* lib/gettext/rails.rb: Changed arguments of bindtextdomain, init_gettext 
+	  with backward compatibility.
+
+2006-05-29  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: 
+	Remove GetText::Rails.use_localized_templates.
+
+2006-05-24  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/locale_win32.rb: Fix to work with environment 
+	variables.
+
+2006-05-22  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext.rb, lib/gettext/textdomain.rb: Keep a textdomain 
+	per a class instead of per a file.
+
+2006-05-21  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Problem when ActionMailer isn't defined.
+	Reported by Gudao Luo.
+
+2006-05-20  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/mo.rb: Improved to compare the file time stamps. 
+	by Nobu Nakada.
+	
+2006-05-18  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/mo.rb: Fix MOFile#update! works on MS Windows.
+	* po/it/rails.po, samples/rails/po/it/*.po: Added by Marco Lazzeri. 
+
+2006-05-16  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* Rakefile: Remove dependency - makemo => poparser.
+	Reported by Marco Lazzeri.
+
+2006-05-14  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* README: Updated.
+	* **/po/zh/*.po: Added zh_CN locale by Yingfeng.
+	* pre-setup.rb: Remove to call "rails setup" now needless.
+	Reported by Hiroyuki Iwatsuki.
+
+2006-05-11  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* Rakefile: Make samples/rails/log if it's not exisited in
+	makemo task.
+	* lib/gettext/parser/activerecord.rb: Fixed to work
+	Gem-less environment.
+	Reported by Nobuhiro IMAI.
+
+2006-05-10  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Fixed custom messages was not
+	translated of validation_length_of.
+	Reported by babie, charlie.
+	* po/ja/rails.po: Separate plural/single messages.
+
 2006-05-07  Masao Mutoh  <mutoh@highway.ne.jp>
 
 	* lib/gettext/version.rb: Increment revision number.

data/NEWS

@@ -1,10 +1,26 @@
+= Ruby-GetText-Package-1.6.0 (2006-06-09)
+
+ * Support Chinese(zh_CN), Italian(it).
+ * Improve the way to manage textdomains.
+    * A class/module can have plural textdomains.
+    * A textdomain belong to a class/module.
+    * A class/module can have plural textdomains.
+    * A message is looked up in its class/module and ancestors.
+
+      You don't need to call bindtextdomain in each files.
+      # A textdomain belong to a file in previous version.
+      # And a message is looked up in the file which called 
+      # GetText functions only.
+ * Fix bugs
+ * Samples are cleaned up.
+
 = Ruby-GetText-Package-1.5.0 (2006-05-07)
 
  * Support Russian.
  * Fix bugs.
  * Refresh mo option was added.
    Check mo files and reload it if it's updated.
-   ruby -d or GetText::TextDomain#check_mo=(true).
+   ruby -d or GetText::TextDomain.check_mo=(true).
    Or development mode in Ruby on Rails.
 
 = Ruby-GetText-Package-1.4.0 (2006-04-15)

data/README

@@ -25,12 +25,16 @@ Ruby-Gettext-Package
   * rmsgfmt creates a mo-file from a po-file.
     The mo-file is compatible to GNU gettext(msgfmt).
 
-  * 2 kind of textdomain's scope
-    * A file base (default: recommanded)
-    * A Class/Module base 
-      (GetText::Container, GetText::ErbContainer, GetText::Rails)
+  * textdomain's scope is adapt to ruby class/module mechanism.
+    * A class/module can have plural textdomains.
+    * a message is looked up in its class/module and ancestors.
+
+  * Locale is retrieved from System variables (ENV['LANG'], POSIX, Win32)
 
   * CGI support (gettext/cgi)
+    * Locale is retrieved from client informations
+      (HTTP_ACCEPT_LANGUAGE, HTTP_ACCEPT_CHARSET, QUERY_STRING(lang), 
+	Cookies(lang)).
 
   * ERB support (gettext/erb)
 
@@ -49,17 +53,20 @@ Requirements
   * Racc-1.4.3 or later
     <http://www.ruby-lang.org/raa/list.rhtml?name=racc>
     (for compiling src/rmsgfmt.ry only)
-  * Ruby on Rails 1.0.0 or later (if you use this package with Ruby on Rails)
+  * Ruby on Rails 1.1.2 or later (if you use this package with Ruby on Rails)
     <http://www.rubyonrails.org/>
 
 Install
 -------
+  gem:
+    ($ su)
+     # gem install gettext
 
-  De-Compress archive and enter its top directory.
-  Then type:
-
-   ($ su)
-    # ruby setup.rb
+  tar-ball:
+    De-Compress archive and enter its top directory.
+    Then type:
+    ($ su)
+     # ruby setup.rb
 
   You can also install files in your favor directory by
   supplying setup.rb some options. Try "ruby setup.rb --help".
@@ -80,59 +87,62 @@ License
   (See the file 'COPYING'.)
 
 * mo.rb
-  Copyright (C) 2001-2004 Masao Mutoh <mutoh@highwhay.ne.jp>
-  Copyright (C) 2001,2002 Masahiro Sakai <s01397ms@sfc.keio.ac.jp>
+  Copyright (C) 2001-2006 Masao Mutoh <mutoh at highwhay.ne.jp>
+  Copyright (C) 2001,2002 Masahiro Sakai <s01397ms at sfc.keio.ac.jp>
 
 * gettext.rb
-  Copyright (C) 2001-2005 Masao Mutoh <mutoh@highwhay.ne.jp>
-  Copyright (C) 2001,2002 Masahiro Sakai <s01397ms@sfc.keio.ac.jp>
+  Copyright (C) 2001-2006 Masao Mutoh <mutoh at highwhay.ne.jp>
+  Copyright (C) 2001,2002 Masahiro Sakai <s01397ms at sfc.keio.ac.jp>
 
 * rgettext 
-  Copyright (C) 2001-2005 Masao Mutoh <mutoh@highwhay.ne.jp>
-  Copyright (C) 2001,2002 Yasushi Shoji <yashi@yashi.com>
+  Copyright (C) 2001-2006 Masao Mutoh <mutoh at highwhay.ne.jp>
+  Copyright (C) 2001,2002 Yasushi Shoji <yashi at yashi.com>
 
 * setup.rb
-  Copyright (C) 2000-2005 Minero Aoki <aamine@loveruby.net>
+  Copyright (C) 2000-2005 Minero Aoki <aamine at loveruby.net>
   This file is released under LGPL. See the top of the install.rb.
 
 * Others
-  Copyright (C) 2001-2006 Masao Mutoh <mutoh@highwhay.ne.jp>
+  Copyright (C) 2001-2006 Masao Mutoh <mutoh at highwhay.ne.jp>
 
 
 Translators
 -----------
-Czech(cs)                 - Karel Miarka <kajism at yahoo.com>
-Dutch(nl)                 - Menno Jonkers <ruby-gettext at jonkers.com>
-French(fr)                - Laurent Sansonetti <laurent.sansonetti at gmail.com>
-German(de)                - Detlef Reichl <detlef.reichl at gmx.org>
-                            Sven Herzberg <herzi at abi02.de>
-                            Sascha Ebach <se at digitale-wertschoepfung.de>
-Greek(el)                 - Damphyr <damphyr at gmx.net>
-Italian(it)               - Gabriele Renzi <surrender_it at yahoo.it>
-Japanese(ja)              - Masao Mutoh <mutoh at highway.ne.jp>
-Korean(ko)                - Gyoung-Yoon Noh <nohmad at gmail.com>
-Portuguese(Brazil)(pt_BR) - Joao Pedrosa <joaopedrosa at gmail.com>
-Russian(ru)               - Yuri Kozlov <kozlov.y at gmail.com>
-Spanish(es)               - David Espada <davinci at escomposlinux.org> (current)
-                            David Moreno Garza <damog at damog.net>
-Swedish(sv)               - Nikolai Weibull <mailing-lists.ruby-talk at rawuncut.elitemail.org>
+Chinese(Simplified)(zh_CN) - Yingfeng <blogyingfeng at gmail.com>
+Czech(cs)                  - Karel Miarka <kajism at yahoo.com>
+Dutch(nl)                  - Menno Jonkers <ruby-gettext at jonkers.com>
+French(fr)                 - Laurent Sansonetti <laurent.sansonetti at gmail.com>
+German(de)                 - Detlef Reichl <detlef.reichl at gmx.org>
+                             Sven Herzberg <herzi at abi02.de>
+                             Sascha Ebach <se at digitale-wertschoepfung.de>
+Greek(el)                  - Damphyr <damphyr at gmx.net>
+Italian(it)                - Marco Lazzeri <marco.lazzeri at gmail.com>
+                             Gabriele Renzi <surrender_it at yahoo.it>
+Japanese(ja)               - Masao Mutoh <mutoh at highway.ne.jp>
+Korean(ko)                 - Gyoung-Yoon Noh <nohmad at gmail.com>
+Portuguese(Brazil)(pt_BR)  - Joao Pedrosa <joaopedrosa at gmail.com>
+Russian(ru)                - Yuri Kozlov <kozlov.y at gmail.com>
+Spanish(es)                - David Espada <davinci at escomposlinux.org> (current)
+                             David Moreno Garza <damog at damog.net>
+Swedish(sv)                - Nikolai Weibull <mailing-lists.ruby-talk at rawuncut.elitemail.org>
 
 Status of translations
 ----------------------
-Czech(cs)                 - 1.5.0
-Dutch(nl)                 - 1.5.0
-English(default)          - 1.5.0
-French(fr)                - 1.5.0
-German(de)                - 1.5.0
-Greek(el)                 - 1.5.0
-Spanish(es)               - 1.5.0
-Italian(it)               - 1.0.0 (old)
-Japanese(ja)              - 1.5.0
-Korean(ko)                - 1.5.0
-Portuguese(Brazil)(pt_BR) - 1.5.0
-Russian(ru)               - 1.5.0
+Chinese(zh)               - 1.6.0
+Czech(cs)                 - 1.6.0
+Dutch(nl)                 - 1.6.0
+English(default)          - 1.6.0
+French(fr)                - 1.6.0
+German(de)                - 1.6.0
+Greek(el)                 - 1.6.0
+Spanish(es)               - 1.6.0
+Italian(it)               - 1.6.0
+Japanese(ja)              - 1.6.0
+Korean(ko)                - 1.6.0
+Portuguese(Brazil)(pt_BR) - 1.6.0
+Russian(ru)               - 1.6.0
 Swedish(sv)               - 0.8.0 (old)
 
 Maintainer
 ----------
-  Masao Mutoh <mutoh@highway.ne.jp>
+  Masao Mutoh <mutoh at highway.ne.jp>

data/Rakefile

@@ -81,9 +81,11 @@ task :makemo_test do
 end
 
 desc "Create *.mo from *.po"
-task :makemo => [:poparser, :makemo_test] do
+task :makemo => [:makemo_test] do
   $stderr.puts "Create rgettext/rmsgfmt mo files."
-  GetText.create_mofiles(true)
+  mkdir_p "samples/rails/log" unless FileTest.exist? "samples/rails/log"
+
+  GetText.create_mofiles(false)
 
   $stderr.puts "Create samples mo files."
   GetText.create_mofiles(false, "samples/po", "samples/locale")
@@ -94,6 +96,8 @@ task :makemo => [:poparser, :makemo_test] do
   $stderr.puts "Create samples/rails mo files."
   GetText.create_mofiles(false, "samples/rails/po", "samples/rails/locale")
 
+  $stderr.puts "Create samples/rails plugin mo files."
+  GetText.create_mofiles(false, "samples/rails/vendor/plugins/gettext/po", "samples/rails/vendor/plugins/gettext/locale")
 end
 
 desc "Update pot/po files to match new version."

data/ext/gettext/locale_system.c

@@ -5,7 +5,7 @@
  * You may redistribute it and/or modify it under the same
  * license terms as Ruby.
  * 
- * $Id: locale_system.c,v 1.5 2006/04/15 03:58:52 mutoh Exp $
+ * $Id: locale_system.c,v 1.6 2006/06/04 14:43:37 mutoh Exp $
  */
 
 #include "ruby.h"
@@ -39,9 +39,9 @@ gt_setlocale(self, type, locale)
 # if defined HAVE_SETLOCALE
     char* ret = setlocale(NUM2INT(type), 
 			  NIL_P(locale) ? NULL : StringValuePtr(locale));
-    return ret == NULL ? rb_str_new2("C") : rb_str_new2(ret);
+    return ret == NULL ? Qnil : rb_str_new2(ret);
 # else
-    return rb_str_new2("C");
+    return Qnil;
 # endif
 }
 

data/lib/gettext.rb

@@ -1,7 +1,7 @@
 =begin
   gettext.rb - GetText module
 
-  Copyright (C) 2001-2005  Masao Mutoh
+  Copyright (C) 2001-2006  Masao Mutoh
   Copyright (C) 2001-2003  Masahiro Sakai
 
       Masao Mutoh       <mutoh@highway.ne.jp>
@@ -10,14 +10,14 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: gettext.rb,v 1.11 2006/03/15 16:34:05 mutoh Exp $
+  $Id: gettext.rb,v 1.14 2006/06/07 15:56:04 mutoh Exp $
 =end
 
 require 'rbconfig'
 require 'gettext/version'
 require 'gettext/mo'
 require 'gettext/locale'
-require 'gettext/textdomain'
+require 'gettext/textdomainmanager'
 require 'gettext/string'
 
 module GetText
@@ -25,10 +25,11 @@ module GetText
   class NoboundTextDomainError < RuntimeError
   end
 
-  @@__textdomain = Hash.new
-  @@__textdomain_key = Hash.new
+  def self.included(mod)  #:nodoc:
+    mod.extend self
+  end
 
-  @@__output_charset = nil
+  @@__textdomainmanagers = Hash.new
 
   # Bind a textdomain(%{path}/%{locale}/LC_MESSAGES/%{domainname}.mo) to your program.
   # Normally, the texdomain scope becomes a ruby-script-file. 
@@ -37,47 +38,44 @@ module GetText
   #(gettext/container, gettext/erb, gettext/rails), the textdomain scope becomes a Class/Module.
   #
   # * domainname: the textdomain name.
-  # * 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:
+  # * 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.
+  #     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:
+  #   * :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.
+  #     the value of Locale.set_output_charset > ENV["OUTPUT_CHARSET"] > this value > System default charset.
   # * Returns: the GetText::TextDomain.
   #
-  def bindtextdomain(domainname, path = nil, locale_ = nil, charset = nil)
-    locale = locale_ ? Locale::Object.new(locale_) : Locale.get
-    if @@__output_charset
-      # Set global setting forcely.
-      charset = @@__output_charset
-    else
-      charset = ENV["OUTPUT_CHARSET"] if ENV["OUTPUT_CHARSET"]
-      @@__output_charset = charset
-    end
-    locale.charset = charset if charset
-    Locale.set_current(locale)
-
-    src = callersrc
-    $stderr.print "bind the domain '#{domainname}' to '#{src}'. locale is #{locale.inspect}\n" if $DEBUG
-    textdomain = @@__textdomain[src]
-    unless textdomain
-      textdomain = @@__textdomain_key[domainname]
-      @@__textdomain[src] = textdomain
+  # 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
-
-    textdomain.set_locale(locale) if textdomain
-
-    if ! textdomain or ! textdomain.same_property?(domainname, path, locale)
-      textdomain = TextDomain.new(domainname, path, locale)
-      @@__textdomain_key[domainname] = textdomain
-      @@__textdomain[src] = textdomain
+    opt[:locale] = opt[:locale] ? Locale::Object.new(opt[:locale]) : Locale.get
+    opt[:charset] = output_charset if output_charset
+    locale.charset = opt[:charset] if opt[:charset]
+    Locale.set_current(opt[:locale])
+    manager = @@__textdomainmanagers[bound_target]
+    if manager
+      manager.set_locale(opt[:locale]) 
+    else
+      manager = TextDomainManager.new(bound_target, opt[:locale])
+      @@__textdomainmanagers[bound_target] = manager
     end
-    @@__textdomain[src]
+    manager.add_textdomain(domainname, opt)
+    manager
   end
 
   # Binds a existed textdomain to your program. 
@@ -87,13 +85,49 @@ module GetText
   # * domainname: a textdomain name.
   # * Returns: the GetText::TextDomain.
   def textdomain(domainname)
-    src = callersrc
-    textdomain = @@__textdomain_key[domainname]
-    raise NoboundTextDomainError, "#{domainname} is not bound." unless textdomain
-    textdomain.set_locale(Locale.current)
-    @@__textdomain[src] = textdomain
-    $stderr.print "Use the domain '#{domainname}' to '#{src}'. locale is #{textdomain.current_locale.inspect}\n" if $DEBUG
-    @@__textdomain[src]
+    domain = TextDomainManager.textdomain(domainname)
+    raise NoboundTextDomainError, "#{domainname} is not bound." unless domain
+    manager = @@__textdomainmanagers[bound_target]
+    unless manager
+      manager = TextDomainManager.new(bound_target, Locale.get)
+      @@__textdomainmanagers[bound_target] = manager
+    end
+    manager.add_textdomain(domainname)
+    manager.set_locale(Locale.get)
+  end
+
+  TARGET_REGEXP = /\:\:/  # :nodoc:
+
+  # 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 = bound_target, ignore_targets = [])
+    (klass.ancestors + [GetText]).each do |target|
+      unless ignore_targets.include? target
+	ignore_targets << target
+	manager = @@__textdomainmanagers[target]
+	if manager
+	  manager.each{ |textdomain|
+	    yield textdomain
+	  }
+	end
+	if target.to_s =~ TARGET_REGEXP
+	  each_textdomain(Module.const_get($`), ignore_targets){|domain|
+	    yield domain
+	  }
+	end
+      end
+    end
+    self
+  end
+
+  def bound_target # :nodoc:
+    if self.kind_of? Class or self.kind_of? Module
+      self
+    else
+      self.class
+    end
   end
 
   # call-seq:
@@ -104,8 +138,12 @@ 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)
-    textdomain = @@__textdomain[callersrc]
-    textdomain ? textdomain.gettext(msgid) : msgid
+    ret = nil
+    each_textdomain {|textdomain|
+      ret = textdomain.gettext(msgid)
+      break if ret
+    }
+    ret ? ret : msgid
   end
   
   # call-seq:
@@ -132,8 +170,12 @@ module GetText
       msgid_plural = arg2
       n = arg3
     end
-    textdomain = @@__textdomain[callersrc]
-    textdomain.ngettext(msgid, msgid_plural, n)
+    ret = nil
+    each_textdomain {|textdomain|
+      ret = textdomain.ngettext(msgid, msgid_plural, n)
+      break if ret
+    }
+    ret ? ret : (n == 1 ? msgid : msgid_plural)
   end
 
   # This function does nothing. But it is required in order to recognize the msgid by rgettext.
@@ -164,12 +206,7 @@ module GetText
   #   it returns a last part of msgid separeted "div".
   # See: http://www.gnu.org/software/gettext/manual/html_mono/gettext.html#SEC151
   def sgettext(msgid, div = '|')
-    textdomain = @@__textdomain[callersrc]
-    if textdomain
-      msg = textdomain.gettext(msgid)
-    else
-      msg = msgid
-    end
+    msg = gettext(msgid)
     if msg == msgid
       if index = msg.rindex(div)
 	msg = msg[(index + 1)..-1]
@@ -178,32 +215,63 @@ module GetText
     msg
   end
 
-  def callersrc # :nodoc:
-    caller(2)[0].sub(/:\d+(?::in \`\S+\')?\Z/, '')
+  # Sets 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 = output_charset if output_charset
+      Locale.set(ret)
+    else
+      Locale.clear
+      ret = Locale.get
+    end
+    if this_target_only
+      manager = @@__textdomainmanagers[bound_target]
+      if manager
+	manager.set_locale(ret)
+      end
+    else
+      each_textdomain {|textdomain|
+	textdomain.set_locale(ret)
+      }
+    end
+    self
   end
 
-  # Sets locale such as "de", "fr", "it", "ko", "ja_JP.eucJP", "zh_CN.EUC" ... 
+  # Sets locale to the all textdomains.
   #
   # Notice that you shouldn't use this for your own Libraries.
   # * locale: a locale string or Locale::Object.
-  # * src: internal usage only. You shouldn't use this.
   # * Returns: self
-  def set_locale(locale, src = callersrc)
+  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
-      ret.charset = @@__output_charset if @@__output_charset
+      ret.charset = output_charset if output_charset
+      Locale.set(ret)
     else
-      ret = nil
+      Locale.set(nil)
+      ret = Locale.get
     end
-    Locale.set(ret)
-
-    textdomain = @@__textdomain[src]
-    textdomain.set_locale(ret, true) if textdomain
-
+    TextDomainManager.each_all {|textdomain|
+      textdomain.set_locale(ret)
+    }
     self
   end
 
@@ -212,7 +280,7 @@ module GetText
   # * src: internal usage only. You shouldn't use this.
   # * Returns: a locale string
   def locale=(locale)
-    set_locale(locale, callersrc)
+    set_locale(locale)
     locale
   end
 
@@ -221,7 +289,7 @@ module GetText
   # * charset: an output_charset
   # * Returns: charset
   def set_output_charset(charset)
-    @@__output_charset = charset
+    TextDomainManager.output_charset = charset
     self
   end
 
@@ -229,13 +297,13 @@ module GetText
   # * charset: an output_charset
   # * Returns: charset
   def output_charset=(charset)
-    @@__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
-    @@__output_charset
+    TextDomainManager.output_charset
   end
 
   # Gets the current locale.
@@ -244,30 +312,14 @@ module GetText
     Locale.current
   end
 
-  # Sets a charset(String) such as "euc-jp", "sjis", "CP932", "utf-8", ... 
-  # This affect he current textdomain only. 
-  # Generaly you should use GetText.output_charset= instead. 
-  # And you shouldn't use this in your own Libraries.
-  # * charset: an charset
-  # * src: internal usage only. You shouldn't use this.
-  # * Returns: self
-  def set_charset(cs, src = callersrc)
-    textdomain = @@__textdomain[src]
-    if textdomain
-      locale = textdomain.current_locale
-      locale ||= Locale.current
-      locale.charset = cs if locale
-      textdomain.set_locale(locale, true)
-      Locale.set_current(locale)
-    end
+  # Deprecated. Now this function do nothing. Use GetText.output_charset= instead.
+  def set_charset(cs)
+    $stderr.puts "Deprecated. Now this function do nothing. Use GetText.output_charset= instead." if $DEBUG
     self
   end
 
-  # Same as GetText.set_charset.
-  # * charset: an charset
-  # * Returns: charset
-  def charset=(cs)
-    set_charset(cs, callersrc)
+  def charset=(cs) #:nodoc:
+    set_charset(cs)
     cs
   end
   
@@ -284,9 +336,8 @@ module GetText
   alias :n_ :ngettext #:nodoc:
   alias :s_ :sgettext #:nodoc:
 
-  module_function :bindtextdomain, :textdomain, 
-    :N_, :gettext, :_, :ngettext, :n_, 
-    :sgettext, :s_, :callersrc,
-    :setlocale, :set_locale, :locale=, :locale, :charset=, :set_charset,
+  module_function :bindtextdomain, :textdomain, :each_textdomain,
+    :N_, :gettext, :_, :ngettext, :n_, :sgettext, :s_, :bound_target,
+    :setlocale, :set_locale, :locale=, :set_locale_all, :locale, :charset=, :set_charset,
     :set_output_charset, :output_charset=, :output_charset
 end