gettext 1.9.0-mswin32 → 1.10.0-mswin32

data/lib/gettext/rails.rb

@@ -6,11 +6,12 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rails.rb,v 1.55 2007/01/21 15:16:06 mutoh Exp $
+  $Id: rails.rb,v 1.63 2007/07/05 16:55:59 mutoh Exp $
 =end
 
 require 'gettext/cgi'
 require 'action_controller'
+require 'gettext/rails_compat'
 
 module GetText
   # GetText::Rails supports Ruby on Rails.
@@ -237,11 +238,27 @@ module ActionController #:nodoc:
   end
 
   class TestRequest < AbstractRequest  #:nodoc:
+    class GetTextMockCGI < CGI #:nodoc:
+      attr_accessor :stdinput, :stdoutput, :env_table
+      
+      def initialize(env, input=nil)
+        self.env_table = env
+        self.stdinput = StringIO.new(input || "")
+        self.stdoutput = StringIO.new
+        
+        super()
+      end
+    end
+
     @cgi = nil
     def cgi
       unless @cgi
-        ENV['REQUEST_URI'] ||= "http://localhost:3000/"
-        @cgi = CGI.new 
+        @cgi = GetTextMockCGI.new("REQUEST_METHOD" => "GET",
+                                  "QUERY_STRING"   => "",
+                                  "REQUEST_URI"    => "/",
+                                  "HTTP_HOST"      => "www.example.com",
+                                  "SERVER_PORT"    => "80",
+                                  "HTTPS"          => "off")
       end
       @cgi
     end
@@ -310,50 +327,64 @@ module ActionView #:nodoc:
 	  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 = @error_message_title
-	  message_explanation = @error_message_explanation
-	  
-	  klass.content_tag("div",
-			    klass.content_tag(
-					      options[:header_tag] || "h2",
-					      n_(message_title, count) % {:num => count, :record => record}
-					      ) +
-			    klass.content_tag("p", n_(message_explanation, count) % {:num => 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
 
-	def error_messages_for(object, object_name, klass, options = {})
-	  options = options.symbolize_keys
-
-	  if object && ! object.errors.empty?
-	    count = object.errors.count
-	    record = ActiveRecord::Base.human_attribute_table_name_for_error(object_name.to_s)
-	    render_error_message(object, klass, record, count, options)
-	  end
+	def error_messages_for(instance, objects, object_names, count, options)
+          record = ActiveRecord::Base.human_attribute_table_name_for_error(options[:object_name] || object_names[0].to_s)
+
+	  message_title = instance.error_message_title(@error_message_title)
+	  message_explanation = instance.error_message_explanation(@error_message_explanation)
+
+          html = {}
+          [:id, :class].each do |key|
+            if options.include?(key)
+              value = options[key] 
+              html[key] = value unless value.blank?
+            else
+              html[key] = 'errorExplanation'
+            end
+          end
+
+          header_message = n_(message_title, count) % {:num => count, :record => record}
+          error_messages = objects.map {|object| object.errors.full_messages.map {|msg| instance.content_tag(:li, msg) } }
+            
+          instance.content_tag(:div,
+                            instance.content_tag(options[:header_tag] || :h2, header_message) <<
+                            instance.content_tag(:p, n_(message_explanation, count) % {:num => count}) <<
+                            instance.content_tag(:ul, error_messages),
+                            html
+                            )
 	end
       end
-      def error_messages_for(object_name, options = {})
-	object = instance_variable_get("@#{object_name}")
-	L10n.error_messages_for(object, object_name, self, options)
+
+      def error_message_title(msg) #:nodoc:
+        if msg
+          [_(msg[0]), _(msg[1])]
+        else
+          nil
+        end
+      end      
+	
+      def error_message_explanation(msg) #:nodoc:
+        if msg
+          [_(msg[0]), _(msg[1])]
+        else
+          nil
+        end
+      end
+
+      alias error_messages_for_without_localize error_messages_for #:nodoc:
+
+      def error_messages_for(*params)
+        options = params.last.is_a?(Hash) ? params.pop.symbolize_keys : {}
+        objects = params.collect {|object_name| instance_variable_get("@#{object_name}") }.compact
+        object_names = params.dup
+        count   = objects.inject(0) {|sum, object| sum + object.errors.count }
+        if count.zero?
+          ''
+        else
+          L10n.error_messages_for(self, objects, object_names, count, options)
+        end
       end
     end
 
@@ -363,17 +394,19 @@ module ActionView #:nodoc:
 
       # 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')]
+                   N_('half a minute'), N_('less than a minute'), N_('about 1 month'), 
+                   N_('about 1 year'), N_('over 2 years')]
+      NMINUTES = [/^(\d+) minutes?$/, Nn_('1 minute', '%{num} minutes')]
+      NHOURS   = [/^about (\d+) hours?$/, Nn_('about 1 hour', 'about %{num} hours')]
+      NDAYS    = [/^(\d+) days?$/, Nn_('1 day', '%{num} days')]
+      NMONTHS  = [/^(\d+) months?$/, Nn_('1 month', '%{num} months')]
 
       def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false)
 	textdomain("rails")
 	
 	msg = distance_of_time_in_words_without_locale(from_time, to_time, include_seconds)
 	match = false
-	[MINUTES, HOURS, DAYS].each do |regexp, nn|
+	[NMINUTES, NHOURS, NDAYS, NMONTHS].each do |regexp, nn|
 	  if regexp =~ msg
 	    match = true
 	    msg = n_(nn, $1.to_i) % {:num => $1}
@@ -416,8 +449,29 @@ if defined? ActionMailer
 	    part.body = NKF.nkf('-j', part.body)
 	  end
 	end
-      @mail
+        @mail
+      end
+    end
+  end
+end
+
+module ActionController #:nodoc: all
+  module Caching
+    module Fragments
+      def fragment_cache_key_with_gettext(name) 
+        fragment_cache_key_without_gettext(name).gsub('?', '.').gsub(/:/, ".") << "_#{Locale.current}"
+      end
+      alias_method_chain :fragment_cache_key, :gettext
+
+      def expire_fragment_with_gettext(name, options = nil)
+        return unless perform_caching
+
+        key = %r{#{fragment_cache_key_without_gettext(name).gsub('?', '.').gsub(/:/, ".")}}
+        self.class.benchmark "Expired fragments matching: #{key.source}" do
+          fragment_cache_store.delete_matched(key, options)
+        end
       end
+      alias_method_chain :expire_fragment, :gettext
     end
   end
 end
@@ -432,7 +486,7 @@ end
 
 
 if ::RAILS_ENV == "development"
-  GetText::TextDomain.check_mo = true
+  GetText.cached = false
 end
 
 require 'gettext/active_record'

data/lib/gettext/rails_compat.rb

@@ -0,0 +1,16 @@
+#
+# This file is for Rails-1.1.6.
+# From activesupport-1.4.1/lib/active_support/core_ext/module/aliasing.rb
+#
+class Module
+  unless defined? alias_method_chain
+    def alias_method_chain(target, feature)
+      # Strip out punctuation on predicates or bang methods since
+      # e.g. target?_without_feature is not a valid method name.
+      aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
+      yield(aliased_target, punctuation) if block_given?
+      alias_method "#{aliased_target}_without_#{feature}#{punctuation}", target
+      alias_method target, "#{aliased_target}_with_#{feature}#{punctuation}"
+    end
+  end
+end

data/lib/gettext/rgettext.rb

@@ -25,7 +25,7 @@ module GetText
 
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2006/12/14 16:35:57 $)[1]
+    DATE = %w($Date: 2007/07/02 16:40:18 $)[1]
     MAX_LINE_LEN = 70
 
     @ex_parsers = []
@@ -123,6 +123,41 @@ msgstr ""
       str
     end
 
+    def normalize(ary)  # :nodoc:
+      used_plural_msgs = []
+      ary.select{|item| item[0].include? "\000"}.each do |plural_msg|
+        next if used_plural_msgs.include?(plural_msg[0])
+
+        key = plural_msg[0].split("\000")[0]
+
+        ary.dup.each do |single_msg|
+          if single_msg[0] == key or
+              (single_msg[0] =~ /#{Regexp.quote(key)}\000/ and 
+               single_msg[0] != plural_msg[0])
+            if single_msg[0] != key 
+              warn %Q[Warning: n_("#{plural_msg[0].gsub(/\000/, '", "')}") and n_("#{single_msg[0].gsub(/\000/, '", "')}") are duplicated. First msgid was used.] 
+                used_plural_msgs << single_msg[0]
+            end
+
+            single_msg[1..-1].each do |line_info|
+              plural_msg << line_info
+              fname = line_info.split(/:/)[0]
+              sorted = plural_msg[1..-1].select{|l| l.split(/:/)[0].include?(fname)}.collect{|l| 
+                aline = l.split(/:/)
+                [aline[0], aline[1] =~ /[0-9]+/ ? aline[1].to_i : aline[1]]
+              }.sort.collect{|l| "#{l[0]}:#{l[1]}"}
+              plural_msg.delete_if{|i| sorted.include?(i)}
+              sorted.each {|i|
+                plural_msg << i
+              }
+            end
+            ary.delete(single_msg)
+          end
+        end
+      end
+      ary.collect{|i| i.uniq}
+    end
+
     def parse(files) # :nodoc:
       ary = []
       files.each do |file|
@@ -138,8 +173,7 @@ msgstr ""
 	  raise
 	end
       end
-
-      ary
+      normalize(ary)
     end
 
     def check_options # :nodoc:

data/lib/gettext/textdomain.rb

@@ -10,7 +10,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: textdomain.rb,v 1.20 2006/09/11 16:30:31 mutoh Exp $
+  $Id: textdomain.rb,v 1.22 2007/07/02 16:40:18 mutoh Exp $
 =end
 
 require 'gettext/string'
@@ -116,14 +116,34 @@ module GetText
     # * Returns: the translated string or nil if not found.
     def gettext(msgid)
       return "" if msgid == "" or msgid.nil?
-      if @current_mo and @current_mo[msgid] and (@current_mo[msgid].size > 0)
-	@current_mo[msgid]
+      return nil unless @current_mo
+      if @current_mo[msgid] and (@current_mo[msgid].size > 0)
+        @current_mo[msgid]
+      elsif msgid.include?("\000")
+        ret = nil
+        msgid_single = msgid.split("\000")[0]
+        @current_mo.each{|key, val| 
+          if key =~ /^#{Regexp.quote(msgid_single)}\000/
+              # Usually, this is not caused to make po-files from rgettext.
+              warn %Q[Warning: n_("#{msgid_single}", "#{msgid.split("\000")[1]}") and n_("#{key.gsub(/\000/, '", "')}") are duplicated.] if $DEBUG
+            ret = val
+            break
+          end
+        }
+        ret
       else
-        nil
+        ret = nil
+        @current_mo.each{|key, val| 
+          if key =~ /^#{Regexp.quote(msgid)}\000/
+              ret = val.split("\000")[0]
+            break
+          end
+        }
+        ret
       end
     end
 
-    # Gets the translated string.
+    # Gets the translated string. (Deprecated. Don't call this method directly)
     # * msgid: the original message(single).
     # * msgid: the original message(plural).
     # * n: the number
@@ -132,7 +152,7 @@ module GetText
       key = msgid + "\000" + msgid_plural
       msg = gettext(key)
       if ! msg
-	nil
+	nil  # do nothing.
       elsif msg == key
 	msg = n == 1 ? msgid : msgid_plural
       elsif msg.include?("\000")
@@ -151,6 +171,25 @@ module GetText
       msg
     end
 
+    def ngettext_data(msgid, msgid_plural)   #:nodoc:
+      key = msgid + "\000" + msgid_plural
+      msg = gettext(key)
+      ret = nil
+      if ! msg
+        ret = nil
+      elsif msg == key
+        ret = nil
+      elsif msg.include?("\000")
+        # [[msgstr[0], msgstr[1], msgstr[2],...], cond]
+        cond = @current_mo ? @current_mo.plural : nil
+        cond ||= "n != 1"
+        ret = [msg.split("\000"), cond]
+      else
+        ret = [[msg], "0"]
+      end
+      ret
+    end
+
     # Compare this object has the same name, topdir and locale.
     # * name: the textdomain name
     # * topdir: the top directory of mo files or nil.

data/lib/gettext/utils.rb

@@ -7,6 +7,13 @@
   license terms as Ruby.
 =end
 
+require 'rbconfig'
+if /mingw|mswin|mswin32/ =~ RUBY_PLATFORM
+  ENV['PATH'] = %w(bin lib).collect{|dir|
+    "#{Config::CONFIG["prefix"]}\\lib\\GTK\\#{dir};"
+  }.join('') + ENV['PATH']
+end
+
 require 'gettext/rgettext'
 require 'gettext/rmsgfmt'
 require 'fileutils'

data/lib/gettext/version.rb

@@ -8,5 +8,5 @@
   license terms as Ruby.
 =end
 module GetText
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
 end

data/lib/gettext.rb

@@ -1,7 +1,7 @@
 =begin
   gettext.rb - GetText module
 
-  Copyright (C) 2001-2006  Masao Mutoh
+  Copyright (C) 2001-2007  Masao Mutoh
   Copyright (C) 2001-2003  Masahiro Sakai
 
       Masao Mutoh       <mutoh@highway.ne.jp>
@@ -10,7 +10,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: gettext.rb,v 1.22 2006/12/03 16:26:59 mutoh Exp $
+  $Id: gettext.rb,v 1.27 2007/07/05 05:29:28 mutoh Exp $
 =end
 
 require 'rbconfig'
@@ -29,6 +29,29 @@ module GetText
     mod.extend self
   end
 
+  @@__cached = true
+
+  # Set the value whether cache messages or not. 
+  # true to cache messages, otherwise false.
+  #
+  # Default is true. If $DEBUG is false, messages are not checked even if
+  # this value is true.
+  def cached=(val)
+    @@__cached = val
+    GetText::TextDomain.check_mo = ! val
+  end
+
+  # Return the cached value.
+  def cached?
+    @@__cached
+  end
+
+  # Clear the cached messages.
+  def clear_cache
+    @@__cache_msgids = {}
+    @@__cache_nmsgids = {}
+  end
+
   @@__textdomainmanagers = Hash.new
 
   # call-seq:
@@ -156,6 +179,8 @@ module GetText
     ((ret + klass.ancestors + [GetText]) & @@__textdomainmanagers.keys).uniq
   end
 
+  @@__cache_msgids = {}
+
   # call-seq:
   #   gettext(msgid)
   #   _(msgid)
@@ -164,14 +189,44 @@ module GetText
   # * msgid: the message id.
   # * Returns: localized text by msgid. If there are not binded mo-file, it will return msgid.
   def gettext(msgid)
-    ret = nil
+    sgettext(msgid, nil)
+  end
+
+  # call-seq:
+  #   sgettext(msgid, div = '|')
+  #   s_(msgid, div = '|')
+  #
+  # Translates msgid, but if there are no localized text, 
+  # it returns a last part of msgid separeted "div".
+  #
+  # * msgid: the message id.
+  # * div: separator or nil.
+  # * Returns: the localized text by msgid. If there are no localized text, 
+  #   it returns a last part of msgid separeted "div".
+  # See: http://www.gnu.org/software/gettext/manual/html_mono/gettext.html#SEC151
+  def sgettext(msgid, div = '|')
+    cached_key = [bound_target, Locale.current, msgid]
+    if (@@__cached or ! $DEBUG)
+      if @@__cache_msgids.keys.include?(cached_key)
+        return @@__cache_msgids[cached_key]
+      end
+    end
+    msg = nil
     each_textdomain {|textdomain|
-      ret = textdomain.gettext(msgid)
-      break if ret
+      msg = textdomain.gettext(msgid)
+      break if msg
     }
-    ret ? ret : msgid
+    msg ||= msgid
+    if div and msg == msgid
+      if index = msg.rindex(div)
+	msg = msg[(index + 1)..-1]
+      end
+    end
+    @@__cache_msgids[cached_key] = msg
   end
 
+  @@__cache_nmsgids = {}
+
   # call-seq:
   #   ngettext(msgid, msgid_plural, n)
   #   ngettext(msgids, n)  # msgids = [msgid, msgid_plural]
@@ -187,21 +242,7 @@ module GetText
   # * Returns: the localized text which key is msgid_plural if n is plural(follow plural-rule) or msgid.
   #   "plural-rule" is defined in po-file.
   def ngettext(arg1, arg2, arg3 = nil)
-    if arg1.kind_of?(Array)
-      msgid = arg1[0]
-      msgid_plural = arg1[1]
-      n = arg2
-    else
-      msgid = arg1
-      msgid_plural = arg2
-      n = arg3
-    end
-    ret = nil
-    each_textdomain {|textdomain|
-      ret = textdomain.ngettext(msgid, msgid_plural, n)
-      break if ret
-    }
-    ret ? ret : (n == 1 ? msgid : msgid_plural)
+    nsgettext(arg1, arg2, arg3, nil)
   end
 
   # This function does nothing. But it is required in order to recognize the msgid by rgettext.
@@ -219,26 +260,66 @@ module GetText
     [msgid, msgid_plural]
   end
 
+
   # call-seq:
-  #   sgettext(msgid, div = '|')
-  #   s_(msgid, div = '|')
+  #   nsgettext(msgid, msgid_plural, n, div = "|")
+  #   nsgettext(msgids, n, div = "|")  # msgids = [msgid, msgid_plural]
+  #   n_(msgid, msgid_plural, n, div = "|")
+  #   n_(msgids, n, div = "|")  # msgids = [msgid, msgid_plural]
   #
-  # Translates msgid, but if there are no localized text, 
+  # The nsgettext is similar to the ngettext.
+  # But if there are no localized text, 
   # it returns a last part of msgid separeted "div".
   #
-  # * msgid: the message id.
-  # * div: separator or nil.
-  # * Returns: the localized text by msgid. If there are no localized text, 
-  #   it returns a last part of msgid separeted "div".
-  # See: http://www.gnu.org/software/gettext/manual/html_mono/gettext.html#SEC151
-  def sgettext(msgid, div = '|')
-    msg = gettext(msgid)
-    if msg == msgid
-      if index = msg.rindex(div)
-	msg = msg[(index + 1)..-1]
+  # * msgid: the singular form with "div". (e.g. "Special|An apple")
+  # * msgid_plural: the plural form. (e.g. "%{num} Apples")
+  # * n: a number used to determine the plural form.
+  # * Returns: the localized text which key is msgid_plural if n is plural(follow plural-rule) or msgid.
+  #   "plural-rule" is defined in po-file.
+  def nsgettext(arg1, arg2, arg3 = "|", arg4 = "|")
+    if arg1.kind_of?(Array)
+      msgid = arg1[0]
+      msgid_plural = arg1[1]
+      n = arg2
+      if arg3 and arg3.kind_of? Numeric
+        raise ArgumentError, _("3rd parmeter is wrong: value = %{number}") % {:number => arg3}
       end
+      div = arg3
+    else
+      msgid = arg1
+      msgid_plural = arg2
+      n = arg3
+      div = arg4
     end
-    msg
+
+    cached_key = [bound_target, Locale.current, msgid + "\000" + msgid_plural]
+    msgs = nil
+    if (@@__cached or ! $DEBUG)
+      if @@__cache_nmsgids.keys.include?(cached_key)
+        msgs = @@__cache_nmsgids[cached_key]  # [msgstr, cond_as_string]
+      end
+    end
+    unless msgs
+      each_textdomain {|textdomain|
+        msgs = textdomain.ngettext_data(msgid, msgid_plural)
+        break if msgs
+      }
+      msgs = [[msgid, msgid_plural], "n != 1"] unless msgs
+      @@__cache_nmsgids[cached_key] = msgs
+    end
+    msgstrs = msgs[0]
+    if div and msgstrs[0] == msgid
+      if index = msgstrs[0].rindex(div)
+	msgstrs[0] = msgstrs[0][(index + 1)..-1]
+      end
+    end
+    plural = eval(msgs[1])
+    if plural.kind_of?(Numeric)
+      ret = msgstrs[plural]
+    else
+      ret = plural ? msgstrs[1] : msgstrs[0]
+    end
+    ret
   end
 
   # Sets the current locale to the current class/module
@@ -391,9 +472,10 @@ module GetText
   alias :_ :gettext   #:nodoc:
   alias :n_ :ngettext #:nodoc:
   alias :s_ :sgettext #:nodoc:
+  alias :ns_ :nsgettext #:nodoc:
 
-  module_function :bindtextdomain, :textdomain, :each_textdomain,
-    :N_, :gettext, :_, :ngettext, :n_, :sgettext, :s_, :bound_target, :bound_targets,
+  module_function :bindtextdomain, :textdomain, :each_textdomain, :cached=, :cached?, :clear_cache,
+    :N_, :gettext, :_, :ngettext, :n_, :sgettext, :s_, :nsgettext, :ns_, :bound_target, :bound_targets,
     :setlocale, :set_locale, :locale=, :set_locale_all, :locale, :charset=, :set_charset,
     :set_output_charset, :output_charset=, :output_charset, :current_textdomain_info
 end