gettext 1.6.0-mswin32 → 1.7.0-mswin32

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
 

data/lib/gettext/rgettext.rb

@@ -18,14 +18,14 @@ require 'rbconfig'
 
 module GetText
 
-  module RGetText # :nodoc:
+  module RGetText #:nodoc:
     extend GetText
 
     bindtextdomain("rgettext")
 
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2006/06/04 15:07:34 $)[1]
+    DATE = %w($Date: 2006/06/11 15:36:20 $)[1]
     MAX_LINE_LEN = 70
 
     @ex_parsers = []