gettext 1.90.0 → 1.91.0

data/doc/fr_class_index.html

@@ -20,6 +20,7 @@
 <div id="index">
   <h1 class="section-bar">Classes</h1>
   <div id="index-entries">
+    <a href="classes/ActionView/Helpers/FormBuilder.html">ActionView::Helpers::FormBuilder</a><br />
     <a href="classes/ActiveRecord/Base.html">ActiveRecord::Base</a><br />
     <a href="classes/ActiveRecord/ConnectionAdapters/Column.html">ActiveRecord::ConnectionAdapters::Column</a><br />
     <a href="classes/ActiveRecord/Migration.html">ActiveRecord::Migration</a><br />
@@ -47,6 +48,7 @@
     <a href="classes/Locale/SystemJRuby.html">Locale::SystemJRuby</a><br />
     <a href="classes/Locale/SystemPosix.html">Locale::SystemPosix</a><br />
     <a href="classes/Locale/SystemWin32.html">Locale::SystemWin32</a><br />
+    <a href="classes/Locale/SystemWin32Table.html">Locale::SystemWin32Table</a><br />
     <a href="classes/MOFile.html">MOFile</a><br />
     <a href="classes/MOFile/InvalidFormat.html">MOFile::InvalidFormat</a><br />
     <a href="classes/Module.html">Module</a><br />

data/doc/fr_method_index.html

@@ -23,132 +23,134 @@
     <a href="classes/String.html#M000017">% (String)</a><br />
     <a href="classes/GetText.html#M000037">N_ (GetText)</a><br />
     <a href="classes/GetText.html#M000038">Nn_ (GetText)</a><br />
-    <a href="classes/GetText.html#M000050">_ (GetText)</a><br />
-    <a href="classes/GetText/PoParser.html#M000078">_reduce_none (GetText::PoParser)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000072">add_default_locale_path (GetText::TextDomain)</a><br />
+    <a href="classes/GetText.html#M000051">_ (GetText)</a><br />
+    <a href="classes/GetText/PoParser.html#M000079">_reduce_none (GetText::PoParser)</a><br />
     <a href="classes/GetText.html#M000047">add_default_locale_path (GetText)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000067">add_textdomain (GetText::TextDomainManager)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000073">add_default_locale_path (GetText::TextDomain)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000068">add_textdomain (GetText::TextDomainManager)</a><br />
     <a href="classes/Module.html#M000016">alias_method_chain (Module)</a><br />
-    <a href="classes/GetText/Rails.html#M000059">available_locales (GetText::Rails)</a><br />
+    <a href="classes/GetText/Rails.html#M000060">available_locales (GetText::Rails)</a><br />
+    <a href="classes/GetText/Rails.html#M000059">bindtextdomain (GetText::Rails)</a><br />
     <a href="classes/GetText.html#M000030">bindtextdomain (GetText)</a><br />
-    <a href="classes/GetText/Rails.html#M000058">bindtextdomain (GetText::Rails)</a><br />
     <a href="classes/GetText.html#M000031">bindtextdomain_to (GetText)</a><br />
     <a href="classes/GetText.html#M000027">cached= (GetText)</a><br />
     <a href="classes/GetText.html#M000028">cached? (GetText)</a><br />
-    <a href="classes/Locale/SystemCGI.html#M000104">cgi (Locale::SystemCGI)</a><br />
+    <a href="classes/Locale/SystemCGI.html#M000105">cgi (Locale::SystemCGI)</a><br />
     <a href="classes/GetText.html#M000025">cgi (GetText)</a><br />
-    <a href="classes/Locale.html#M000081">cgi (Locale)</a><br />
-    <a href="classes/Locale.html#M000080">cgi= (Locale)</a><br />
-    <a href="classes/Locale/SystemCGI.html#M000103">cgi= (Locale::SystemCGI)</a><br />
+    <a href="classes/Locale.html#M000082">cgi (Locale)</a><br />
+    <a href="classes/Locale/SystemCGI.html#M000104">cgi= (Locale::SystemCGI)</a><br />
+    <a href="classes/Locale.html#M000081">cgi= (Locale)</a><br />
     <a href="classes/GetText.html#M000024">cgi= (GetText)</a><br />
-    <a href="classes/Locale.html#M000092">charset (Locale)</a><br />
-    <a href="classes/Locale/SystemBase.html#M000099">charset (Locale::SystemBase)</a><br />
-    <a href="classes/Locale/Object.html#M000108">charset= (Locale::Object)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000071">check_mo= (GetText::TextDomain)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000070">check_mo? (GetText::TextDomain)</a><br />
-    <a href="classes/Locale.html#M000094">clear (Locale)</a><br />
-    <a href="classes/Locale/Object.html#M000114">clear (Locale::Object)</a><br />
+    <a href="classes/Locale.html#M000093">charset (Locale)</a><br />
+    <a href="classes/Locale/SystemBase.html#M000100">charset (Locale::SystemBase)</a><br />
+    <a href="classes/Locale/Object.html#M000109">charset= (Locale::Object)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000072">check_mo= (GetText::TextDomain)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000071">check_mo? (GetText::TextDomain)</a><br />
+    <a href="classes/Locale/Object.html#M000115">clear (Locale::Object)</a><br />
+    <a href="classes/Locale.html#M000095">clear (Locale)</a><br />
     <a href="classes/GetText.html#M000029">clear_cache (GetText)</a><br />
-    <a href="classes/Locale.html#M000091">codeset (Locale)</a><br />
-    <a href="classes/ActiveRecord/Base.html#M000127">columns_with_gettext (ActiveRecord::Base)</a><br />
+    <a href="classes/Locale.html#M000092">codeset (Locale)</a><br />
+    <a href="classes/ActiveRecord/Base.html#M000128">columns_with_gettext (ActiveRecord::Base)</a><br />
     <a href="classes/Iconv.html#M000001">conv (Iconv)</a><br />
     <a href="classes/Iconv.html#M000002">conv (Iconv)</a><br />
-    <a href="classes/Locale/Object.html#M000107">country= (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000108">country= (Locale::Object)</a><br />
     <a href="classes/GetText.html#M000019">create_mofiles (GetText)</a><br />
-    <a href="classes/Locale.html#M000086">current (Locale)</a><br />
-    <a href="classes/Locale.html#M000088">current= (Locale)</a><br />
-    <a href="classes/Locale.html#M000093">current_charset (Locale)</a><br />
+    <a href="classes/Locale.html#M000087">current (Locale)</a><br />
+    <a href="classes/Locale.html#M000089">current= (Locale)</a><br />
+    <a href="classes/Locale.html#M000094">current_charset (Locale)</a><br />
     <a href="classes/GetText.html#M000048">current_textdomain_info (GetText)</a><br />
-    <a href="classes/Locale.html#M000085">default (Locale)</a><br />
-    <a href="classes/Locale.html#M000083">default= (Locale)</a><br />
-    <a href="classes/Locale/SystemCGI.html#M000105">default_locale (Locale::SystemCGI)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000068">each (GetText::TextDomainManager)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000064">each_all (GetText::TextDomainManager)</a><br />
-    <a href="classes/GetText/ErbContainer.html#M000055">eval_file (GetText::ErbContainer)</a><br />
-    <a href="classes/GetText/ErbContainer.html#M000054">eval_src (GetText::ErbContainer)</a><br />
-    <a href="classes/Locale.html#M000090">get (Locale)</a><br />
-    <a href="classes/Locale/SystemWin32.html#M000100">get_charset (Locale::SystemWin32)</a><br />
-    <a href="classes/Locale/SystemBase.html#M000096">get_charset (Locale::SystemBase)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000075">gettext (GetText::TextDomain)</a><br />
+    <a href="classes/Locale.html#M000086">default (Locale)</a><br />
+    <a href="classes/Locale.html#M000084">default= (Locale)</a><br />
+    <a href="classes/Locale/SystemCGI.html#M000106">default_locale (Locale::SystemCGI)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000069">each (GetText::TextDomainManager)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000065">each_all (GetText::TextDomainManager)</a><br />
+    <a href="classes/GetText/ErbContainer.html#M000056">eval_file (GetText::ErbContainer)</a><br />
+    <a href="classes/GetText/ErbContainer.html#M000055">eval_src (GetText::ErbContainer)</a><br />
+    <a href="classes/Locale.html#M000091">get (Locale)</a><br />
+    <a href="classes/Locale/SystemBase.html#M000097">get_charset (Locale::SystemBase)</a><br />
+    <a href="classes/Locale/SystemWin32.html#M000101">get_charset (Locale::SystemWin32)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000076">gettext (GetText::TextDomain)</a><br />
     <a href="classes/GetText.html#M000034">gettext (GetText)</a><br />
     <a href="classes/MOFile.html#M000011">hash_string (MOFile)</a><br />
-    <a href="classes/ActiveRecord/ConnectionAdapters/Column.html#M000122">human_name_with_gettext (ActiveRecord::ConnectionAdapters::Column)</a><br />
+    <a href="classes/ActiveRecord/ConnectionAdapters/Column.html#M000123">human_name_with_gettext (ActiveRecord::ConnectionAdapters::Column)</a><br />
     <a href="classes/Iconv.html#M000003">iconv (Iconv)</a><br />
-    <a href="classes/GetText/ErbParser.html#M000061">init (GetText::ErbParser)</a><br />
-    <a href="classes/GetText/ActiveRecordParser.html#M000056">init (GetText::ActiveRecordParser)</a><br />
-    <a href="classes/Locale/Object.html#M000106">language= (Locale::Object)</a><br />
+    <a href="classes/GetText/ErbParser.html#M000062">init (GetText::ErbParser)</a><br />
+    <a href="classes/GetText/ActiveRecordParser.html#M000057">init (GetText::ActiveRecordParser)</a><br />
+    <a href="classes/ActionView/Helpers/FormBuilder.html#M000131">label_with_gettext (ActionView::Helpers::FormBuilder)</a><br />
+    <a href="classes/Locale/Object.html#M000107">language= (Locale::Object)</a><br />
     <a href="classes/MOFile.html#M000007">load (MOFile)</a><br />
     <a href="classes/MOFile.html#M000013">load_from_file (MOFile)</a><br />
     <a href="classes/MOFile.html#M000008">load_from_stream (MOFile)</a><br />
     <a href="classes/GetText.html#M000046">locale (GetText)</a><br />
     <a href="classes/GetText.html#M000042">locale= (GetText)</a><br />
-    <a href="classes/Locale/SystemBase.html#M000097">locale_from_env (Locale::SystemBase)</a><br />
-    <a href="classes/Locale/Object.html#M000111">modifier= (Locale::Object)</a><br />
+    <a href="classes/Locale/SystemBase.html#M000098">locale_from_env (Locale::SystemBase)</a><br />
+    <a href="classes/Locale/Object.html#M000112">modifier= (Locale::Object)</a><br />
     <a href="classes/GetText.html#M000018">msgmerge (GetText)</a><br />
-    <a href="classes/GetText.html#M000051">n_ (GetText)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000066">new (GetText::TextDomainManager)</a><br />
-    <a href="classes/Locale/Object.html#M000113">new (Locale::Object)</a><br />
+    <a href="classes/GetText.html#M000052">n_ (GetText)</a><br />
+    <a href="classes/Locale/Object.html#M000114">new (Locale::Object)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000074">new (GetText::TextDomain)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000067">new (GetText::TextDomainManager)</a><br />
     <a href="classes/MOFile.html#M000005">new (MOFile)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000073">new (GetText::TextDomain)</a><br />
     <a href="classes/MOFile.html#M000010">next_prime (MOFile)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000076">ngettext (GetText::TextDomain)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000077">ngettext (GetText::TextDomain)</a><br />
     <a href="classes/GetText.html#M000036">ngettext (GetText)</a><br />
-    <a href="classes/GetText/Rails.html#M000060">normalized_locale (GetText::Rails)</a><br />
-    <a href="classes/GetText.html#M000053">ns_ (GetText)</a><br />
+    <a href="classes/GetText/Rails.html#M000061">normalized_locale (GetText::Rails)</a><br />
+    <a href="classes/GetText.html#M000054">ns_ (GetText)</a><br />
     <a href="classes/GetText.html#M000039">nsgettext (GetText)</a><br />
     <a href="classes/MOFile.html#M000004">open (MOFile)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000063">output_charset (GetText::TextDomainManager)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000064">output_charset (GetText::TextDomainManager)</a><br />
     <a href="classes/GetText.html#M000045">output_charset (GetText)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000062">output_charset= (GetText::TextDomainManager)</a><br />
     <a href="classes/GetText.html#M000044">output_charset= (GetText)</a><br />
-    <a href="classes/Locale/Object.html#M000112">parse (Locale::Object)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000063">output_charset= (GetText::TextDomainManager)</a><br />
+    <a href="classes/Locale/Object.html#M000113">parse (Locale::Object)</a><br />
     <a href="classes/MOFile.html#M000009">prime? (MOFile)</a><br />
+    <a href="classes/GetText.html#M000049">remove_all_textdomains (GetText)</a><br />
     <a href="classes/GetText.html#M000021">rgettext (GetText)</a><br />
     <a href="classes/GetText.html#M000022">rmsgfmt (GetText)</a><br />
     <a href="classes/GetText.html#M000026">rmsgmerge (GetText)</a><br />
-    <a href="classes/GetText.html#M000052">s_ (GetText)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000077">same_property? (GetText::TextDomain)</a><br />
+    <a href="classes/GetText.html#M000053">s_ (GetText)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000078">same_property? (GetText::TextDomain)</a><br />
     <a href="classes/MOFile.html#M000014">save_to_file (MOFile)</a><br />
     <a href="classes/MOFile.html#M000012">save_to_stream (MOFile)</a><br />
-    <a href="classes/Locale/Object.html#M000109">script= (Locale::Object)</a><br />
-    <a href="classes/Locale.html#M000089">set (Locale)</a><br />
-    <a href="classes/Locale/SystemCGI.html#M000102">set_cgi (Locale::SystemCGI)</a><br />
+    <a href="classes/Locale/Object.html#M000110">script= (Locale::Object)</a><br />
+    <a href="classes/Locale.html#M000090">set (Locale)</a><br />
     <a href="classes/GetText.html#M000023">set_cgi (GetText)</a><br />
-    <a href="classes/Locale.html#M000079">set_cgi (Locale)</a><br />
+    <a href="classes/Locale.html#M000080">set_cgi (Locale)</a><br />
+    <a href="classes/Locale/SystemCGI.html#M000103">set_cgi (Locale::SystemCGI)</a><br />
     <a href="classes/MOFile.html#M000015">set_comment (MOFile)</a><br />
-    <a href="classes/Locale.html#M000087">set_current (Locale)</a><br />
-    <a href="classes/Locale.html#M000082">set_default (Locale)</a><br />
-    <a href="classes/ActiveRecord/Base.html#M000129">set_error_message_explanation (ActiveRecord::Base)</a><br />
-    <a href="classes/ActiveRecord/Base.html#M000128">set_error_message_title (ActiveRecord::Base)</a><br />
+    <a href="classes/Locale.html#M000088">set_current (Locale)</a><br />
+    <a href="classes/Locale.html#M000083">set_default (Locale)</a><br />
+    <a href="classes/ActiveRecord/Base.html#M000130">set_error_message_explanation (ActiveRecord::Base)</a><br />
+    <a href="classes/ActiveRecord/Base.html#M000129">set_error_message_title (ActiveRecord::Base)</a><br />
     <a href="classes/GetText.html#M000040">set_locale (GetText)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000069">set_locale (GetText::TextDomainManager)</a><br />
-    <a href="classes/GetText/TextDomain.html#M000074">set_locale (GetText::TextDomain)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000070">set_locale (GetText::TextDomainManager)</a><br />
+    <a href="classes/GetText/TextDomain.html#M000075">set_locale (GetText::TextDomain)</a><br />
     <a href="classes/GetText.html#M000041">set_locale_all (GetText)</a><br />
     <a href="classes/GetText.html#M000043">set_output_charset (GetText)</a><br />
-    <a href="classes/GetText.html#M000049">setlocale (GetText)</a><br />
+    <a href="classes/GetText.html#M000050">setlocale (GetText)</a><br />
     <a href="classes/GetText.html#M000035">sgettext (GetText)</a><br />
-    <a href="classes/Locale.html#M000084">system (Locale)</a><br />
-    <a href="classes/Locale/SystemCGI.html#M000101">system (Locale::SystemCGI)</a><br />
-    <a href="classes/Locale/SystemBase.html#M000098">system (Locale::SystemBase)</a><br />
-    <a href="classes/Locale.html#M000095">system_module (Locale)</a><br />
+    <a href="classes/Locale/SystemCGI.html#M000102">system (Locale::SystemCGI)</a><br />
+    <a href="classes/Locale.html#M000085">system (Locale)</a><br />
+    <a href="classes/Locale/SystemBase.html#M000099">system (Locale::SystemBase)</a><br />
+    <a href="classes/Locale.html#M000096">system_module (Locale)</a><br />
     <a href="classes/GetText.html#M000032">textdomain (GetText)</a><br />
-    <a href="classes/GetText/TextDomainManager.html#M000065">textdomain (GetText::TextDomainManager)</a><br />
+    <a href="classes/GetText/TextDomainManager.html#M000066">textdomain (GetText::TextDomainManager)</a><br />
     <a href="classes/GetText.html#M000033">textdomain_to (GetText)</a><br />
-    <a href="classes/Locale/Object.html#M000119">to_a (Locale::Object)</a><br />
-    <a href="classes/Locale/Object.html#M000118">to_general (Locale::Object)</a><br />
-    <a href="classes/Locale/Object.html#M000116">to_iso3066 (Locale::Object)</a><br />
-    <a href="classes/Locale/Object.html#M000115">to_posix (Locale::Object)</a><br />
-    <a href="classes/Locale/Object.html#M000120">to_s (Locale::Object)</a><br />
-    <a href="classes/Locale/Object.html#M000121">to_str (Locale::Object)</a><br />
-    <a href="classes/Locale/Object.html#M000117">to_win (Locale::Object)</a><br />
-    <a href="classes/ActiveRecord/Base.html#M000125">untranslate (ActiveRecord::Base)</a><br />
-    <a href="classes/ActiveRecord/Base.html#M000126">untranslate? (ActiveRecord::Base)</a><br />
-    <a href="classes/ActiveRecord/Base.html#M000123">untranslate_all (ActiveRecord::Base)</a><br />
-    <a href="classes/ActiveRecord/Base.html#M000124">untranslate_all? (ActiveRecord::Base)</a><br />
-    <a href="classes/GetText/ActiveRecordParser.html#M000057">untranslate_column? (GetText::ActiveRecordParser)</a><br />
+    <a href="classes/Locale/Object.html#M000120">to_a (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000119">to_general (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000117">to_iso3066 (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000116">to_posix (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000121">to_s (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000122">to_str (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000118">to_win (Locale::Object)</a><br />
+    <a href="classes/ActiveRecord/Base.html#M000126">untranslate (ActiveRecord::Base)</a><br />
+    <a href="classes/ActiveRecord/Base.html#M000127">untranslate? (ActiveRecord::Base)</a><br />
+    <a href="classes/ActiveRecord/Base.html#M000124">untranslate_all (ActiveRecord::Base)</a><br />
+    <a href="classes/ActiveRecord/Base.html#M000125">untranslate_all? (ActiveRecord::Base)</a><br />
+    <a href="classes/GetText/ActiveRecordParser.html#M000058">untranslate_column? (GetText::ActiveRecordParser)</a><br />
     <a href="classes/MOFile.html#M000006">update! (MOFile)</a><br />
     <a href="classes/GetText.html#M000020">update_pofiles (GetText)</a><br />
-    <a href="classes/Locale/Object.html#M000110">variant= (Locale::Object)</a><br />
+    <a href="classes/Locale/Object.html#M000111">variant= (Locale::Object)</a><br />
   </div>
 </div>
 </body>

data/lib/gettext.rb

@@ -1,7 +1,7 @@
 =begin
   gettext.rb - GetText module
 
-  Copyright (C) 2001-2007  Masao Mutoh
+  Copyright (C) 2001-2008  Masao Mutoh
   Copyright (C) 2001-2003  Masahiro Sakai
 
       Masao Mutoh       <mutoh@highway.ne.jp>
@@ -10,7 +10,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: gettext.rb,v 1.37 2008/01/29 16:30:29 mutoh Exp $
+  $Id: gettext.rb,v 1.40 2008/05/05 17:38:38 mutoh Exp $
 =end
 
 require 'rbconfig'
@@ -29,6 +29,9 @@ module GetText
     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. 
@@ -55,7 +58,7 @@ module GetText
     @@__cache_bound_targets = {}
   end
 
-  @@__textdomainmanagers = Hash.new
+  @@__textdomainmanagers = {}
 
   # call-seq:
   # bindtextdomain(domainname, options = {})
@@ -170,8 +173,9 @@ module GetText
   @@__cache_target_classes = {}
 
   def find_targets(klass)  #:nodoc:
+    id = klass.object_id
     if cached?
-      return @@__cache_target_classes[klass] if @@__cache_target_classes[klass]
+      return @@__cache_target_classes[id] if @@__cache_target_classes[id]
     end
     unless (klass.kind_of? Class or klass.kind_of? Module)
       klass = klass.class
@@ -184,42 +188,44 @@ module GetText
           target = v
         else
           target = eval(v)
-          return [GetText] unless (target = eval(v)) # For anonymous module
+          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[klass] = ret.size > 0 ? ret : [klass]
+    @@__cache_target_classes[id] = ret.size > 0 ? ret : [klass]
   end
 
   @@__cache_bound_target = {}
 
   def bound_target(klass = self) # :nodoc:
+    id = klass.object_id
     if cached?
-      if @@__cache_bound_target[klass]
-        return @@__cache_bound_target[klass]
-      end
+     tgt = @@__cache_bound_target[id]
+     return tgt if tgt
     end
 
-    ret = nil
-    if klass.kind_of? Class or klass.kind_of? Module
-      ret = klass
-    else
-      ret = klass.class
+    ret = (klass.kind_of? Module) ? klass : klass.class
+    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
-    ret = GetText if ret.name =~ /^\#<|^$/
-    @@__cache_bound_target[klass] = ret
+    @@__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[klass]
-        return @@__cache_bound_targets[klass]
+      if @@__cache_bound_targets[id]
+        return @@__cache_bound_targets[id]
       end
     end
     ret = []
@@ -228,7 +234,7 @@ module GetText
     while(v = ary.shift)
       ret.unshift(((ret.size == 0) ? eval(v) : ret[0].const_get(v)))
     end
-    @@__cache_bound_targets[klass] = ((ret + klass.ancestors + [GetText]) & @@__textdomainmanagers.keys).uniq
+    @@__cache_bound_targets[id] = ((ret + klass.ancestors + [Object]) & @@__textdomainmanagers.keys).uniq
   end
  
   @@__cache_msgids = {}
@@ -238,6 +244,19 @@ module GetText
   #   _(msgid)
   #
   # Translates msgid and return the message.
+  # This doesn't make a copy of the message. 
+  #
+  # You need to use String#dup if you want to modify the return value 
+  # with destructive functions. 
+  #
+  # (e.g.1) _("Hello ").dup << "world"
+  # 
+  # But e.g.1 should be rewrite to:
+  #
+  # (e.g.2) _("Hello %{val}") % {:val => "world"}
+  #
+  # Because the translator may want to change the position of "world".
+  #
   # * msgid: the message id.
   # * Returns: localized text by msgid. If there are not binded mo-file, it will return msgid.
   def gettext(msgid)
@@ -520,14 +539,20 @@ module GetText
     }
   end
 
+  # for testing.
+  def remove_all_textdomains
+    clear_cache
+    @@__textdomainmanagers = {}
+  end
+
   alias :setlocale :locale= #:nodoc:
   alias :_ :gettext   #:nodoc:
   alias :n_ :ngettext #:nodoc:
   alias :s_ :sgettext #:nodoc:
   alias :ns_ :nsgettext #:nodoc:
 
-  module_function :bindtextdomain, :textdomain, :each_textdomain, :cached=, :cached?, :clear_cache,
+  module_function :bindtextdomain, :textdomain, :each_textdomain, :cached=, :cached?, :clear_cache, 
   :N_, :gettext, :_, :ngettext, :n_, :sgettext, :s_, :nsgettext, :ns_, :bound_target, :bound_targets, :find_targets,
   :setlocale, :set_locale, :locale=, :set_locale_all, :locale, 
-  :set_output_charset, :output_charset=, :output_charset, :current_textdomain_info
+  :set_output_charset, :output_charset=, :output_charset, :current_textdomain_info, :remove_all_textdomains 
 end

data/lib/gettext/active_record.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: active_record.rb,v 1.21 2007/07/04 15:51:30 mutoh Exp $
+  $Id: active_record.rb,v 1.22 2008/05/05 14:31:06 mutoh Exp $
 =end
 require 'gettext'
 require 'active_record'
@@ -98,10 +98,10 @@ module ActiveRecord #:nodoc:
       # Very ugly but...
       def validates_length_of_with_gettext(*attrs)  #:nodoc:
 	if attrs.last.is_a?(Hash)
-	  msg = attrs.last[:message] || attrs.last[:too_long] || attrs.last[:too_short] || attrs.last[:wrong_length]
-	  if msg
-	    @@custom_error_messages_d[msg] = /\A#{Regexp.escape(msg).sub(/%d/, '(\d+)')}\Z/ 
-	  end
+          [:message, :too_long, :too_short, :wrong_length].each do |msg_sym|
+            msg = attrs.last[msg_sym]
+            @@custom_error_messages_d[msg] = /\A#{Regexp.escape(msg).sub(/%d/, '(\d+)')}\Z/ if msg
+          end
 	end
 	validates_size_of(*attrs)
       end

data/lib/gettext/mo.rb

@@ -12,10 +12,11 @@
     of Ruby.  License of Ruby is included with Ruby distribution in
     the file "README".
 
-    $Id: mo.rb,v 1.8 2007/11/10 02:51:21 mutoh Exp $
+    $Id: mo.rb,v 1.9 2008/03/22 04:43:32 mutoh Exp $
 =end
 
 require 'gettext/iconv'
+require 'stringio'
 
 class MOFile < Hash 
   class InvalidFormat < RuntimeError; end;
@@ -58,15 +59,14 @@ class MOFile < Hash
   end
 
   def load(arg)
-    case arg
-    when String
+    if arg.kind_of? String
       begin
 	st = File.stat(arg)
 	@last_modified = [st.ctime, st.mtime]
       rescue Exception
       end
       load_from_file(arg)
-    when IO
+    else
       load_from_stream(arg)
     end
     @filename = arg

data/lib/gettext/rails.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rails.rb,v 1.72 2008/01/29 16:30:29 mutoh Exp $
+  $Id: rails.rb,v 1.75 2008/05/11 11:37:34 mutoh Exp $
 =end
 
 require 'gettext/cgi'
@@ -228,6 +228,7 @@ module ActionController #:nodoc:
       textdomain_to(ActionView::Base, domainname) if defined? ActionView::Base
       textdomain_to(ApplicationHelper, domainname) if defined? ApplicationHelper
       textdomain_to(ActionMailer::Base, domainname) if defined? ActionMailer::Base
+      textdomain_to(ActionView::Helpers, domainname) if defined? ActionView::Helpers
     end
 
     # Gets the textdomain name and path of this controller which is set 
@@ -285,6 +286,16 @@ module ActionView #:nodoc:
   end
 
   module Helpers  #:nodoc:
+    class FormBuilder
+      include GetText
+      
+      def label_with_gettext(method, text = nil, options = {})
+        text ||= s_("#{@object.class}|#{method.to_s.humanize}")
+        @template.label(@object_name, method, text, options.merge(:object => @object))
+      end
+      alias_method_chain :label, :gettext
+    end
+
     module ActiveRecordHelper #:nodoc: all
       module L10n
 	# Separate namespace for textdomain
@@ -402,18 +413,19 @@ module ActionView #:nodoc:
       # This is FAKE constant. The messages are found by rgettext as the msgid. 
       MESSAGESS = [N_('less than 5 seconds'), N_('less than 10 seconds'), N_('less than 20 seconds'),
                    N_('half a minute'), N_('less than a minute'), N_('about 1 month'), 
-                   N_('about 1 year'), N_('over 2 years')]
+                   N_('about 1 year')]
       NMINUTES = [/^(\d+) minutes?$/, Nn_('1 minute', '%{num} minutes')]
       NHOURS   = [/^about (\d+) hours?$/, Nn_('about 1 hour', 'about %{num} hours')]
       NDAYS    = [/^(\d+) days?$/, Nn_('1 day', '%{num} days')]
       NMONTHS  = [/^(\d+) months?$/, Nn_('1 month', '%{num} months')]
+      NYEARS  = [/^over (\d+) years?$/, Nn_('over 1 year', 'over %{num} years')]
 
       def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false)
 	textdomain("rails")
 
 	msg = distance_of_time_in_words_without_locale(from_time, to_time, include_seconds)
 	match = false
-	[NMINUTES, NHOURS, NDAYS, NMONTHS].each do |regexp, nn|
+	[NMINUTES, NHOURS, NDAYS, NMONTHS, NYEARS].each do |regexp, nn|
 	  if regexp =~ msg
 	    match = true
 	    msg = n_(nn, $1.to_i) % {:num => $1}