gettext 1.91.0 → 1.92.0

data/lib/gettext/active_record.rb

@@ -1,12 +1,12 @@
 =begin
   gettext/active_record.rb - GetText for ActiveRecord
 
-  Copyright (C) 2006,2007  Masao Mutoh
+  Copyright (C) 2006-2008  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: active_record.rb,v 1.22 2008/05/05 14:31:06 mutoh Exp $
+  $Id: active_record.rb,v 1.25 2008/07/24 17:17:48 mutoh Exp $
 =end
 require 'gettext'
 require 'active_record'
@@ -107,6 +107,34 @@ module ActiveRecord #:nodoc:
       end
       alias_method_chain :validates_length_of, :gettext
 
+      def _validates_parse_custom_messages(*attrs) #:nodoc:
+	if attrs.last.is_a?(Hash) and attrs.last[:message]
+          msg = attrs.last[:message]
+          key = msg.dup
+          msg.sub!(/%\{val\}/, '%s')
+          @@custom_error_messages_d[key] = /\A#{Regexp.escape(msg).sub('%s', '(.*)')}\Z/
+	end
+        attrs
+      end
+      
+      def validates_format_of_with_gettext(*attrs)  #:nodoc:
+        attrs = _validates_parse_custom_messages(*attrs)
+	validates_format_of_without_gettext(*attrs)
+      end
+      alias_method_chain :validates_format_of, :gettext
+
+      def validates_inclusion_of_with_gettext(*attrs)  #:nodoc:
+        attrs = _validates_parse_custom_messages(*attrs)
+	validates_inclusion_of_without_gettext(*attrs)
+      end
+      alias_method_chain :validates_inclusion_of, :gettext
+
+      def validates_exclusion_of_with_gettext(*attrs)  #:nodoc:
+        attrs = _validates_parse_custom_messages(*attrs)
+	validates_exclusion_of_without_gettext(*attrs)
+      end
+      alias_method_chain :validates_exclusion_of, :gettext
+
       def custom_error_messages_d  #:nodoc:
 	@@custom_error_messages_d
       end
@@ -227,12 +255,26 @@ module ActiveRecord #:nodoc:
 				  :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")
+				  :not_a_number => N_("%{fn} is not a number"),
+                                  :greater_than => N_("%{fn} must be greater than %d"),
+                                  :greater_than_or_equal_to => N_("%{fn} must be greater than or equal to %d"),
+                                  :equal_to => N_("%{fn} must be equal to %d"),
+                                  :less_than => N_("%{fn} must be less than %d"),
+                                  :less_than_or_equal_to => N_("%{fn} must be less than or equal to %d"),
+                                  :odd => N_("%{fn} must be odd"),
+                                  :even => N_("%{fn} must be even")
 				  )
     @@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+)')}/,
+      default_error_messages[:greater_than] => /#{Regexp.escape(default_error_messages[:greater_than]).sub(/%d/, '(\d+)')}/,
+      default_error_messages[:greater_than_or_equal_to] => /#{Regexp.escape(default_error_messages[:greater_than_or_equal_to]).sub(/%d/, '(\d+)')}/,
+      default_error_messages[:equal_to] => /#{Regexp.escape(default_error_messages[:equal_to]).sub(/%d/, '(\d+)')}/,
+      default_error_messages[:less_than] => /#{Regexp.escape(default_error_messages[:less_than]).sub(/%d/, '(\d+)')}/,
+      default_error_messages[:less_than_or_equal_to] => /#{Regexp.escape(default_error_messages[:less_than_or_equal_to]).sub(/%d/, '(\d+)')}/,
+      default_error_messages[:odd] => /#{Regexp.escape(default_error_messages[:odd]).sub(/%d/, '(\d+)')}/,
+      default_error_messages[:even] => /#{Regexp.escape(default_error_messages[:even]).sub(/%d/, '(\d+)')}/,
     }
     cattr_accessor :default_error_messages_d
 
@@ -243,7 +285,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
+          custom_msg = _(custom_msg) % $1
+          custom_msg = _(custom_msg) % {:val => $1}
           break
         end
       end
@@ -252,6 +295,7 @@ module ActiveRecord #:nodoc:
         custom_msg = @base.gettext(msg)
         custom_msg = _(msg) if custom_msg == msg 
       end
+
       if attr == "base"
         full_message = custom_msg
       elsif /%\{fn\}/ =~ custom_msg
@@ -290,6 +334,7 @@ module ActiveRecord #:nodoc:
       errors.size == 1 ? errors.first : errors
     end
     alias_method_chain :on, :gettext 
+    alias :[] :on
 
     # 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"

data/lib/gettext/mo.rb

@@ -1,18 +1,18 @@
 =begin
     mo.rb - A simple class for operating GNU MO file.
 
-    Copyright (C) 2003-2006  Masao Mutoh
+    Copyright (C) 2003-2008  Masao Mutoh
     Copyright (C) 2002  Masahiro Sakai, Masao Mutoh
     Copyright (C) 2001  Masahiro Sakai
 
-        Masahiro Sakai                  <s01397ms@sfc.keio.ac.jp>
-        Masao Mutoh                     <mutoh@highway.ne.jp>
+        Masahiro Sakai                  <s01397ms at sfc.keio.ac.jp>
+        Masao Mutoh                     <mutoh at highway.ne.jp>
 
     You can redistribute this file and/or modify it under the same term
     of Ruby.  License of Ruby is included with Ruby distribution in
     the file "README".
 
-    $Id: mo.rb,v 1.9 2008/03/22 04:43:32 mutoh Exp $
+    $Id: mo.rb,v 1.10 2008/06/17 16:40:52 mutoh Exp $
 =end
 
 require 'gettext/iconv'
@@ -31,6 +31,16 @@ class MOFile < Hash
                       :hash_table_size,
                       :hash_table_offset)
 
+  # The following are only used in .mo files 
+  # with minor revision >= 1.
+  class HeaderRev1 < Header
+    attr_accessor :n_sysdep_segments,
+                  :sysdep_segments_offset,
+                  :n_sysdep_strings,
+                  :orig_sysdep_tab_offset,
+                  :trans_sysdep_tab_offset
+  end
+
   MAGIC_BIG_ENDIAN    = "\x95\x04\x12\xde"
   MAGIC_LITTLE_ENDIAN = "\xde\x12\x04\x95"
 
@@ -84,14 +94,26 @@ class MOFile < Hash
       raise InvalidFormat.new(sprintf("Unknown signature %s", magic.dump))
     end
 
-    header = Header.new(magic, *(io.read(4 * 6).unpack(@little_endian ? 'V6' : 'N6')))
-    raise InvalidFormat.new(sprintf("file format revision %d isn't supported", header.revision)) if header.revision > 0
+    endian_type6 = @little_endian ? 'V6' : 'N6'
+    endian_type_astr = @little_endian ? 'V*' : 'N*'
+
+    header = HeaderRev1.new(magic, *(io.read(4 * 6).unpack(endian_type6)))
 
+    if header.revision == 1
+      # FIXME: It doesn't support sysdep correctly.
+      header.n_sysdep_segments = io.read(4).unpack(endian_type6)
+      header.sysdep_segments_offset = io.read(4).unpack(endian_type6)
+      header.n_sysdep_strings = io.read(4).unpack(endian_type6)
+      header.orig_sysdep_tab_offset = io.read(4).unpack(endian_type6)
+      header.trans_sysdep_tab_offset = io.read(4).unpack(endian_type6)
+    elsif header.revision > 1
+      raise InvalidFormat.new(sprintf("file format revision %d isn't supported", header.revision))
+    end
     io.pos = header.orig_table_offset
-    orig_table_data = io.read((4 * 2) * header.nstrings).unpack(@little_endian ? 'V*' : 'N*')
+    orig_table_data = io.read((4 * 2) * header.nstrings).unpack(endian_type_astr)
 
     io.pos = header.translated_table_offset
-    trans_table_data = io.read((4 * 2) * header.nstrings).unpack(@little_endian ? 'V*' : 'N*')
+    trans_table_data = io.read((4 * 2) * header.nstrings).unpack(endian_type_astr)
 
     original_strings = Array.new(header.nstrings)
     for i in 0...header.nstrings
@@ -135,7 +157,7 @@ class MOFile < Hash
           end
         end
       end
-      self[original_strings[i]] = str
+      self[original_strings[i]] = str.freeze
     end
     self
   end
@@ -252,7 +274,12 @@ class MOFile < Hash
 
   def load_from_file(filename)
     @filename = filename
-    File.open(filename, 'rb'){|f| load_from_stream(f)}
+    begin
+      File.open(filename, 'rb'){|f| load_from_stream(f)}
+    rescue => e
+      e.set_backtrace("File: #{@filename}")
+      raise e
+    end
   end
 
   def save_to_file(filename)
@@ -285,8 +312,8 @@ if $0 == __FILE__
     puts "plural   = \"#{mo.plural}\""
     puts "------------------------------------------------------------------"
     mo.each do |key, value|
-      puts "original message = \"#{key}\""
-      puts "translated message = \"#{value}\""
+      puts "original message = #{key.inspect}"
+      puts "translated message = #{value.inspect}"
       puts "--------------------------------------------------------------------"
     end
   }

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.6 2007/07/03 01:58:47 mutoh Exp $
+  $Id: active_record.rb,v 1.7 2008/07/14 15:35:07 mutoh Exp $
 =end
 
 require 'gettext'
@@ -84,7 +84,7 @@ module GetText
       loaded_constants.each do |classname|
 	klass = eval(classname, TOPLEVEL_BINDING)
 	if klass.is_a?(Class) && klass < ActiveRecord::Base
-	  unless klass.untranslate_all?
+	  unless (klass.untranslate_all? || klass.abstract_class?)
 	    add_target(targets, file, ::Inflector.singularize(klass.table_name.gsub(/_/, " ")))
 	    unless klass.class_name == classname
 	      add_target(targets, file, ::Inflector.singularize(classname.gsub(/_/, " ").downcase))
@@ -117,8 +117,10 @@ module GetText
     def add_target(targets, file, msgid) # :nodoc:
       file_lineno = "#{file}:-"
       key_existed = targets.assoc(msgid)
-      if key_existed and ! targets[targets.index(key_existed)].include?(file_lineno)
-	targets[targets.index(key_existed)] = key_existed << file_lineno
+      if key_existed 
+        unless targets[targets.index(key_existed)].include?(file_lineno)
+	  targets[targets.index(key_existed)] = key_existed << file_lineno
+	end
       else
 	targets << [msgid, "#{file}:-"]
       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.10 2007/07/02 16:40:18 mutoh Exp $
+  $Id: ruby.rb,v 1.11 2008/07/26 06:59:35 mutoh Exp $
 =end
 
 require 'irb/ruby-lex.rb'
@@ -63,6 +63,7 @@ module GetText
   module RubyParser
     ID = ['gettext', '_', 'N_', 'sgettext', 's_']
     PLURAL_ID = ['ngettext', 'n_', 'Nn_', 'ns_', 'nsgettext']
+    MSGCTXT_ID = ['pgettext', 'p_']
 
     module_function
     def parse(file, targets = [])  # :nodoc:
@@ -89,6 +90,8 @@ module GetText
 	      target = :normal
 	    elsif PLURAL_ID.include?(tk.name)
 	      target = :plural
+	    elsif MSGCTXT_ID.include?(tk.name)
+	      target = :msgctxt
 	    else
 	      target = nil
 	    end
@@ -104,9 +107,13 @@ module GetText
 	  when RubyToken::TkPLUS, RubyToken::TkNL
 	    #do nothing
 	  when RubyToken::TkCOMMA
-	    if msgid and target == :plural
-	      msgid += "\000"
-	      target = :normal
+	    if msgid
+	      if target == :plural
+	        msgid += "\000"
+	      elsif target == :msgctxt
+	        msgid += "\004"
+	      end
+       	      target = :normal
 	    end
 	  else
 	    if msgid

data/lib/gettext/poparser.rb

@@ -20,7 +20,7 @@ module GetText
 
   class PoParser < Racc::Parser
 
-module_eval <<'..end src/poparser.ry modeval..id99edf64163', 'src/poparser.ry', 94
+module_eval <<'..end src/poparser.ry modeval..ida6d91c8151', 'src/poparser.ry', 108
   include GetText
   GetText.bindtextdomain("rgettext")
 
@@ -36,13 +36,18 @@ module_eval <<'..end src/poparser.ry modeval..id99edf64163', 'src/poparser.ry',
     @comments = []
     @data = data
     @fuzzy = false
+    @msgctxt = ""
     $ignore_fuzzy = ignore_fuzzy
+
     str.strip!
     @q = []
     until str.empty? do
       case str
       when /\A\s+/
 	str = $'
+      when /\Amsgctxt/
+	@q.push [:MSGCTXT, $&]
+	str = $'
       when /\Amsgid_plural/
 	@q.push [:MSGID_PLURAL, $&]
 	str = $'
@@ -97,6 +102,7 @@ module_eval <<'..end src/poparser.ry modeval..id99edf64163', 'src/poparser.ry',
       @data.set_comment(msgid, @comments.join("\n"))
     end
     @comments.clear
+    @msgctxt = ""
   end
       
   def on_comment(comment)
@@ -104,73 +110,79 @@ module_eval <<'..end src/poparser.ry modeval..id99edf64163', 'src/poparser.ry',
     @comments << comment
   end 
 
-..end src/poparser.ry modeval..id99edf64163
+
+..end src/poparser.ry modeval..ida6d91c8151
 
 ##### racc 1.4.5 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,
+ 0, 10, :_reduce_none,
+ 2, 10, :_reduce_none,
+ 2, 10, :_reduce_none,
+ 2, 10, :_reduce_none,
+ 2, 12, :_reduce_5,
  1, 13, :_reduce_none,
- 3, 14, :_reduce_8,
- 1, 10, :_reduce_9,
- 2, 12, :_reduce_10,
- 1, 12, :_reduce_11 ]
+ 1, 13, :_reduce_none,
+ 4, 15, :_reduce_8,
+ 5, 16, :_reduce_9,
+ 2, 17, :_reduce_10,
+ 1, 17, :_reduce_none,
+ 3, 18, :_reduce_12,
+ 1, 11, :_reduce_13,
+ 2, 14, :_reduce_14,
+ 1, 14, :_reduce_15 ]
 
-racc_reduce_n = 12
+racc_reduce_n = 16
 
-racc_shift_n = 21
+racc_shift_n = 26
 
 racc_action_table = [
-     3,     9,     4,     5,    10,    11,    12,    17,    12,     9,
-     9,     7,    12,    17,    19,     9,    12 ]
+     3,    13,     5,     7,     9,    15,    16,    17,    20,    17,
+    13,    17,    13,    13,    11,    17,    23,    20,    13,    17 ]
 
 racc_action_check = [
-     1,     5,     1,     1,     8,     8,     8,    13,    13,    10,
-    11,     3,    14,    15,    17,    19,    20 ]
+     1,    16,     1,     1,     1,    12,    12,    12,    18,    18,
+     7,    14,    15,     9,     3,    19,    20,    21,    23,    25 ]
 
 racc_action_pointer = [
-   nil,     0,   nil,    11,   nil,    -5,   nil,   nil,     0,   nil,
-     3,     4,   nil,     2,     6,     8,   nil,     7,   nil,     9,
-    10 ]
+   nil,     0,   nil,    14,   nil,   nil,   nil,     3,   nil,     6,
+   nil,   nil,     0,   nil,     4,     5,    -6,   nil,     2,     8,
+     8,    11,   nil,    11,   nil,    12 ]
 
 racc_action_default = [
-    -1,   -12,    -3,   -12,    -9,   -12,    -2,    21,   -12,   -11,
-   -12,   -12,   -10,   -12,    -4,    -5,    -7,   -12,    -6,   -12,
-    -8 ]
+    -1,   -16,    -2,   -16,    -3,   -13,    -4,   -16,    -6,   -16,
+    -7,    26,   -16,   -15,    -5,   -16,   -16,   -14,   -16,    -8,
+   -16,    -9,   -11,   -16,   -10,   -12 ]
 
 racc_goto_table = [
-     8,    16,     2,    18,     6,    13,    14,    15,     1,   nil,
-   nil,   nil,   nil,   nil,    20 ]
+    12,    22,    14,     4,    24,     6,     2,     8,    18,    19,
+    10,    21,     1,   nil,   nil,   nil,    25 ]
 
 racc_goto_check = [
-     4,     6,     3,     6,     2,     4,     4,     5,     1,   nil,
-   nil,   nil,   nil,   nil,     4 ]
+     5,     9,     5,     3,     9,     4,     2,     6,     5,     5,
+     7,     8,     1,   nil,   nil,   nil,     5 ]
 
 racc_goto_pointer = [
-   nil,     8,     3,     1,    -5,    -6,   -12 ]
+   nil,    12,     5,     2,     4,    -7,     6,     9,    -7,   -17 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
+   nil,   nil,   nil,   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 }
+ :MSGCTXT => 4,
+ :MSGID_PLURAL => 5,
+ :MSGSTR => 6,
+ :STRING => 7,
+ :PLURAL_NUM => 8 }
 
 racc_use_result_var = true
 
-racc_nt_base = 8
+racc_nt_base = 9
 
 Racc_arg = [
  racc_action_table,
@@ -193,6 +205,7 @@ Racc_token_to_s_table = [
 'error',
 'COMMENT',
 'MSGID',
+'MSGCTXT',
 'MSGID_PLURAL',
 'MSGSTR',
 'STRING',
@@ -200,8 +213,11 @@ Racc_token_to_s_table = [
 '$start',
 'msgfmt',
 'comment',
+'msgctxt',
 'message',
 'string_list',
+'single_message',
+'plural_message',
 'msgstr_plural',
 'msgstr_plural_line']
 
@@ -217,8 +233,21 @@ Racc_debug_parser = true
 
  # reduce 3 omitted
 
-module_eval <<'.,.,', 'src/poparser.ry', 36
-  def _reduce_4( val, _values, result )
+ # reduce 4 omitted
+
+module_eval <<'.,.,', 'src/poparser.ry', 25
+  def _reduce_5( val, _values, result )
+    @msgctxt = unescape(val[1]) + "\004"
+   result
+  end
+.,.,
+
+ # reduce 6 omitted
+
+ # reduce 7 omitted
+
+module_eval <<'.,.,', 'src/poparser.ry', 48
+  def _reduce_8( val, _values, result )
     if @fuzzy and $ignore_fuzzy 
       if val[1] != ""
         $stderr.print _("Warning: fuzzy message was ignored.\n")
@@ -228,15 +257,15 @@ module_eval <<'.,.,', 'src/poparser.ry', 36
       end
       @fuzzy = false
     else
-      on_message(unescape(val[1]), unescape(val[3]))
+      on_message(@msgctxt + unescape(val[1]), unescape(val[3]))
     end
     result = ""
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/poparser.ry', 51
-  def _reduce_5( val, _values, result )
+module_eval <<'.,.,', 'src/poparser.ry', 65
+  def _reduce_9( val, _values, result )
     if @fuzzy and $ignore_fuzzy
       if val[1] != ""
         $stderr.print _("Warning: fuzzy message was ignored.\n")
@@ -246,15 +275,15 @@ module_eval <<'.,.,', 'src/poparser.ry', 51
       end
       @fuzzy = false
     else
-      on_message(unescape(val[1]) + "\000" + unescape(val[3]), unescape(val[4]))
+      on_message(@msgctxt + unescape(val[1]) + "\000" + unescape(val[3]), unescape(val[4]))
     end
     result = ""
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/poparser.ry', 62
-  def _reduce_6( val, _values, result )
+module_eval <<'.,.,', 'src/poparser.ry', 76
+  def _reduce_10( val, _values, result )
     if val[0].size > 0
       result = val[0] + "\000" + val[1]
     else
@@ -264,31 +293,31 @@ module_eval <<'.,.,', 'src/poparser.ry', 62
   end
 .,.,
 
- # reduce 7 omitted
+ # reduce 11 omitted
 
-module_eval <<'.,.,', 'src/poparser.ry', 70
-  def _reduce_8( val, _values, result )
+module_eval <<'.,.,', 'src/poparser.ry', 84
+  def _reduce_12( val, _values, result )
     result = val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/poparser.ry', 77
-  def _reduce_9( val, _values, result )
+module_eval <<'.,.,', 'src/poparser.ry', 91
+  def _reduce_13( val, _values, result )
     on_comment(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/poparser.ry', 85
-  def _reduce_10( val, _values, result )
+module_eval <<'.,.,', 'src/poparser.ry', 99
+  def _reduce_14( val, _values, result )
     result = val.delete_if{|item| item == ""}.join
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/poparser.ry', 89
-  def _reduce_11( val, _values, result )
+module_eval <<'.,.,', 'src/poparser.ry', 103
+  def _reduce_15( val, _values, result )
     result = val[0]
    result
   end