gettext 1.8.0-mswin32 → 1.9.0-mswin32

data/lib/gettext/active_record.rb

@@ -1,12 +1,12 @@
 =begin
   gettext/active_record.rb - GetText for ActiveRecord
 
-  Copyright (C) 2006  Masao Mutoh
+  Copyright (C) 2006,2007  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: active_record.rb,v 1.9 2006/09/10 15:08:32 mutoh Exp $
+  $Id: active_record.rb,v 1.14 2007/01/21 15:16:06 mutoh Exp $
 =end
 require 'gettext'
 require 'active_record'
@@ -16,6 +16,19 @@ module ActiveRecord #:nodoc:
     extend GetText
     include GetText
   end
+
+  class RecordInvalid < ActiveRecordError #:nodoc:
+    attr_reader :record
+    include GetText
+    bindtextdomain("rails")
+
+    def initialize(record)
+      @record = record
+      super(_("Validation failed: %{error_messages}") % 
+            {:error_messages => @record.errors.full_messages.join(", ")})
+    end
+  end
+
   
   module ConnectionAdapters #:nodoc:
     # An abstract definition of a column in a table.
@@ -46,12 +59,13 @@ module ActiveRecord #:nodoc:
 	end
       }
     end
-if ActiveRecord::VERSION::STRING >= "1.14.5"
+if respond_to? :included
     def self.included(base) # :nodoc:
       super
       real_included(base)
     end
 else
+    # Since rails-1.2.0.
     def self.append_features(base) # :nodoc:
       super
       real_included(base)
@@ -61,7 +75,7 @@ end
     module ClassMethods #:nodoc:
       @@custom_error_messages_d = {}
       # Very ugly but...
-      def validates_length_of(*attrs)  #:nodoc:
+      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
@@ -70,6 +84,8 @@ end
 	end
 	validates_size_of(*attrs)
       end
+      alias_method_chain :validates_length_of, :gettext
+
       def custom_error_messages_d  #:nodoc:
 	@@custom_error_messages_d
       end
@@ -86,88 +102,90 @@ end
     @@gettext_untranslate = Hash.new(false)
     @@gettext_untranslate_columns = {}
 
-    # Untranslate all of the tablename/fieldnames in this model class.
-    def self.untranslate_all
-      @@gettext_untranslate[self] = true
-    end
-
-    # Returns true if "untranslate_all" is called. Otherwise false.
-    def self.untranslate_all?
-      @@gettext_untranslate[self]
-    end
-
-    # Sets the untranslate columns.
-    # (e.g.) untranslate :foo, :bar, :baz
-    def self.untranslate(*w)
-      ary = @@gettext_untranslate_columns[self] || []
-      ary += w.collect{|v| v.to_s}
-      @@gettext_untranslate_columns[self] = ary
-    end
+    class << self
+      # Untranslate all of the tablename/fieldnames in this model class.
+      def untranslate_all
+        @@gettext_untranslate[self] = true
+      end
 
-    # Returns true if the column is set "untranslate".
-    # (e.g.) untranslate? :foo
-    def self.untranslate?(columnname)
-      ary = @@gettext_untranslate_columns[self] || []
-      ary.include?(columnname)
-    end
+      # Returns true if "untranslate_all" is called. Otherwise false.
+      def untranslate_all?
+        @@gettext_untranslate[self]
+      end
 
-    def self.untranslate_data #:nodoc:
-      [@@gettext_untranslate[self], @@gettext_untranslate_columns[self] || []]
-    end
+      # Sets the untranslate columns.
+      # (e.g.) untranslate :foo, :bar, :baz
+      def untranslate(*w)
+        ary = @@gettext_untranslate_columns[self] || []
+        ary += w.collect{|v| v.to_s}
+        @@gettext_untranslate_columns[self] = ary
+      end
+      
+      # Returns true if the column is set "untranslate".
+      # (e.g.) untranslate? :foo
+      def untranslate?(columnname)
+        ary = @@gettext_untranslate_columns[self] || []
+        ary.include?(columnname)
+      end
 
-    def self.columns
-      unless defined? @columns
-	@columns = nil 
+      def untranslate_data #:nodoc:
+        [@@gettext_untranslate[self], @@gettext_untranslate_columns[self] || []]
       end
-      unless @columns
-	@columns = connection.columns(table_name, "#{name} Columns")
-	@columns.each {|column| 
-	  column.table_class = self
-	  column.primary = column.name == primary_key
-	}
+
+      def columns_with_gettext
+        unless defined? @columns
+          @columns = nil 
+        end
+        unless @columns
+          @columns = connection.columns(table_name, "#{name} Columns")
+          @columns.each {|column| 
+            column.table_class = self
+            column.primary = column.name == primary_key
+          }
+        end
+        @columns
       end
-      @columns
-    end
+      alias_method_chain :columns, :gettext
     
-    # 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)
-      ActionView::Helpers::ActiveRecordHelper::L10n.set_error_message_explanation(msg, plural_msg)
+      # 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 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 set_error_message_explanation(msg, plural_msg = nil)
+        ActionView::Helpers::ActiveRecordHelper::L10n.set_error_message_explanation(msg, plural_msg)
+      end
     end
   end
-  
+
   # activerecord-1.14.3/lib/active_record/validations.rb
   class Errors #:nodoc:
     include GetText
-    alias initialize_without_locale initialize #:nodoc:
-    alias full_messages_without_localized full_messages #:nodoc:
 
-    def initialize(base) # :nodoc:
-      initialize_without_locale(base)
+    def initialize_with_gettext(base) # :nodoc:
+      initialize_without_gettext(base)
       bindtextdomain("rails")
     end
+    alias_method_chain :initialize, :gettext
 
     def @@default_error_messages.[]=(id, msg) #:nodoc:
       @@default_error_messages.update({id => msg})
@@ -198,40 +216,42 @@ end
     }
     cattr_accessor :default_error_messages_d
 
+    def localize_error_message(attr, msg, append_field) # :nodoc:
+      custom_msg = nil
+      #Ugly but... :-<
+      @@default_error_messages_d.dup.merge(@base.custom_error_messages_d).each do |key, regexp|
+        if regexp =~ msg
+          custom_msg = @base.gettext(key)
+          custom_msg = _(msg) if custom_msg == msg 
+            custom_msg = _(custom_msg) % $1.to_i
+          break
+        end
+      end
+
+      unless custom_msg
+        custom_msg = @base.gettext(msg)
+        custom_msg = _(msg) if custom_msg == msg 
+      end
+      if attr == "base"
+        full_message = custom_msg
+      elsif /%\{fn\}/ =~ custom_msg
+        full_message = custom_msg % {:fn => @base.class.human_attribute_name(attr)}
+      elsif append_field
+        full_message = @base.class.human_attribute_name(attr) + " " + custom_msg
+      else
+        full_message = custom_msg
+      end
+      full_message
+    end
+
     def localize_error_messages(append_field = true) # :nodoc:
       # e.g.) foo field: "%{fn} foo" => "Foo foo", "foo" => "Foo foo". 
       errors = {}
-      @errors.each_key do |attr|
-        @errors[attr].each do |msg|
-          next if msg.nil?
-          custom_msg = nil
-          #Ugly but... :-<
-          @@default_error_messages_d.dup.merge(@base.custom_error_messages_d).each do |key, regexp|
-            if regexp =~ msg
-              custom_msg = @base.gettext(key)
-              custom_msg = _(msg) if custom_msg == msg 
-	      custom_msg = _(custom_msg) % $1.to_i
-	      break
-            end
-          end
-
-          unless custom_msg
-            custom_msg = @base.gettext(msg)
-            custom_msg = _(msg) if custom_msg == msg 
-          end
-          if attr == "base"
-            full_message = custom_msg
-          elsif /%\{fn\}/ =~ custom_msg
-            full_message = custom_msg % {:fn => @base.class.human_attribute_name(attr)}
-          elsif append_field
-            full_message = @base.class.human_attribute_name(attr) + " " + custom_msg
-          else
-            full_message = custom_msg
-          end
-	  errors[attr] ||= []
-	  errors[attr] << full_message
-        end
-      end
+      each {|attr, msg|
+        next if msg.nil?
+        errors[attr] ||= []
+        errors[attr] << localize_error_message(attr, msg, append_field)
+      }
       errors
     end
 
@@ -243,23 +263,19 @@ end
     # * If the error messages include %{fn}, it returns formatted text such as "foo %{fn}" => "foo Field"
     # * else, the error messages are prepended the field name such as "foo" => "foo" (Same as default behavior).
     # Note that this behaviour is different from full_messages.
-    def on(attribute)
+    def on_with_gettext(attribute)
       # e.g.) foo field: "%{fn} foo" => "Foo foo", "foo" => "foo". 
-      errors = localize_error_messages(false)
-      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
+      errors = localize_error_messages(false)[attribute.to_s]
+      return nil if errors.nil?
+      errors.size == 1 ? errors.first : errors
     end
+    alias_method_chain :on, :gettext 
 
     # Returns all the full error messages in an array.
     # * If the error messages include %{fn}, it returns formatted text such as "foo %{fn}" => "foo Field"
     # * else, the error messages are prepended the field name such as "foo" => "Field foo" (Same as default behavior).
     # As L10n, first one is recommanded because the order of subject,verb and others are not same in languages.
-    def full_messages
+    def full_messages_with_gettext
       full_messages = []
       errors = localize_error_messages
       errors.each_key do |attr|
@@ -270,6 +286,7 @@ end
       end
       full_messages
     end
+    alias_method_chain :full_messages, :gettext 
   end
 end
 

data/lib/gettext/erb.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: erb.rb,v 1.3 2006/06/04 14:43:37 mutoh Exp $
+  $Id: erb.rb,v 1.4 2006/12/06 16:39:58 mutoh Exp $
 =end
 
 require 'erb'
@@ -34,7 +34,7 @@ module GetText
   # This module is an example for template engines such as ERB. 
   # You can implement another implementation easily to read gettext/erb.rb.
   module ErbContainer
-    include Container
+    include GetText
 
     # Evaluates ERB source(String) in the instance and returns the result HTML.
     #

data/lib/gettext/locale.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale.rb,v 1.12 2006/08/17 17:24:18 mutoh Exp $
+  $Id: locale.rb,v 1.13 2006/12/03 16:26:59 mutoh Exp $
 =end
 
 require 'gettext/locale_object'
@@ -56,14 +56,20 @@ module Locale
   @@current = nil
 
   module_function
-  # Sets the default locale (Locale::Object).
+  # Sets the default locale (Locale::Object or String(such as ja_JP.eucjP)).
   #
   # * locale: the default locale
   # * Returns: self.
   def set_default(locale)
-    @@default = locale
-    if @@default
-      @@default.charset ||= @@locale_system_module.get_charset(locale)
+    if locale
+      if locale.kind_of? Locale::Object
+        @@default = locale
+      else
+        @@default = Locale::Object.new(locale)
+      end
+      @@default.charset ||= @@locale_system_module.get_charset(@@default)
+    else
+      @@default = nil
     end
     self
   end

data/lib/gettext/locale_cgi.rb

@@ -6,13 +6,13 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_cgi.rb,v 1.6 2006/09/10 15:08:32 mutoh Exp $
+  $Id: locale_cgi.rb,v 1.7 2006/12/14 16:35:57 mutoh Exp $
 =end
 
 
 module Locale
-  # Locale::System module for Default OS (Unix)
-  # This is low-level class. Application shouldn't use this directly.
+  # Locale::System module for CGI.
+  # This is a low-level class. Application shouldn't use this directly.
   module SystemCGI
     @@default_locale = Locale::Object.new("en", nil, "UTF-8")
     @@cgi = nil

data/lib/gettext/locale_posix.rb

@@ -6,13 +6,13 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_posix.rb,v 1.4 2006/06/11 15:36:20 mutoh Exp $
+  $Id: locale_posix.rb,v 1.5 2006/12/14 16:35:57 mutoh Exp $
 =end
 
 
 module Locale 
   # Locale::SystemPosix module for Posix OS (Unix)
-  # This is low-level class. Application shouldn't use this directly.
+  # This is a low-level class. Application shouldn't use this directly.
   module SystemPosix
     extend Locale::System
     module_function

data/lib/gettext/locale_win32.rb

@@ -6,13 +6,14 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_win32.rb,v 1.14 2006/06/11 15:36:20 mutoh Exp $
+  $Id: locale_win32.rb,v 1.15 2006/12/14 16:35:57 mutoh Exp $
 =end
 
 require 'gettext/locale_table_win32'
 
 module Locale
   # Locale::SystemWin32 module for win32.
+  # This is a low-level class. Application shouldn't use this directly.
   module SystemWin32
     extend Locale::System
 

data/lib/gettext/parser/active_record.rb

@@ -7,7 +7,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: active_record.rb,v 1.2 2006/08/28 23:54:53 mutoh Exp $
+  $Id: active_record.rb,v 1.5 2007/01/21 15:16:06 mutoh Exp $
 =end
 
 require 'gettext'
@@ -72,16 +72,17 @@ module GetText
     end
 
     def parse(file, targets = []) # :nodoc:
-      old_constants = constants
+      GetText.locale = "en"
+      old_constants = Object.constants
       begin
-        eval(open(file).read)
+        eval(open(file).read, TOPLEVEL_BINDING)
       rescue
         $stderr.puts _("Ignored '%{file}'. Solve dependencies first.") % {:file => file}
         $stderr.puts $! 
       end
-      loaded_constants = constants - old_constants
+      loaded_constants = Object.constants - old_constants
       loaded_constants.each do |classname|
-	klass = eval(classname)
+	klass = eval(classname, TOPLEVEL_BINDING)
 	if klass.is_a?(Class) && klass < ActiveRecord::Base
 	  unless klass.untranslate_all?
 	    add_target(targets, file, ::Inflector.singularize(klass.table_name.gsub(/_/, " ")))
@@ -114,9 +115,10 @@ module GetText
     end
 
     def add_target(targets, file, msgid) # :nodoc:
+      file_lineno = "#{file}:-"
       key_existed = targets.assoc(msgid)
-      if key_existed 
-	targets[targets.index(key_existed)] = key_existed << "#{file}:-"
+      if key_existed and ! targets[targets.index(key_existed)].include?(file_lineno)
+	targets[targets.index(key_existed)] = key_existed << file_lineno
       else
 	targets << [msgid, "#{file}:-"]
       end
@@ -132,12 +134,24 @@ module GetText
 	  unless @@db_loaded
 	    begin
 	      require 'rubygems'
-	      require_gem 'activerecord'
 	    rescue LoadError
 	      $stderr.puts _("rubygems are not found.") if $DEBUG
 	    end
-	    require 'active_record'
-	    require 'gettext/active_record'
+	    begin
+	      ENV["RAILS_ENV"] = @config[:db_mode]
+	      require 'config/boot.rb'
+	      require 'config/environment.rb'
+	      require 'app/controllers/application.rb'
+	    rescue LoadError
+	      require_rails 'rubygems'
+              if Kernel.respond_to? :gem
+                gem 'activerecord'
+              else
+                require_gem 'activerecord'
+              end
+	      require_rails 'active_record'
+	      require_rails 'gettext/active_record'
+	    end
 	    if @config[:adapter]
 	      ActiveRecord::Base.establish_connection(@config)
 	    else
@@ -146,10 +160,6 @@ module GetText
 	      rescue
 		return false
 	      end
-	      ENV["RAILS_ENV"] = @config[:db_mode]
-	      require_rails 'config/boot.rb'
-	      require_rails 'config/environment.rb'
-	      require_rails 'app/controllers/application.rb'
 	    end
 	  end
 	  @@db_loaded = true