gettext 1.8.0 → 1.9.0

data/lib/gettext/erb.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: erb.rb,v 1.3 2006/06/04 14:43:37 mutoh Exp $
+  $Id: erb.rb,v 1.4 2006/12/06 16:39:58 mutoh Exp $
 =end
 
 require 'erb'
@@ -34,7 +34,7 @@ module GetText
   # This module is an example for template engines such as ERB. 
   # You can implement another implementation easily to read gettext/erb.rb.
   module ErbContainer
-    include Container
+    include GetText
 
     # Evaluates ERB source(String) in the instance and returns the result HTML.
     #

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.12 2006/08/17 17:24:18 mutoh Exp $
+  $Id: locale.rb,v 1.13 2006/12/03 16:26:59 mutoh Exp $
 =end
 
 require 'gettext/locale_object'
@@ -56,14 +56,20 @@ module Locale
   @@current = nil
 
   module_function
-  # Sets the default locale (Locale::Object).
+  # Sets the default locale (Locale::Object or String(such as ja_JP.eucjP)).
   #
   # * locale: the default locale
   # * Returns: self.
   def set_default(locale)
-    @@default = locale
-    if @@default
-      @@default.charset ||= @@locale_system_module.get_charset(locale)
+    if locale
+      if locale.kind_of? Locale::Object
+        @@default = locale
+      else
+        @@default = Locale::Object.new(locale)
+      end
+      @@default.charset ||= @@locale_system_module.get_charset(@@default)
+    else
+      @@default = nil
     end
     self
   end

data/lib/gettext/locale_cgi.rb

@@ -6,13 +6,13 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_cgi.rb,v 1.6 2006/09/10 15:08:32 mutoh Exp $
+  $Id: locale_cgi.rb,v 1.7 2006/12/14 16:35:57 mutoh Exp $
 =end
 
 
 module Locale
-  # Locale::System module for Default OS (Unix)
-  # This is low-level class. Application shouldn't use this directly.
+  # Locale::System module for CGI.
+  # This is a low-level class. Application shouldn't use this directly.
   module SystemCGI
     @@default_locale = Locale::Object.new("en", nil, "UTF-8")
     @@cgi = nil

data/lib/gettext/locale_posix.rb

@@ -6,13 +6,13 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_posix.rb,v 1.4 2006/06/11 15:36:20 mutoh Exp $
+  $Id: locale_posix.rb,v 1.5 2006/12/14 16:35:57 mutoh Exp $
 =end
 
 
 module Locale 
   # Locale::SystemPosix module for Posix OS (Unix)
-  # This is low-level class. Application shouldn't use this directly.
+  # This is a low-level class. Application shouldn't use this directly.
   module SystemPosix
     extend Locale::System
     module_function

data/lib/gettext/locale_win32.rb

@@ -6,13 +6,14 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_win32.rb,v 1.14 2006/06/11 15:36:20 mutoh Exp $
+  $Id: locale_win32.rb,v 1.15 2006/12/14 16:35:57 mutoh Exp $
 =end
 
 require 'gettext/locale_table_win32'
 
 module Locale
   # Locale::SystemWin32 module for win32.
+  # This is a low-level class. Application shouldn't use this directly.
   module SystemWin32
     extend Locale::System
 

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.2 2006/08/28 23:54:53 mutoh Exp $
+  $Id: active_record.rb,v 1.5 2007/01/21 15:16:06 mutoh Exp $
 =end
 
 require 'gettext'
@@ -72,16 +72,17 @@ module GetText
     end
 
     def parse(file, targets = []) # :nodoc:
-      old_constants = constants
+      GetText.locale = "en"
+      old_constants = Object.constants
       begin
-        eval(open(file).read)
+        eval(open(file).read, TOPLEVEL_BINDING)
       rescue
         $stderr.puts _("Ignored '%{file}'. Solve dependencies first.") % {:file => file}
         $stderr.puts $! 
       end
-      loaded_constants = constants - old_constants
+      loaded_constants = Object.constants - old_constants
       loaded_constants.each do |classname|
-	klass = eval(classname)
+	klass = eval(classname, TOPLEVEL_BINDING)
 	if klass.is_a?(Class) && klass < ActiveRecord::Base
 	  unless klass.untranslate_all?
 	    add_target(targets, file, ::Inflector.singularize(klass.table_name.gsub(/_/, " ")))
@@ -114,9 +115,10 @@ module GetText
     end
 
     def add_target(targets, file, msgid) # :nodoc:
+      file_lineno = "#{file}:-"
       key_existed = targets.assoc(msgid)
-      if key_existed 
-	targets[targets.index(key_existed)] = key_existed << "#{file}:-"
+      if key_existed and ! targets[targets.index(key_existed)].include?(file_lineno)
+	targets[targets.index(key_existed)] = key_existed << file_lineno
       else
 	targets << [msgid, "#{file}:-"]
       end
@@ -132,12 +134,24 @@ module GetText
 	  unless @@db_loaded
 	    begin
 	      require 'rubygems'
-	      require_gem 'activerecord'
 	    rescue LoadError
 	      $stderr.puts _("rubygems are not found.") if $DEBUG
 	    end
-	    require 'active_record'
-	    require 'gettext/active_record'
+	    begin
+	      ENV["RAILS_ENV"] = @config[:db_mode]
+	      require 'config/boot.rb'
+	      require 'config/environment.rb'
+	      require 'app/controllers/application.rb'
+	    rescue LoadError
+	      require_rails 'rubygems'
+              if Kernel.respond_to? :gem
+                gem 'activerecord'
+              else
+                require_gem 'activerecord'
+              end
+	      require_rails 'active_record'
+	      require_rails 'gettext/active_record'
+	    end
 	    if @config[:adapter]
 	      ActiveRecord::Base.establish_connection(@config)
 	    else
@@ -146,10 +160,6 @@ module GetText
 	      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
 	  end
 	  @@db_loaded = true

data/lib/gettext/parser/ruby.rb

@@ -9,73 +9,13 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: ruby.rb,v 1.8 2006/09/11 16:30:31 mutoh Exp $
+  $Id: ruby.rb,v 1.9 2007/01/13 18:34:08 mutoh Exp $
 =end
 
 require 'irb/ruby-lex.rb'
 require 'stringio'
 
 class RubyLexX < RubyLex  # :nodoc: all
-  
-  def initialize
-    super
-    @prompt = nil
-    @here_header = nil
-    @lex_state = nil
-  end
-  
-  def read_escape
-    case ch = getc
-    when "\n", "\r", "\f"
-    when "\\", "n", "t", "r", "f", "v", "a", "e", "b" #"
-      return "\\".concat(ch)
-    when /[0-7]/
-      ungetc ch
-      3.times do
-        case ch = getc
-        when /[0-7]/
-        when nil
-          break
-        else
-          ungetc
-          break
-        end
-      end
-      
-    when "x"
-      2.times do
-        case ch = getc
-        when /[0-9a-fA-F]/
-        when nil
-          break
-        else
-          ungetc
-          break
-        end
-      end
-      
-    when "M"
-      if (ch = getc) != '-'
-        ungetc
-      else
-        if (ch = getc) == "\\" #"
-          read_escape
-        end
-      end
-      
-    when "C", "c", "^"
-      if ch == "C" and (ch = getc) != "-"
-        ungetc
-      elsif (ch = getc) == "\\" #"
-        read_escape
-      end
-    when '#'
-      return ch
-    else
-      # other characters
-    end
-  end
-
   # Parser#parse resemlbes RubyLex#lex
   def parse
     until (  (tk = token).kind_of?(RubyToken::TkEND_OF_SCRIPT) && !@continue or tk.nil?  )
@@ -114,7 +54,6 @@ class RubyLexX < RubyLex  # :nodoc: all
       
       yield tk
     end
-   
     return nil
   end
 
@@ -185,7 +124,9 @@ module GetText
 	  targets
 	end
       rescue
-	$stderr.puts "\n\nError: #{$!} in #{file_name}:#{tk.line_no}\n\t #{lines[tk.line_no - 1]}"
+	$stderr.print "\n\nError: #{$!.inspect} "
+        $stderr.print " in #{file_name}:#{tk.line_no}\n\t #{lines[tk.line_no - 1]}" if tk
+        $stderr.print "\n"
 	exit
       end
       targets

data/lib/gettext/poparser.rb

@@ -20,7 +20,7 @@ module GetText
 
   class PoParser < Racc::Parser
 
-module_eval <<'..end src/poparser.ry modeval..id22a75cc2c8', 'src/poparser.ry', 90
+module_eval <<'..end src/poparser.ry modeval..idf3e4511031', 'src/poparser.ry', 90
   include GetText
   GetText.bindtextdomain("rgettext")
 
@@ -56,7 +56,7 @@ module_eval <<'..end src/poparser.ry modeval..id22a75cc2c8', 'src/poparser.ry',
 	@q.push [:PLURAL_NUM, $1]
 	str = $'
       when /\A\#~(.*)/
-	$stderr.print _("Warning: obsolete msgid exists.\n")
+	$stderr.print _("Warning: obsolete msgid is existed.\n")
 	$stderr.print "         #{$&}\n"
 	@q.push [:COMMENT, $&]
 	str = $'
@@ -103,7 +103,7 @@ module_eval <<'..end src/poparser.ry modeval..id22a75cc2c8', 'src/poparser.ry',
     @comments << comment
   end 
 
-..end src/poparser.ry modeval..id22a75cc2c8
+..end src/poparser.ry modeval..idf3e4511031
 
 ##### racc 1.4.4 generates ###
 

data/lib/gettext/rails.rb

@@ -6,11 +6,11 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rails.rb,v 1.51 2006/09/10 15:08:32 mutoh Exp $
+  $Id: rails.rb,v 1.55 2007/01/21 15:16:06 mutoh Exp $
 =end
 
 require 'gettext/cgi'
-require 'active_support'
+require 'action_controller'
 
 module GetText
   # GetText::Rails supports Ruby on Rails.
@@ -70,7 +70,6 @@ module GetText
   end
 end
 
-
 module ActionController #:nodoc:
   class Base
     helper GetText::Rails
@@ -78,23 +77,21 @@ module ActionController #:nodoc:
 
     @@gettext_domainnames = []
     @@gettext_content_type = nil
-
+    
     prepend_before_filter :init_gettext
     after_filter :init_content_type
- 
-    
+     
     def init_gettext_main(cgi) #:nodoc:
-      cgi.params["lang"] = [@params["lang"]] if @params["lang"]
+      cgi.params["lang"] = [params["lang"]] if params["lang"]
       set_cgi(cgi)
       set_locale_all(nil)
     end
 
-    REGEXP_GETTEXT_CONTENT_TYPE = /javascript/  #:nodoc:
     def init_content_type #:nodoc:
-      if @headers["Content-Type"] and REGEXP_GETTEXT_CONTENT_TYPE  =~ @headers["Content-Type"]
-	@headers["Content-Type"] = "text/javascript; charset=#{GetText.output_charset}"
-      elsif ! @headers["Content-Type"]
-	@headers["Content-Type"] = "#{@@gettext_content_type}; charset=#{GetText.output_charset}"
+      if headers["Content-Type"] and /javascript/ =~ headers["Content-Type"]
+	headers["Content-Type"] = "text/javascript; charset=#{GetText.output_charset}"
+      elsif ! headers["Content-Type"]
+	headers["Content-Type"] = "#{@@gettext_content_type}; charset=#{GetText.output_charset}"
       end
     end
 
@@ -111,7 +108,7 @@ module ActionController #:nodoc:
     def init_gettext # :nodoc:
       cgi = nil
       if defined? request.cgi
-	cgi = request.cgi
+        cgi = request.cgi
       end
       call_methods_around_init_gettext(@@before_init_gettext)
       init_gettext_main(cgi) if @@gettext_domainnames.size > 0
@@ -170,7 +167,7 @@ module ActionController #:nodoc:
     #   * :content_type - the content type. Default is "text/html"
     #   * :locale_path - the path to locale directory. Default is {RAILS_ROOT}/locale or {plugin root directory}/locale.
     #
-    # locale is searched the order by @params["lang"] > "lang" value of QUERY_STRING > 
+    # locale is searched the order by params["lang"] > "lang" value of QUERY_STRING > 
     # "lang" value of Cookie > HTTP_ACCEPT_LANGUAGE value > Default locale(en). 
     # And the charset is set order by "the argument of bindtextdomain" > HTTP_ACCEPT_CHARSET > Default charset(UTF-8).
     #
@@ -192,14 +189,17 @@ module ActionController #:nodoc:
       if options.kind_of? String
 	# For backward compatibility
 	opt.merge!(:charset => options, :content_type => content_type)
+      else
+	opt.merge!(options)
       end
       GetText.output_charset = opt[:charset]
       @@gettext_content_type = opt[:content_type]
       locale_path = opt[:locale_path]
       unless locale_path
-	begin
-	  locale_path = File.join(caller[0].split(/app.controllers/)[0] + "locale")
-	rescue RuntimeError
+	cal = caller[0]
+	if cal =~ /app.controllers/
+	  locale_path = File.join(cal.split(/app.controllers/)[0] + "locale")
+	else
 	  locale_path = File.join(RAILS_ROOT, "locale")
 	end
       end
@@ -239,7 +239,10 @@ module ActionController #:nodoc:
   class TestRequest < AbstractRequest  #:nodoc:
     @cgi = nil
     def cgi
-      @cgi = CGI.new unless @cgi
+      unless @cgi
+        ENV['REQUEST_URI'] ||= "http://localhost:3000/"
+        @cgi = CGI.new 
+      end
       @cgi
     end
   end
@@ -390,7 +393,7 @@ if defined? ActionMailer
       include GetText::Rails 
       extend GetText::Rails
       
-      alias :_create! :create! #:nodoc:
+      alias :create_without_gettext! :create! #:nodoc:
       
       def base64(text, charset="iso-2022-jp", convert=true)
 	if convert
@@ -403,7 +406,7 @@ if defined? ActionMailer
       end
       
       def create!(*arg) #:nodoc:
-	_create!(*arg)
+	create_without_gettext!(*arg)
 	if Locale.get.language == "ja"
 	  require 'nkf'
 	  @mail.subject = base64(@mail.subject)

data/lib/gettext/rgettext.rb

@@ -2,11 +2,11 @@
 =begin
   rgettext.rb - Generate a .pot file.
 
-  Copyright (C) 2003-2005  Masao Mutoh
+  Copyright (C) 2003-2006  Masao Mutoh
   Copyright (C) 2001,2002  Yasushi Shoji, Masao Mutoh
  
-      Yasushi Shoji   <yashi@yashi.com>
-      Masao Mutoh     <mutoh@highway.ne.jp>
+      Yasushi Shoji   <yashi at atmark-techno.com>
+      Masao Mutoh     <mutoh at highway.ne.jp>
  
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
@@ -25,7 +25,7 @@ module GetText
 
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2006/09/10 15:08:32 $)[1]
+    DATE = %w($Date: 2006/12/14 16:35:57 $)[1]
     MAX_LINE_LEN = 70
 
     @ex_parsers = []
@@ -156,12 +156,12 @@ msgstr ""
 	unless FileTest.exist? out
 	  output = File.new(File.expand_path(out), "w+")
 	else
-	  $stderr.puts(_("File '%s' has already existed.") % out)
+	  $stderr.puts(_("File '%s' already exists.") % out)
 	  exit 1
 	end
       end
 
-      opts.on("-r", "--require=PARSER", _("read an option parser")) do |out|
+      opts.on("-r", "--require=library", _("require the library before executing rgettext")) do |out|
 	require out
       end