gettext 1.6.0 → 1.7.0

data/lib/gettext.rb

@@ -10,7 +10,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: gettext.rb,v 1.14 2006/06/07 15:56:04 mutoh Exp $
+  $Id: gettext.rb,v 1.15 2006/06/11 15:36:20 mutoh Exp $
 =end
 
 require 'rbconfig'
@@ -31,27 +31,25 @@ module GetText
 
   @@__textdomainmanagers = Hash.new
 
+  # 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.
-  #
+  # (gettext/container, gettext/erb, gettext/rails), the textdomain scope becomes a Class/Module.
   # * 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.
   # * Returns: the GetText::TextDomain.
-  #
   # Note: Don't use locale_, charset argument(not in options). 
   # They are remained for backward compatibility. 
   #
@@ -102,7 +100,7 @@ module GetText
   # * 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 = [])
+  def each_textdomain(klass = bound_target, ignore_targets = []) #:nodoc:
     (klass.ancestors + [GetText]).each do |target|
       unless ignore_targets.include? target
 	ignore_targets << target
@@ -145,7 +143,7 @@ module GetText
     }
     ret ? ret : msgid
   end
-  
+
   # call-seq:
   #   ngettext(msgid, msgid_plural, n)
   #   ngettext(msgids, n)  # msgids = [msgid, msgid_plural]
@@ -313,7 +311,7 @@ module GetText
   end
 
   # Deprecated. Now this function do nothing. Use GetText.output_charset= instead.
-  def set_charset(cs)
+  def set_charset(cs) #:nodoc:
     $stderr.puts "Deprecated. Now this function do nothing. Use GetText.output_charset= instead." if $DEBUG
     self
   end
@@ -325,12 +323,40 @@ module GetText
   
   # Add default locale path.
   # * path: a new locale path. (e.g.) "/usr/share/locale/%{locale}/LC_MESSAGES/%{name}.mo"
-  #    ('locale' => "ja_JP", 'name' => "textdomain")
+  #   ('locale' => "ja_JP", 'name' => "textdomain")
   # * Returns: the new DEFAULT_LOCALE_PATHS
   def add_default_locale_path(path)
     TextDomain.add_default_locale_path(path)
   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.
+  # * Returns: localized text by msgid. If there are not binded mo-file, it will return msgid.
+  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
+
   alias :setlocale :locale= #:nodoc:
   alias :_ :gettext   #:nodoc:
   alias :n_ :ngettext #:nodoc:
@@ -339,5 +365,5 @@ module GetText
   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
+    :set_output_charset, :output_charset=, :output_charset, :current_textdomain_info
 end

data/lib/gettext/container.rb

@@ -6,12 +6,16 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: container.rb,v 1.5 2006/06/04 14:43:37 mutoh Exp $
+  $Id: container.rb,v 1.6 2006/06/11 15:36:20 mutoh Exp $
 =end
 
 require 'gettext'
 
-module GetText # :nodoc:
+<<<<<<< container.rb
+module GetText
+=======
+module GetText 
+>>>>>>> 1.6
   # Deprecated. You don't need this. Use GetText instead.
   module Container
     include GetText

data/lib/gettext/iconv.rb

@@ -9,7 +9,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: iconv.rb,v 1.2 2006/02/22 16:42:41 mutoh Exp $
+  $Id: iconv.rb,v 1.3 2006/06/11 15:36:20 mutoh Exp $
 =end
 
 begin
@@ -17,7 +17,7 @@ begin
 rescue LoadError
   begin
     require 'glib2'
-    # = Pseudo Iconv module
+    # Pseudo Iconv module
     # 
     # Provides Iconv.iconv which uses Ruby/GLib(1) functions. This library also required from 'gettext'.
     # If you require 'gettext/iconv', Iconv.iconv try to call Ruby/GLib function 

data/lib/gettext/locale_cgi.rb

@@ -6,11 +6,11 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_cgi.rb,v 1.3 2006/03/07 17:26:57 mutoh Exp $
+  $Id: locale_cgi.rb,v 1.4 2006/06/11 15:36:20 mutoh Exp $
 =end
 
 
-module Locale # :nodoc:
+module Locale
   # Locale::System module for Default OS (Unix)
   # This is low-level class. Application shouldn't use this directly.
   module SystemCGI
@@ -21,6 +21,7 @@ module Locale # :nodoc:
     # Gets the default locale using setlocale and nl_langinfo. 
     # * Returns the system locale (Locale::Object).
     def system
+      return @@default_locale unless @@cgi
       cgi_ = cgi
       if ret = cgi_["lang"] and ret.size > 0
       elsif ret = cgi_.cookies["lang"][0]

data/lib/gettext/locale_object.rb

@@ -6,11 +6,11 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_object.rb,v 1.7 2006/03/03 07:03:50 mutoh Exp $
+  $Id: locale_object.rb,v 1.8 2006/06/11 15:36:20 mutoh Exp $
 =end
 
 
-module Locale # :nodoc:
+module Locale
   class Object
     attr_accessor :language, :country, :charset, :script, :variant, :modifier, :orig_str
 
@@ -19,16 +19,16 @@ module Locale # :nodoc:
     # * locale_name: locale name as String 
     #   
     #   * Basic POSIX format: <language>_<COUNTRY>.<charset>@<modifier>
-    #      * Both of POSIX and C are converted to "en".
+    #     * Both of POSIX and C are converted to "en".
     #   * Basic RFC3066 format: <language>-<COUNTRY>
     #   * Win32 format: <language>-<COUNTRY>-<Script>_<sort order>
     #   * CLDR format: <language>_<Script>_<COUNTRY>_<variant>@<modifier>
     #   * Some broken format: <language>_<country>_<script>  # Don't use this.
     #   * The max locale format is below:     
-    #      * <language>-<COUNTRY>-<Script>_<sort order>.<charset>@<modifier>
-    #      * format: <language>_<Script>_<COUNTRY>_<variant>@<modifier>
-    #         * both of '-' and '_' are separators.
-    #         * each elements are omittable.
+    #     * <language>-<COUNTRY>-<Script>_<sort order>.<charset>@<modifier>
+    #     * format: <language>_<Script>_<COUNTRY>_<variant>@<modifier>
+    #       * both of '-' and '_' are separators.
+    #       * each elements are omittable.
     #   
     #   (e.g.) uz-UZ-Latn, ja_JP.eucJP, wa_BE.iso885915@euro
     # * Returns: [language, country, charset, script, modifier]
@@ -39,7 +39,7 @@ module Locale # :nodoc:
     #   * variant: variant value in CLDR or sort order in Win32.
     #   * modifier: (no standard)
     #
-    #
+    #  (e.g.)
     #  "ja_JP.eucJP" => ["ja", "JP", "eucJP", nil, nil]
     #  "ja-jp.utf-8" => ["ja", "JP", "utf-8", nil, nil]
     #  "ja-jp" => ["ja", "JP", nil, nil, nil]

data/lib/gettext/locale_posix.rb

@@ -6,11 +6,11 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_posix.rb,v 1.3 2006/06/07 15:56:04 mutoh Exp $
+  $Id: locale_posix.rb,v 1.4 2006/06/11 15:36:20 mutoh Exp $
 =end
 
 
-module Locale # :nodoc:
+module Locale 
   # Locale::SystemPosix module for Posix OS (Unix)
   # This is low-level class. Application shouldn't use this directly.
   module SystemPosix

data/lib/gettext/locale_table_win32.rb

@@ -6,11 +6,11 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_table_win32.rb,v 1.4 2006/02/20 16:07:36 mutoh Exp $
+  $Id: locale_table_win32.rb,v 1.5 2006/06/11 15:36:20 mutoh Exp $
 =end
 
-module Locale #:nodoc:
-  module SystemWin32 #:nodoc:
+module Locale
+  module SystemWin32
     #LangID, locale name, code page
     LocaleTable = [
         [0x0000, "en", "CP1252"],

data/lib/gettext/locale_win32.rb

@@ -6,12 +6,12 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_win32.rb,v 1.13 2006/06/04 14:43:37 mutoh Exp $
+  $Id: locale_win32.rb,v 1.14 2006/06/11 15:36:20 mutoh Exp $
 =end
 
 require 'gettext/locale_table_win32'
 
-module Locale #:nodoc:
+module Locale
   # Locale::SystemWin32 module for win32.
   module SystemWin32
     extend Locale::System

data/lib/gettext/mo.rb

@@ -12,14 +12,16 @@
     of Ruby.  License of Ruby is included with Ruby distribution in
     the file "README".
 
-    $Id: mo.rb,v 1.6 2006/05/19 15:42:14 mutoh Exp $
+    $Id: mo.rb,v 1.7 2006/06/11 15:36:20 mutoh Exp $
 =end
 
 require 'gettext/iconv'
 
-class MOFile < Hash #:nodoc:
+class MOFile < Hash 
   class InvalidFormat < RuntimeError; end;
 
+  attr_reader :filename
+
   Header = Struct.new(:magic,
                       :revision,
                       :nstrings,
@@ -249,6 +251,7 @@ class MOFile < Hash #:nodoc:
   end
 
   def load_from_file(filename)
+    @filename = filename
     File.open(filename, 'rb'){|f| load_from_stream(f)}
   end
 

data/lib/gettext/parser/activerecord.rb

@@ -7,7 +7,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: activerecord.rb,v 1.9 2006/05/13 17:20:52 mutoh Exp $
+  $Id: activerecord.rb,v 1.11 2006/07/13 18:22:09 mutoh Exp $
 =end
 
 require 'gettext'
@@ -25,6 +25,7 @@ module GetText
       :db_yml => "config/database.yml",
       :db_mode => "development",
       :activerecord_classes => ["ActiveRecord::Base"],
+      :untranslate_columns => ["id"],
       :use_classname => true,
     }
 
@@ -42,10 +43,11 @@ module GetText
     # Sets some preferences to parse ActiveRecord files.
     #
     # * config: a Hash of the config. It can takes some values below:
-    #   * :use_classname: If true, the msgids of ActiveRecord become "ClassName|FieldName" (e.g. "Article|Title"). Otherwise the ClassName is not used (e.g. "Title"). Default is true.
-    #   * :db_yml: the path of database.yml. Default is "config/database.yml".
-    #   * :db_mode: the mode of the database. Default is "development"
-    #   * :activerecord_classes: an Array of the superclass of the models. The classes should be String value. Default is ["ActiveRecord::Base"]
+    #   * :use_classname - If true, the msgids of ActiveRecord become "ClassName|FieldName" (e.g. "Article|Title"). Otherwise the ClassName is not used (e.g. "Title"). Default is true.
+    #   * :db_yml - the path of database.yml. Default is "config/database.yml".
+    #   * :db_mode - the mode of the database. Default is "development"
+    #   * :activerecord_classes - an Array of the superclass of the models. The classes should be String value. Default is ["ActiveRecord::Base"]
+    #   * :untranslate_columns - an Array of the column names which is ignored as the msgid.
     #
     # "ClassName|FieldName" uses GetText.sgettext. So you don't need to translate the left-side of "|". 
     # See <Documents for Translators for more details(http://www.yotabanana.com/hiki/ruby-gettext-translate.html)>.
@@ -58,6 +60,10 @@ module GetText
       @ar_re = /class.*(#{@config[:activerecord_classes].join("|")})/
     end
 
+    def untranslate_column?(klass, columnname)
+      klass.untranslate?(columnname) || @config[:untranslate_columns].include?(columnname)
+    end
+
     def parse(file, targets = []) # :nodoc:
       old_constants = constants
       begin
@@ -70,20 +76,24 @@ module GetText
       loaded_constants.each do |classname|
 	klass = eval(classname)
 	if klass < ActiveRecord::Base
-	  add_target(targets, file, ::Inflector.singularize(klass.table_name.gsub(/_/, " ")))
-	  tablename = klass.class_name
-	  begin
-	    klass.columns.each do |column|
-	      if @config[:use_classname]
-		msgid = tablename + "|" +  klass.human_attribute_name(column.name)
-	      else
-		msgid = klass.human_attribute_name(column.name)
+	  unless klass.untranslate_all?
+	    add_target(targets, file, ::Inflector.singularize(klass.table_name.gsub(/_/, " ")))
+	    tablename = klass.class_name
+	    begin
+	      klass.columns.each do |column|
+		unless untranslate_column?(klass, column.name)
+		  if @config[:use_classname]
+		    msgid = tablename + "|" +  klass.human_attribute_name(column.name)
+		  else
+		    msgid = klass.human_attribute_name(column.name)
+		  end
+		  add_target(targets, file, msgid)
+		end
 	      end
-	      add_target(targets, file, msgid)
+	    rescue
+	      $stderr.puts _("No database is available.")
+	      $stderr.puts $!
 	    end
-	  rescue
-	    $stderr.puts _("No database is available.")
-	    $stderr.puts $!
 	  end
 	end
       end

data/lib/gettext/parser/glade.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: glade.rb,v 1.4 2006/02/22 16:42:41 mutoh Exp $
+  $Id: glade.rb,v 1.5 2006/06/11 15:36:20 mutoh Exp $
 =end
 
 require 'cgi'
@@ -67,17 +67,13 @@ module GetText
  
     def target?(file) # :nodoc:
       data = IO.readlines(file)
-      if XML_RE =~ data[0]
-	if GLADE_RE =~ data[1]
-	  return true
-	else
-	  if File.extname(file) == '.glade'
-	    raise _("%s is not glade-2.0 format.") % [file]
-	  end
-	  return false
-	end
+      if XML_RE =~ data[0] and GLADE_RE =~ data[1]
+	true
       else
-	return false
+	if File.extname(file) == '.glade'
+	  raise _("`%{file}' is not glade-2.0 format.") % {:file => file}
+	end
+	false
       end
     end
 

data/lib/gettext/parser/ruby.rb

@@ -9,7 +9,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: ruby.rb,v 1.6 2006/02/22 16:42:41 mutoh Exp $
+  $Id: ruby.rb,v 1.7 2006/06/11 15:36:20 mutoh Exp $
 =end
 
 require 'irb/ruby-lex.rb'
@@ -171,7 +171,7 @@ module GetText
           end
         else
           if msgid
-            key_existed = targets.assoc(msgid)
+            key_existed = targets.assoc(msgid.gsub(/\n/, '\n'))
             if key_existed 
               targets[targets.index(key_existed)] = key_existed <<
                 file_name + ":" + line_no
@@ -184,7 +184,6 @@ module GetText
         end
         targets
       end
-      
       targets
     end
 

data/lib/gettext/rails.rb

@@ -6,15 +6,14 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rails.rb,v 1.36 2006/06/04 14:43:37 mutoh Exp $
+  $Id: rails.rb,v 1.43 2006/07/16 15:19:17 mutoh Exp $
 =end
 
 require 'gettext/cgi'
 require 'active_record'
 require 'active_support'
 
-module GetText #:nodoc:
-  # = GetText for Ruby on Rails
+module GetText
   # GetText::Rails supports Ruby on Rails.
   # You add only 2 lines in your controller, all of the controller/view/models are
   # targeted the textdomain. 
@@ -32,6 +31,9 @@ module GetText #:nodoc:
     end
 
     module_function
+    # call-seq:
+    # bindtextdomain(domainname, options = {})
+    #
     # Bind a textdomain(#{path}/#{locale}/LC_MESSAGES/#{domainname}.mo) to your program. 
     # Notes the textdomain scope becomes all of the controllers/views/models in your app. 
     # This is different from normal GetText.bindtextomain.
@@ -43,16 +45,16 @@ module GetText #:nodoc:
     #
     # * domainname: the textdomain name.
     # * options: options as a Hash.
-    #    * :locale - the locale value such as "ja-JP". When the value is nil, 
-    #                locale is searched the order by this value > "lang" value of QUERY_STRING > 
-    #                params["lang"] > "lang" value of Cookie > HTTP_ACCEPT_LANGUAGE value 
-    #                > Default locale(en). 
-    #    * :path - the path to the mo-files. Default is "RAIL_ROOT/locale".
-    #    * :charset - the charset. Generally UTF-8 is recommanded.
-    #                 And the charset is set order by "the argument of bindtextdomain" 
-    #                 > HTTP_ACCEPT_CHARSET > Default charset(UTF-8).
-    #    * :with_model - false if you want to ignore ActiveRecord support.
-    #    * :with_helper - false if you want to ignore ApplicationHelper support.
+    #   * :locale - the locale value such as "ja-JP". When the value is nil, 
+    #     locale is searched the order by this value > "lang" value of QUERY_STRING > 
+    #     params["lang"] > "lang" value of Cookie > HTTP_ACCEPT_LANGUAGE value 
+    #     > Default locale(en). 
+    #   * :path - the path to the mo-files. Default is "RAIL_ROOT/locale".
+    #   * :charset - the charset. Generally UTF-8 is recommanded.
+    #     And the charset is set order by "the argument of bindtextdomain" 
+    #     > HTTP_ACCEPT_CHARSET > Default charset(UTF-8).
+    #   * :with_model - false if you want to ignore ActiveRecord support.
+    #   * :with_helper - false if you want to ignore ApplicationHelper support.
     #
     # Note: Don't use locale, charset, with_model argument(not in options). 
     # They are remained for backward compatibility.
@@ -126,8 +128,8 @@ module ActionController #:nodoc:
     # Bind a 'textdomain' to all of the controllers/views/models. Call this instead of GetText.bindtextdomain.
     # * textdomain: the textdomain
     # * options: options as a Hash.
-    #    * :charset - the output charset. Default is "UTF-8"
-    #    * :content_type - the content type. Default is "text/html"
+    #   * :charset - the output charset. Default is "UTF-8"
+    #   * :content_type - the content type. Default is "text/html"
     #
     # locale is searched the order by @params["lang"] > "lang" value of QUERY_STRING > 
     # "lang" value of Cookie > HTTP_ACCEPT_LANGUAGE value > Default locale(en). 
@@ -156,6 +158,12 @@ module ActionController #:nodoc:
       @@gettext_domainname = domainname
       @@gettext_content_type = opt[:content_type]
     end
+
+    # Gets the textdomain name of this controller.
+    def self.textdomainname
+      @@gettext_domainname
+    end
+
   end
 
   class TestRequest < AbstractRequest  #:nodoc:
@@ -168,6 +176,11 @@ module ActionController #:nodoc:
 end
 
 module ActiveRecord #:nodoc:
+  class Migration
+    extend GetText
+    include GetText
+  end
+  
   module ConnectionAdapters #:nodoc:
     # An abstract definition of a column in a table.
     class Column
@@ -178,46 +191,79 @@ module ActiveRecord #:nodoc:
       end
     end
   end
+
+  module Validations # :nodoc:
+    def self.append_features(base) # :nodoc:
+      super
+      base.extend ClassMethods
+      base.class_eval{
+	def gettext(str)  #:nodoc:
+	  _(str)
+	end
+	def self.human_attribute_name(attribute_key_name) #:nodoc:
+	  s_("#{self}|#{attribute_key_name.humanize}")
+	end
+
+	def self.human_attribute_table_name_for_error(table_name) #:nodoc:
+	  _(table_name.gsub(/_/, " "))
+	end
+      }
+    end
+
+    module ClassMethods #:nodoc:
+      @@custom_error_messages_d = {}
+      
+      # Very ugly but...
+      def validates_length_of(*attrs)  #:nodoc:
+	if attrs.last.is_a?(Hash)
+	  msg = attrs.last[:message] 
+	  if msg
+	    @@custom_error_messages_d[msg] = /#{Regexp.escape(msg).sub(/%d/, '(\d+)')}/ 
+	  end
+	end
+	validates_size_of(*attrs)
+      end
+      
+      def custom_error_messages_d  #:nodoc:
+	@@custom_error_messages_d
+      end
+    end
+    def custom_error_messages_d  #:nodoc:
+      self.class.custom_error_messages_d
+    end
+  end
   
   class Base
-    def self.human_attribute_name(attribute_key_name) #:nodoc:
-      s_("#{self}|#{attribute_key_name.humanize}")
+    include GetText::Rails
+    include Validations
+
+    @@gettext_untranslate = false
+    @@gettext_untranslate_columns = []
+
+    # Untranslate all of the tablename/fieldnames in this model class.
+    def self.untranslate_all
+      @@gettext_untranslate = true
     end
 
-    def self.human_attribute_table_name_for_error(table_name) #:nodoc:
-      _(table_name.gsub(/_/, " "))
+    # Returns true if "untranslate_all" is called. Otherwise false.
+    def self.untranslate_all?
+      @@gettext_untranslate
     end
 
-    @@error_message_title = nil
-    @@error_message_explanation = nil
-    
-    # call-seq:
-    # set_error_message_title(msg)
-    #
-    # Sets a your own title of error message dialog.
-    # * msg: [single_msg, plural_msg]. Usually you need to call this with Nn_().
-    # * Returns: [single_msg, plural_msg]
-    def self.set_error_message_title(msg, plural_msg = nil)
-      if msg.kind_of? Array
-        single_msg = msg[0]
-        plural_msg = msg[1]
-      else
-        single_msg = msg
-      end
-      @@error_message_title = [single_msg, plural_msg]
+    # Sets the untranslate columns.
+    # (e.g.) untranslate :foo, :bar, :baz
+    def self.untranslate(*w)
+      @@gettext_untranslate_columns += w.collect{|v| v.to_s}
     end
 
-    # Very ugly but...
-    @@custom_error_messages_d = {}
-    def self.validates_length_of(*attrs)  #:nodoc:
-      if attrs.last.is_a?(Hash)
-        msg = attrs.last[:message] 
-        @@custom_error_messages_d[msg] = /#{Regexp.escape(msg).sub(/%d/, '(\d+)')}/ if msg
-      end
-      validates_size_of(*attrs)
+    # Returns true if the column is set "untranslate".
+    # (e.g.) untranslate? :foo
+    def self.untranslate?(columnname)
+      @@gettext_untranslate_columns.include?(columnname)
     end
-    def custom_error_messages_d  #:nodoc:
-      @@custom_error_messages_d
+
+    def self.untranslate_data #:nodoc:
+      [@@gettext_untranslate, @@gettext_untranslate_columns]
     end
 
     def self.columns
@@ -230,46 +276,40 @@ module ActiveRecord #:nodoc:
       end
       @columns
     end
+    
+    # call-seq:
+    # set_error_message_title(msg)
+    #
+    # ((*Deprecated*)) 
+    # Use ActionView::Helpers::ActiveRecordHelper::L10n.set_error_message_title
+    # instead.
+    #
+    # Sets a your own title of error message dialog.
+    # * msg: [single_msg, plural_msg]. Usually you need to call this with Nn_().
+    # * Returns: [single_msg, plural_msg]
+    def self.set_error_message_title(msg, plural_msg = nil)
+      ActionView::Helpers::ActiveRecordHelper::L10n.set_error_message_title(msg, plural_msg)
+    end
 
     # call-seq:
     # set_error_message_explanation(msg)
     #
+    # ((*Deprecated*)) 
+    # Use ActionView::Helpers::ActiveRecordHelper::L10n.set_error_message_explanation
+    # instead.
+    #
     # Sets a your own explanation of the error message dialog.
     # * msg: [single_msg, plural_msg]. Usually you need to call this with Nn_().
     # * Returns: [single_msg, plural_msg]
     def self.set_error_message_explanation(msg, plural_msg = nil)
-      if msg.kind_of? Array
-        single_msg = msg[0]
-        plural_msg = msg[1]
-      else
-        single_msg = msg
-      end
-      @@error_message_explanation = [single_msg, plural_msg]
-    end
-
-    def error_message_title #:nodoc:
-      if @@error_message_title
-	[_(@@error_message_title[0]), _(@@error_message_title[1])]
-      else
-	nil
-      end
-    end
-    def error_message_explanation #:nodoc:
-      if @@error_message_explanation
-	[_(@@error_message_explanation[0]), _(@@error_message_explanation[1])]
-      else
-	nil
-      end
-    end
-
-    def gettext(str)  #:nodoc:
-      _(str)
+      ActionView::Helpers::ActiveRecordHelper::L10n.set_error_message_explanation(msg, plural_msg)
     end
   end
   
+  # activerecord-1.14.3/lib/active_record/validations.rb
   class Errors #:nodoc:
     include GetText
-    
+
     RE_FIELD_NAME = /%\{fn\}/  #:nodoc:
     
     # You need to define this here, because this values will be updated by application.
@@ -294,8 +334,8 @@ module ActiveRecord #:nodoc:
     }
     cattr_accessor :default_error_messages_d
 
-    def full_messages #:nodoc:
-      full_messages = []
+    def localize_error_messages # :nodoc:
+      errors = {}
       @errors.each_key do |attr|
         @errors[attr].each do |msg|
           next if msg.nil?
@@ -305,8 +345,8 @@ module ActiveRecord #:nodoc:
             if regexp =~ msg
               custom_msg = @base.gettext(key)
               custom_msg = _(msg) if custom_msg == msg 
-	            custom_msg = _(custom_msg) % $1.to_i
-	            break
+	      custom_msg = _(custom_msg) % $1.to_i
+	      break
             end
           end
           unless custom_msg
@@ -314,14 +354,36 @@ module ActiveRecord #:nodoc:
             custom_msg = _(msg) if custom_msg == msg 
           end
           if attr == "base"
-            full_messages << custom_msg
+            full_message = custom_msg
           elsif  RE_FIELD_NAME =~ custom_msg
-            full_messages << custom_msg % {:fn => @base.class.human_attribute_name(attr)}
+            full_message = custom_msg % {:fn => @base.class.human_attribute_name(attr)}
           else
-            full_messages << @base.class.human_attribute_name(attr) + " " + custom_msg
+            full_message = @base.class.human_attribute_name(attr) + " " + custom_msg
           end
+	  errors[attr] = full_message
         end
       end
+      errors
+    end
+
+    def on(attribute) #:nodoc:
+      errors = localize_error_messages
+      if errors[attribute.to_s].nil?
+        nil
+      elsif errors[attribute.to_s].length == 1
+        errors[attribute.to_s].first
+      else
+        errors[attribute.to_s]
+      end
+    end
+
+    def full_messages #:nodoc:
+      full_messages = []
+      errors = localize_error_messages
+      errors.each do |attr, msg|
+	next if msg.nil?
+	full_messages << msg
+      end
       full_messages
     end
   end
@@ -349,7 +411,8 @@ module ActionView #:nodoc:
       module L10n
 	# Separate namespace for textdomain
 	include GetText
-	extend GetText
+
+	bindtextdomain("rails")
 
 	@error_message_title = Nn_("%{num} error prohibited this %{record} from being saved", 
 				   "%{num} errors prohibited this %{record} from being saved")
@@ -357,9 +420,56 @@ module ActionView #:nodoc:
 					 "There were problems with the following fields:")
 
 	module_function
+	# call-seq:
+	# set_error_message_title(msgs)
+	#
+	# Sets a your own title of error message dialog.
+	# * msgs: [single_msg, plural_msg]. Usually you need to call this with Nn_().
+	# * Returns: [single_msg, plural_msg]
+	def set_error_message_title(msg, plural_msg = nil)
+	  if msg.kind_of? Array
+	    single_msg = msg[0]
+	    plural_msg = msg[1]
+	  else
+	    single_msg = msg
+	  end
+	  @error_message_title = [single_msg, plural_msg]
+	end
+	
+	# call-seq:
+	# set_error_message_explanation(msg)
+	#
+	# Sets a your own explanation of the error message dialog.
+	# * msg: [single_msg, plural_msg]. Usually you need to call this with Nn_().
+	# * Returns: [single_msg, plural_msg]
+	def set_error_message_explanation(msg, plural_msg = nil)
+	  if msg.kind_of? Array
+	    single_msg = msg[0]
+	    plural_msg = msg[1]
+	  else
+	    single_msg = msg
+	  end
+	  @error_message_explanation = [single_msg, plural_msg]
+	end
+	
+	def error_message_title #:nodoc:
+	  if @error_message_title
+	    [_(@error_message_title[0]), _(@error_message_title[1])]
+	  else
+	    nil
+	  end
+	end
+	def error_message_explanation #:nodoc:
+	  if @error_message_explanation
+	    [_(@error_message_explanation[0]), _(@error_message_explanation[1])]
+	  else
+	    nil
+	  end
+	end
+
 	def render_error_message(object, klass, record, count, options)
-	  message_title = object.error_message_title || @error_message_title
-	  message_explanation = object.error_message_explanation || @error_message_explanation
+	  message_title = @error_message_title
+	  message_explanation = @error_message_explanation
 	  
 	  klass.content_tag("div",
 			    klass.content_tag(
@@ -373,8 +483,6 @@ module ActionView #:nodoc:
 	end
 
 	def error_messages_for(object, object_name, klass, options = {})
-	  textdomain("rails")
-
 	  options = options.symbolize_keys
 
 	  if object && ! object.errors.empty?
@@ -389,6 +497,33 @@ module ActionView #:nodoc:
 	L10n.error_messages_for(object, object_name, self, options)
       end
     end
+
+    module DateHelper #:nodoc: all
+      include GetText
+      alias distance_of_time_in_words_without_locale distance_of_time_in_words #:nodoc:
+
+      bindtextdomain("rails")
+
+      # 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')]
+      MINUTES = [/^(\d+) minutes?$/, Nn_('1 minute', '%{num} minutes')]
+      HOURS   = [/^about (\d+) hours?$/, Nn_('about 1 hour', 'about %{num} hours')]
+      DAYS    = [/^(\d+) days?$/, Nn_('1 day', '%{num} days')]
+
+      def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false)
+	msg = distance_of_time_in_words_without_locale(from_time, to_time, include_seconds)
+	match = false
+	[MINUTES, HOURS, DAYS].each do |regexp, nn|
+	  if regexp =~ msg
+	    match = true
+	    msg = n_(nn, $1.to_i) % {:num => $1}
+	    break
+	  end
+	end
+	match ? msg : _(msg)
+      end
+    end
   end
 end