gettext 1.7.0 → 1.8.0

data/lib/gettext/active_record.rb

@@ -0,0 +1,275 @@
+=begin
+  gettext/active_record.rb - GetText for ActiveRecord
+
+  Copyright (C) 2006  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 $
+=end
+require 'gettext'
+require 'active_record'
+
+module ActiveRecord #:nodoc:
+  class Migration
+    extend GetText
+    include GetText
+  end
+  
+  module ConnectionAdapters #:nodoc:
+    # An abstract definition of a column in a table.
+    class Column
+      attr_accessor :table_class
+      alias :human_name_witout_localized :human_name 
+
+      def human_name
+        table_class.human_attribute_name(@name)
+      end
+    end
+  end
+
+  module Validations # :nodoc:
+    def self.real_included(base)
+      base.extend ClassMethods
+      base.class_eval{
+	include GetText
+	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
+if ActiveRecord::VERSION::STRING >= "1.14.5"
+    def self.included(base) # :nodoc:
+      super
+      real_included(base)
+    end
+else
+    def self.append_features(base) # :nodoc:
+      super
+      real_included(base)
+    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] || 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
+	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
+    include GetText
+    include Validations
+
+    @@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
+
+    # 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
+
+    def self.untranslate_data #:nodoc:
+      [@@gettext_untranslate[self], @@gettext_untranslate_columns[self] || []]
+    end
+
+    def self.columns
+      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
+    
+    # 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)
+    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)
+      bindtextdomain("rails")
+    end
+
+    def @@default_error_messages.[]=(id, msg) #:nodoc:
+      @@default_error_messages.update({id => msg})
+      if [:message, :too_long, :too_short, :wrong_length].include?(id)
+	@@default_error_messages_d[msg] = /\A#{Regexp.escape(msg).sub(/%d/, '(\d+)')}\Z/ 
+      end
+    end    
+
+    # You need to define this here, because this values will be updated by application.
+    default_error_messages.update(
+				  :inclusion => N_("%{fn} is not included in the list"),
+				  :exclusion => N_("%{fn} is reserved"),
+				  :invalid => N_("%{fn} is invalid"),
+				  :confirmation => N_("%{fn} doesn't match confirmation"),
+				  :accepted  => N_("%{fn} must be accepted"),
+				  :empty => N_("%{fn} can't be empty"),
+				  :blank => N_("%{fn} can't be blank"),
+				  :too_long => N_("%{fn} is too long (maximum is %d characters)"),  
+				  :too_short => N_("%{fn} is too short (minimum is %d characters)"), 
+				  :wrong_length => N_("%{fn} is the wrong length (should be %d characters)"),
+				  :taken => N_("%{fn} has already been taken"),
+				  :not_a_number => N_("%{fn} is not a number")
+				  )
+    @@default_error_messages_d = {
+      default_error_messages[:too_long] => /#{Regexp.escape(default_error_messages[:too_long]).sub(/%d/, '(\d+)')}/,
+      default_error_messages[:too_short] => /#{Regexp.escape(default_error_messages[:too_short]).sub(/%d/, '(\d+)')}/,
+      default_error_messages[:wrong_length] => /#{Regexp.escape(default_error_messages[:wrong_length]).sub(/%d/, '(\d+)')}/,
+    }
+    cattr_accessor :default_error_messages_d
+
+    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
+      errors
+    end
+
+    # Returns error messages.
+    # * Returns nil, if no errors are associated with the specified attribute.
+    # * Returns the error message, if one error is associated with the specified attribute.
+    # * Returns an array of error messages, if more than one error is associated with the specified attribute.
+    # And for GetText,
+    # * 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)
+      # 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
+    end
+
+    # 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
+      full_messages = []
+      errors = localize_error_messages
+      errors.each_key do |attr|
+        errors[attr].each do |msg|
+	  next if msg.nil?
+	  full_messages << msg
+	end
+      end
+      full_messages
+    end
+  end
+end
+

data/lib/gettext/container.rb

@@ -11,11 +11,7 @@
 
 require 'gettext'
 
-<<<<<<< container.rb
-module GetText
-=======
 module GetText 
->>>>>>> 1.6
   # Deprecated. You don't need this. Use GetText instead.
   module Container
     include GetText

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.11 2006/03/15 16:34:05 mutoh Exp $
+  $Id: locale.rb,v 1.12 2006/08/17 17:24:18 mutoh Exp $
 =end
 
 require 'gettext/locale_object'
@@ -147,7 +147,8 @@ module Locale
   # * charset: charset as String or nil
   # * Returns: a Locale::Object.
   #
-  # Sets a default locale. This function is an alias of Locale.set_default.
+  # Sets a default locale. This function is an alias of Locale.set_default with
+  # calling set_current(nil).
   #
   # *Notice*: Locale.set(lctype, locale) is deprecated.
   def set(lang, country = nil, charset = nil)
@@ -214,4 +215,10 @@ module Locale
     set_current(nil)
     self
   end
+
+  # Gets the current system module. This is used for debugging.
+  # * Returns: the system module.
+  def system_module
+    @@locale_system_module
+  end
 end

data/lib/gettext/locale_cgi.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_cgi.rb,v 1.4 2006/06/11 15:36:20 mutoh Exp $
+  $Id: locale_cgi.rb,v 1.6 2006/09/10 15:08:32 mutoh Exp $
 =end
 
 
@@ -26,15 +26,16 @@ module Locale
       if ret = cgi_["lang"] and ret.size > 0
       elsif ret = cgi_.cookies["lang"][0]
       elsif lang = cgi_.accept_language and lang.size > 0
-	ret = lang.split(/,|;/).first
+	num = lang.index(/;|,/)
+	ret = num ? lang[0, num] : lang
       else
 	ret = @@default_locale.to_str
       end
  
       codesets = cgi_.accept_charset
       if codesets and codesets.size > 0
-	ary = codesets.split(',')
-	codeset = ary[0]
+	num = codesets.index(',')
+	codeset = num ? codesets[0, num] : codesets
 	codeset = @@default_locale.charset if codeset == "*"
       else
 	codeset = @@default_locale.charset

data/lib/gettext/locale_object.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_object.rb,v 1.8 2006/06/11 15:36:20 mutoh Exp $
+  $Id: locale_object.rb,v 1.10 2006/09/10 15:08:32 mutoh Exp $
 =end
 
 
@@ -53,6 +53,7 @@ module Locale
     #  "zh_Hant" => ["zh", nil, nil, "Hant", nil]
     #  "zh_Hant_HK" => ["zh", "HK", nil, "Hant", nil]
     #  "de_DE@collation=phonebook,currency=DDM" => ["de", "DE", nil, nil, "collation=phonebook,currency=DDM"]
+
     def self.parse(locale_name)
       lang_charset, modifier = locale_name.split(/@/)
       lang, charset = lang_charset.split(/\./)
@@ -60,10 +61,10 @@ module Locale
       language = language ? language.downcase : nil
       language = "en" if language == "c" || language == "posix"
       if country
-	if country =~ /[A-Z][a-z]+/  #Latn => script
+	if country =~ /\A[A-Z][a-z]+\Z/  #Latn => script
 	  tmp = script
 	  script = country
-	  if tmp =~ /[A-Z]+/ # US => country
+	  if tmp =~ /\A[A-Z]+\Z/ #US => country
 	    country = tmp
 	  else
 	    country = nil
@@ -71,7 +72,7 @@ module Locale
 	  end
 	else
 	  country = country.upcase
-	  if script !~ /[A-Z][a-z]+/ #Latn => script
+	  if script !~ /\A[A-Z][a-z]+\Z/ #Latn => script
 	    variant = script
 	    script = nil
 	  end

data/lib/gettext/parser/{activerecord.rb → active_record.rb}

@@ -1,13 +1,13 @@
 #!/usr/bin/ruby
 =begin
-  parser/activerecord.rb - parser for ActiveRecord
+  parser/active_record.rb - parser for ActiveRecord
 
   Copyright (C) 2005, 2006  Masao Mutoh
  
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: activerecord.rb,v 1.11 2006/07/13 18:22:09 mutoh Exp $
+  $Id: active_record.rb,v 1.2 2006/08/28 23:54:53 mutoh Exp $
 =end
 
 require 'gettext'
@@ -48,6 +48,13 @@ module GetText
     #   * :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.
+    #   * :adapter - the options for ActiveRecord::Base.establish_connection. If this value is set, :db_yml option is ignored.
+    #   * :host - ditto
+    #   * :username - ditto
+    #   * :password - ditto
+    #   * :database - ditto
+    #   * :socket - ditto
+    #   * :encoding - ditto
     #
     # "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)>.
@@ -75,15 +82,17 @@ module GetText
       loaded_constants = constants - old_constants
       loaded_constants.each do |classname|
 	klass = eval(classname)
-	if klass < ActiveRecord::Base
+	if klass.is_a?(Class) && klass < ActiveRecord::Base
 	  unless klass.untranslate_all?
 	    add_target(targets, file, ::Inflector.singularize(klass.table_name.gsub(/_/, " ")))
-	    tablename = klass.class_name
+	    unless klass.class_name == classname
+	      add_target(targets, file, ::Inflector.singularize(classname.gsub(/_/, " ").downcase))
+	    end
 	    begin
 	      klass.columns.each do |column|
 		unless untranslate_column?(klass, column.name)
 		  if @config[:use_classname]
-		    msgid = tablename + "|" +  klass.human_attribute_name(column.name)
+		    msgid = classname + "|" +  klass.human_attribute_name(column.name)
 		  else
 		    msgid = klass.human_attribute_name(column.name)
 		  end
@@ -114,28 +123,36 @@ module GetText
       targets
     end
 
+    @@db_loaded = nil
     def target?(file) # :nodoc:
       init(nil) unless @ar_re
       data = IO.readlines(file)
       data.each do |v|
 	if @ar_re =~ v
-	  unless @db
+	  unless @@db_loaded
 	    begin
 	      require 'rubygems'
+	      require_gem 'activerecord'
 	    rescue LoadError
 	      $stderr.puts _("rubygems are not found.") if $DEBUG
 	    end
 	    require 'active_record'
-	    begin
-	      yml = YAML.load(ERB.new(IO.read(@config[:db_yml])).result)
-	    rescue
-	      return false
+	    require 'gettext/active_record'
+	    if @config[:adapter]
+	      ActiveRecord::Base.establish_connection(@config)
+	    else
+	      begin
+		yml = YAML.load(ERB.new(IO.read(@config[:db_yml])).result)
+	      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
-	    ENV["RAILS_ENV"] = @config[:db_mode]
-	    require_rails 'config/boot.rb'
-	    require_rails 'config/environment.rb'
-	    require_rails 'app/controllers/application.rb'
 	  end
+	  @@db_loaded = true
 	  return true
 	end
       end