gettext 1.9.0 → 1.10.0

data/lib/gettext/active_record.rb

@@ -6,10 +6,11 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: active_record.rb,v 1.14 2007/01/21 15:16:06 mutoh Exp $
+  $Id: active_record.rb,v 1.21 2007/07/04 15:51:30 mutoh Exp $
 =end
 require 'gettext'
 require 'active_record'
+require 'gettext/rails_compat'
 
 module ActiveRecord #:nodoc:
   class Migration
@@ -36,41 +37,61 @@ module ActiveRecord #:nodoc:
       attr_accessor :table_class
       alias :human_name_witout_localized :human_name 
 
-      def human_name
-        table_class.human_attribute_name(@name)
+      def human_name_with_gettext
+        if table_class
+          table_class.human_attribute_name(@name)
+        else
+          @name.humanize
+        end
       end
+      alias_method_chain :human_name, :gettext
     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 respond_to? :included
-    def self.included(base) # :nodoc:
-      super
-      real_included(base)
+    class << self
+      def real_included(base)
+        base.extend ClassMethods
+        base.class_eval{
+          include GetText
+          def gettext(str)  #:nodoc:
+            _(str)
+          end
+          class << self
+            def human_attribute_name_with_gettext(attribute_key_name) #:nodoc:
+              s_("#{self}|#{attribute_key_name.humanize}")
+            end
+            alias_method_chain :human_attribute_name, :gettext
+            def human_attribute_table_name_for_error(table_name) #:nodoc:
+              _(table_name.gsub(/_/, " "))
+            end
+          end
+        }
+      end
     end
-else
-    # Since rails-1.2.0.
-    def self.append_features(base) # :nodoc:
-      super
-      real_included(base)
+
+    if respond_to? :included
+      class << self
+        def included_with_gettext(base) # :nodoc:
+          unless base <= ActiveRecord::Base
+            included_without_gettext(base)
+          end
+          real_included(base)
+        end
+        alias_method_chain :included, :gettext
+      end
+    else
+      class << self
+        # Since rails-1.2.0.
+        def append_features_with_gettext(base) # :nodoc:
+          unless base <= ActiveRecord::Base
+            append_features_without_gettext(base)
+          end
+          real_included(base)
+        end
+        alias_method_chain :append_features, :gettext
+      end
     end
-end
 
     module ClassMethods #:nodoc:
       @@custom_error_messages_d = {}
@@ -137,10 +158,9 @@ end
           @columns = nil 
         end
         unless @columns
-          @columns = connection.columns(table_name, "#{name} Columns")
+          @columns = columns_without_gettext
           @columns.each {|column| 
             column.table_class = self
-            column.primary = column.name == primary_key
           }
         end
         @columns

data/lib/gettext/locale_win32.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_win32.rb,v 1.15 2006/12/14 16:35:57 mutoh Exp $
+  $Id: locale_win32.rb,v 1.16 2007/07/03 16:57:07 mutoh Exp $
 =end
 
 require 'gettext/locale_table_win32'
@@ -26,6 +26,7 @@ module Locale
     # * Returns the charset of the locale
     def get_charset(locale)
       loc = LocaleTable.find{|v| v[1] == locale.to_win}
+      loc = LocaleTable.find{|v| v[1] =~ /^#{locale.language}-/} unless loc
       loc ? loc[2] : "CP1252"
     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.5 2007/01/21 15:16:06 mutoh Exp $
+  $Id: active_record.rb,v 1.6 2007/07/03 01:58:47 mutoh Exp $
 =end
 
 require 'gettext'
@@ -141,7 +141,7 @@ module GetText
 	      ENV["RAILS_ENV"] = @config[:db_mode]
 	      require 'config/boot.rb'
 	      require 'config/environment.rb'
-	      require 'app/controllers/application.rb'
+#	      require 'app/controllers/application.rb'
 	    rescue LoadError
 	      require_rails 'rubygems'
               if Kernel.respond_to? :gem

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.9 2007/01/13 18:34:08 mutoh Exp $
+  $Id: ruby.rb,v 1.10 2007/07/02 16:40:18 mutoh Exp $
 =end
 
 require 'irb/ruby-lex.rb'
@@ -62,7 +62,7 @@ end
 module GetText
   module RubyParser
     ID = ['gettext', '_', 'N_', 'sgettext', 's_']
-    PLURAL_ID = ['ngettext', 'n_', 'Nn_']
+    PLURAL_ID = ['ngettext', 'n_', 'Nn_', 'ns_', 'nsgettext']
 
     module_function
     def parse(file, targets = [])  # :nodoc:

data/lib/gettext/poparser.rb

@@ -9,7 +9,7 @@
 
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by racc 1.4.4
+# This file is automatically generated by racc 1.4.5
 # from racc grammer file "src/poparser.ry".
 #
 
@@ -20,7 +20,7 @@ module GetText
 
   class PoParser < Racc::Parser
 
-module_eval <<'..end src/poparser.ry modeval..idf3e4511031', 'src/poparser.ry', 90
+module_eval <<'..end src/poparser.ry modeval..id99edf64163', 'src/poparser.ry', 94
   include GetText
   GetText.bindtextdomain("rgettext")
 
@@ -56,7 +56,7 @@ module_eval <<'..end src/poparser.ry modeval..idf3e4511031', 'src/poparser.ry',
 	@q.push [:PLURAL_NUM, $1]
 	str = $'
       when /\A\#~(.*)/
-	$stderr.print _("Warning: obsolete msgid is existed.\n")
+	$stderr.print _("Warning: obsolete msgid exists.\n")
 	$stderr.print "         #{$&}\n"
 	@q.push [:COMMENT, $&]
 	str = $'
@@ -92,9 +92,10 @@ module_eval <<'..end src/poparser.ry modeval..idf3e4511031', 'src/poparser.ry',
   end
 
   def on_message(msgid, msgstr)
-    @data[msgid] = msgstr
- 
-    @data.set_comment(msgid, @comments.join("\n"))
+    if msgstr.size > 0
+      @data[msgid] = msgstr
+      @data.set_comment(msgid, @comments.join("\n"))
+    end
     @comments.clear
   end
       
@@ -103,9 +104,9 @@ module_eval <<'..end src/poparser.ry modeval..idf3e4511031', 'src/poparser.ry',
     @comments << comment
   end 
 
-..end src/poparser.ry modeval..idf3e4511031
+..end src/poparser.ry modeval..id99edf64163
 
-##### racc 1.4.4 generates ###
+##### racc 1.4.5 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,
@@ -252,37 +253,41 @@ module_eval <<'.,.,', 'src/poparser.ry', 51
   end
 .,.,
 
-module_eval <<'.,.,', 'src/poparser.ry', 58
+module_eval <<'.,.,', 'src/poparser.ry', 62
   def _reduce_6( val, _values, result )
-    result = val[0] + "\000" + val[1]
+    if val[0].size > 0
+      result = val[0] + "\000" + val[1]
+    else
+      result = ""
+    end
    result
   end
 .,.,
 
  # reduce 7 omitted
 
-module_eval <<'.,.,', 'src/poparser.ry', 66
+module_eval <<'.,.,', 'src/poparser.ry', 70
   def _reduce_8( val, _values, result )
     result = val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/poparser.ry', 73
+module_eval <<'.,.,', 'src/poparser.ry', 77
   def _reduce_9( val, _values, result )
     on_comment(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/poparser.ry', 81
+module_eval <<'.,.,', 'src/poparser.ry', 85
   def _reduce_10( val, _values, result )
     result = val.delete_if{|item| item == ""}.join
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'src/poparser.ry', 85
+module_eval <<'.,.,', 'src/poparser.ry', 89
   def _reduce_11( val, _values, result )
     result = val[0]
    result

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'