gettext 1.0.0 → 1.1.0

data/lib/gettext/rails.rb

@@ -6,29 +6,54 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rails.rb,v 1.1 2005/08/27 18:52:20 mutoh Exp $
+  $Id: rails.rb,v 1.8 2005/12/28 17:32:58 mutoh Exp $
 =end
 
 require 'gettext'
 require 'gettext/cgi'
+require 'active_record'
+require 'active_support'
 
 module GetText
   module Rails
     include GetText
 
+    Rails = ::Rails
+
     alias :_bindtextdomain :bindtextdomain
 
-    def bindtextdomain(domainname, _cgi = nil, locale = nil, charset = "UTF-8")
+    def bindtextdomain(domainname, _cgi = nil, locale = nil, charset = nil, with_model = true)
       set_cgi(_cgi) if _cgi
       @gettext_container_domainname = domainname
       path = File.join(RAILS_ROOT, "locale")
       _bindtextdomain(domainname, path, locale, charset)
+
+      bindtextdomain_to(ActiveRecord::Base, domainname) if with_model
+    end
+
+    def bindtextdomain_to(klass, domainname)
+      klass.class_eval {
+	include GetText::Rails
+	extend GetText::Rails
+	textdomain(domainname)
+
+	def self.human_attribute_name(attribute_key_name)
+	  ret = ""
+	  if self == ActiveRecord::Base
+	    #Table name
+	    ret = _(attribute_key_name.humanize)
+	  else
+	    ret = s_("#{self}|#{attribute_key_name.humanize}")
+	  end
+          ret
+	end
+      }
     end
 
     def callersrc
+      @gettext_container_domainname = nil unless defined? @gettext_container_domainname
       @gettext_container_domainname
     end
-
   end
 end
 
@@ -36,5 +61,138 @@ module ActionController
   class Base
     helper GetText::Rails
     include GetText::Rails
+    extend GetText::Rails
+
+    @@gettext_domainname = nil
+    @@gettext_content_type = nil
+
+    prepend_before_filter :init_gettext
+
+    def init_gettext_main
+      bindtextdomain(@@gettext_domainname, request.cgi)  #You need to pass CGI object first.
+      @headers["Content-Type"] = "#{@@gettext_content_type}; charset=#{GetText.output_charset}"
+    end
+
+    def init_gettext
+      init_gettext_main
+      ActiveRecord::Errors.class_eval{
+	# You need to call bindtextdomain here because ActiveRecord::Errors doesn't know
+	# what locale is used in.
+	GetText.bindtextdomain("rails")
+      }
+    end
+    
+    def self.init_gettext(domainname, charset = "UTF-8", content_type = "text/html")
+      GetText.output_charset = charset
+      @@gettext_domainname = domainname
+      @@gettext_content_type = content_type
+    end
+  end
+end
+
+module ActiveRecord
+  class Errors
+    include GetText
+    extend GetText
+    
+    RE_FIELD_NAME = /%\{fn\}/
+
+    # 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 (max is %d characters)"),  
+				  :too_short => N_("%{fn} is too short (min 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 = {
+      :too_long => default_error_messages[:too_long],
+      :too_short => default_error_messages[:too_short],
+      :wrong_length => default_error_messages[:wrong_length]
+    }
+
+    def self.convert_validates_messages_of_validates_length_of
+      default_error_messages[:too_long] = _(@@default_error_messages_d[:too_long])
+      default_error_messages[:too_short] = _(@@default_error_messages_d[:too_short])
+      default_error_messages[:wrong_length] = _(@@default_error_messages_d[:wrong_length])      
+    end
+
+    def full_messages
+      full_messages = []
+
+      @errors.each_key do |attr|
+	@errors[attr].each do |msg|
+	  next if msg.nil?
+	  if attr == "base"
+	    full_messages << _(msg)
+	  elsif  RE_FIELD_NAME =~ msg
+	    full_messages << _(msg) % {:fn => @base.class.human_attribute_name(attr)}
+	  else
+	    full_messages << @base.class.human_attribute_name(attr) + " " + msg
+	  end
+	end
+      end
+      full_messages
+    end
   end
+
+  module Validations
+    module ClassMethods
+      alias :_validates_length_of :validates_length_of
+      def validates_length_of(*attrs)
+	ActiveRecord::Errors.convert_validates_messages_of_validates_length_of
+	_validates_length_of(*attrs)
+      end
+    end
+  end
+end
+
+
+module ActionView
+  module Helpers
+    module ActiveRecordHelper
+      module L10n
+	# Separate namespace for textdomain
+	include GetText
+	extend GetText
+	module_function
+	def error_messages_for(object, klass, options = {})
+	  textdomain("rails")
+	  options = options.symbolize_keys
+  
+	  unless object.errors.empty?
+	    count = object.errors.count
+	    record = ActiveRecord::Base.human_attribute_name(object.class.to_s)
+	    klass.content_tag("div",
+			klass.content_tag(
+				    options[:header_tag] || "h2",
+					  n_("%{num} error prohibited this %{record} from being saved", 
+					     "%{num} errors prohibited this %{record} from being saved", count) %
+					  {:num => count, :record => record}) +
+			klass.content_tag("p", n_("There were problems with the following field:", 
+					    "There were problems with the following fields:", count)) +
+			klass.content_tag("ul", object.errors.full_messages.collect { |msg| klass.content_tag("li", msg) }),
+			"id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
+			)
+	  end
+	end
+      end
+      def error_messages_for(object_name, options = {})
+	object = instance_variable_get("@#{object_name}")
+	L10n.error_messages_for(object, self, options)
+      end
+    end
+  end
+end
+
+Rails::Info.property("GetText version") do 
+  GetText::VERSION 
 end

data/lib/gettext/rgettext.rb

@@ -24,23 +24,34 @@ module GetText
 
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2005/09/02 19:32:48 $)[1]
+    DATE = %w($Date: 2005/12/25 11:43:20 $)[1]
     MAX_LINE_LEN = 70
 
-    EX_PARSERS = [
+    @ex_parsers = []
+    [
       ["glade.rb", "GladeParser"],
       ["erb.rb", "ErbParser"],
+      ["activerecord.rb", "ActiveRecordParser"],
+#      ["ripper.rb", "RipperParser"],
       ["ruby.rb", "RubyParser"] # Default parser.
-    ]
-
-    EX_PARSERS.each do |f, _|
-      require File.join("gettext/parser/#{f}")
+    ].each do |f, klass|
+      begin
+	require File.join("gettext/parser/#{f}")
+	@ex_parsers << GetText.const_get(klass)
+      rescue
+	$stderr.puts _("'%{klass}' is ignored.") % {:klass => klass}
+	$stderr.puts $! if $DEBUG
+      end
     end
 
     module_function
 
     def generate_pot_header
-      time = Time.now.strftime("%Y-%m-%d %H:%M%z")
+      time = Time.now.strftime("%Y-%m-%d %H:%M")
+      off = Time.now.utc_offset
+      sign = off <= 0 ? '-' : '+'
+      time += sprintf('%s%02d%02d', sign, *(off.abs / 60).divmod(60))
+
       %Q[# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -95,8 +106,7 @@ msgstr ""
       ary = []
       files.each do |file|
 	begin
-	  EX_PARSERS.each do |_, c|
-	    klass = GetText.const_get(c)
+	  @ex_parsers.each do |klass|
 	    if klass.target?(file)
 	      ary = klass.parse(file, ary)
 	      break

data/lib/gettext/rmsgfmt.rb

@@ -7,287 +7,19 @@
   license terms as Ruby.
 =end
 
-#
-# DO NOT MODIFY!!!!
-# This file is automatically generated by racc 1.4.4
-# from racc grammer file "src/rmsgfmt.ry".
-#
-
-require 'racc/parser'
-
-
-module GetText
-
-  class PoParser < Racc::Parser
-
-module_eval <<'..end src/rmsgfmt.ry modeval..id0ade4036b6', 'src/rmsgfmt.ry', 90
-  def unescape(orig)
-    ret = orig.gsub(/\\n/, "\n")
-    ret.gsub!(/\\t/, "\t")
-    ret.gsub!(/\\r/, "\r")
-    ret.gsub!(/\\"/, "\"")
-    ret
-  end
-  
-  def parse(str, data)
-    @data = data
-    @fuzzy = false
-    str.strip!
-    @q = []
-    until str.empty? do
-      case str
-      when /\A\s+/
-	str = $'
-      when /\Amsgid_plural/
-	@q.push [:MSGID_PLURAL, $&]
-	str = $'
-      when /\Amsgid/
-	@q.push [:MSGID, $&]
-	str = $'
-      when /\Amsgstr/
-	@q.push [:MSGSTR, $&]
-	str = $'
-      when /\A\[(\d+)\]/
-	@q.push [:PLURAL_NUM, $1]
-	str = $'
-      when /\A\#~(.*)/
-	$stderr.print _("Warning: obsolete msgid is existed.\n")
-	$stderr.print "         #{$&}\n"
-	str = $'
-      when /\A\#/
-	@q.push [:COMMENT, $&]
-	str = $'
-      when /\A\"(.*)\"/
-	@q.push [:STRING, $1]
-	str = $'
-      else
-	c = str[0,1]
-	@q.push [:STRING, c]
-	str = str[1..-1]
-      end
-    end 
-    @q.push [false, '$end']
-    if $DEBUG
-      @q.each do |a,b|
-      puts "[#{a}, #{b}]"
-      end
-    end
-    @yydebug = true if $DEBUG
-    do_parse
-  end
-  
-  def next_token
-    @q.shift
-  end
-  
-..end src/rmsgfmt.ry modeval..id0ade4036b6
-
-##### racc 1.4.4 generates ###
-
-racc_reduce_table = [
- 0, 0, :racc_error,
- 0, 9, :_reduce_none,
- 2, 9, :_reduce_none,
- 2, 9, :_reduce_none,
- 4, 11, :_reduce_4,
- 5, 11, :_reduce_5,
- 2, 13, :_reduce_6,
- 1, 13, :_reduce_none,
- 3, 14, :_reduce_8,
- 2, 10, :_reduce_9,
- 1, 10, :_reduce_none,
- 2, 12, :_reduce_11,
- 1, 12, :_reduce_12 ]
-
-racc_reduce_n = 13
-
-racc_shift_n = 22
-
-racc_action_table = [
-     3,     9,     4,     5,    12,    13,    11,    18,    11,    11,
-     9,     9,     9,     7,    11,    18,    20,     9,    11 ]
-
-racc_action_check = [
-     1,    13,     1,     1,    10,    10,    10,    14,    14,     8,
-     4,    12,     5,     3,    15,    16,    18,    20,    21 ]
-
-racc_action_pointer = [
-   nil,     0,   nil,    13,     4,     6,   nil,   nil,     3,   nil,
-     0,   nil,     5,    -5,     2,     8,    10,   nil,     9,   nil,
-    11,    12 ]
-
-racc_action_default = [
-    -1,   -13,    -3,   -13,   -10,   -13,    -2,    22,    -9,   -12,
-   -13,   -11,   -13,   -13,   -13,    -4,    -5,    -7,   -13,    -6,
-   -13,    -8 ]
-
-racc_goto_table = [
-     8,    10,    17,     2,    19,     6,    16,     1,    14,    15,
-   nil,   nil,   nil,   nil,   nil,   nil,    21 ]
-
-racc_goto_check = [
-     4,     4,     6,     3,     6,     2,     5,     1,     4,     4,
-   nil,   nil,   nil,   nil,   nil,   nil,     4 ]
-
-racc_goto_pointer = [
-   nil,     7,     4,     2,    -4,    -8,   -12 ]
-
-racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
-
-racc_token_table = {
- false => 0,
- Object.new => 1,
- :COMMENT => 2,
- :MSGID => 3,
- :MSGID_PLURAL => 4,
- :MSGSTR => 5,
- :STRING => 6,
- :PLURAL_NUM => 7 }
-
-racc_use_result_var = true
-
-racc_nt_base = 8
-
-Racc_arg = [
- racc_action_table,
- racc_action_check,
- racc_action_default,
- racc_action_pointer,
- racc_goto_table,
- racc_goto_check,
- racc_goto_default,
- racc_goto_pointer,
- racc_nt_base,
- racc_reduce_table,
- racc_token_table,
- racc_shift_n,
- racc_reduce_n,
- racc_use_result_var ]
-
-Racc_token_to_s_table = [
-'$end',
-'error',
-'COMMENT',
-'MSGID',
-'MSGID_PLURAL',
-'MSGSTR',
-'STRING',
-'PLURAL_NUM',
-'$start',
-'msgfmt',
-'comment',
-'message',
-'string_list',
-'msgstr_plural',
-'msgstr_plural_line']
-
-Racc_debug_parser = true
-
-##### racc system variables end #####
-
- # reduce 0 omitted
-
- # reduce 1 omitted
-
- # reduce 2 omitted
-
- # reduce 3 omitted
-
-module_eval <<'.,.,', 'src/rmsgfmt.ry', 36
-  def _reduce_4( val, _values, result )
-    if @fuzzy
-      if val[1] != ""
-        $stderr.print _("Warning: fuzzy message was ignored.\n")
-        $stderr.print "         msgid '#{val[1]}'\n"
-      else
-	@data[""] = unescape(val[3])
-      end
-      @fuzzy = false
-    else
-      @data[unescape(val[1])] = unescape(val[3]) 
-    end
-    result = ""
-   result
-  end
-.,.,
-
-module_eval <<'.,.,', 'src/rmsgfmt.ry', 51
-  def _reduce_5( val, _values, result )
-    if @fuzzy
-      if val[1] != ""
-        $stderr.print _("Warning: fuzzy message was ignored.\n")
-        $stderr.print "msgid = '#{val[1]}\n"
-      else
-	@data[""] = unescape(val[3])
-      end
-      @fuzzy = false
-    else
-      @data[unescape(val[1]) + "\000" + unescape(val[3])] = unescape(val[4])
-    end
-    result = ""
-   result
-  end
-.,.,
-
-module_eval <<'.,.,', 'src/rmsgfmt.ry', 58
-  def _reduce_6( val, _values, result )
-    result = val[0] + "\000" + val[1]
-   result
-  end
-.,.,
-
- # reduce 7 omitted
-
-module_eval <<'.,.,', 'src/rmsgfmt.ry', 66
-  def _reduce_8( val, _values, result )
-    result = val[2]
-   result
-  end
-.,.,
-
-module_eval <<'.,.,', 'src/rmsgfmt.ry', 73
-  def _reduce_9( val, _values, result )
-    @fuzzy = true if /fuzzy/ =~ val[1]
-   result
-  end
-.,.,
-
- # reduce 10 omitted
-
-module_eval <<'.,.,', 'src/rmsgfmt.ry', 81
-  def _reduce_11( val, _values, result )
-    result = val.delete_if{|item| item == ""}.join
-   result
-  end
-.,.,
-
-module_eval <<'.,.,', 'src/rmsgfmt.ry', 85
-  def _reduce_12( val, _values, result )
-    result = val[0]
-   result
-  end
-.,.,
-
- def _reduce_none( val, _values, result )
-  result
- end
-
-  end   # class PoParser
-
-end   # module GetText
-
 require 'optparse'
-require 'gettext'
 require 'fileutils'
-
-include GetText
-GetText.bindtextdomain("rmsgfmt")
+require 'gettext'
+require 'gettext/poparser'
 
 module GetText
+  GetText.bindtextdomain("rgettext")
+
   module RMsgfmt
+    extend GetText
+
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2005/09/03 09:54:02 $)[1]
+    DATE = %w($Date: 2005/10/22 10:49:59 $)[1]
     
     module_function
     def run(targetfile = nil, output_path = nil)