gettext 1.4.0 → 1.5.0

data/ChangeLog

@@ -1,3 +1,49 @@
+2006-05-07  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/version.rb: Increment revision number.
+	* NEWS: Updated.
+
+2006-05-06  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: error_messages_for works same as
+	actionpack-1.12.1 when nil or symbol are given as @object_name.
+	By arton.
+	* test/gettext_test_rails.rb: Works again.
+
+2006-05-05  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/parser/activerecord.rb: Fixed again.
+
+2006-05-04  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/parser/activerecord.rb: Fixed "duplicate message definition" 
+	error in rake updatepo task using ActiveRecord::Base.set_table_name.
+	Reported by Karel Miarka.
+
+2006-05-02  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Fixed an abort when Rails::Info isn't 
+	required like as Typo. Reported by Masayoshi Takahashi.
+
+2006-04-30  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/textdomain.rb: Added GetText::TextDomain#check_mo=, 
+	#check_mo?. When the value is true, check the MOFile and if it's 
+	updated, reload MOFile again. This is usefule for development 
+	time.
+	* lib/gettext/rails.rb: When development mode, check mo files
+	and reload it if it's updated.
+	* lib/gettext/mo.rb: Added MOFile#update!.
+	* lib/gettext/string.rb: String#% doesn't raise ArgumentError
+	when execute ruby with -d option.
+
+2006-04-21  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/po/ru/*.po, samples/cgi/po/ru/*.po, 
+	samples/rails/po/ru/*.po, po/rgettext.po, 
+	rails.po: Added Russian locale by Yuri Kozlov.
+	* README: Revised.
+
 2006-04-15  Masao Mutoh  <mutoh@highway.ne.jp>
 
 	* NEWS: Updated.

data/NEWS

@@ -1,3 +1,12 @@
+= Ruby-GetText-Package-1.5.0 (2006-05-07)
+
+ * Support Russian.
+ * Fix bugs.
+ * Refresh mo option was added.
+   Check mo files and reload it if it's updated.
+   ruby -d or GetText::TextDomain#check_mo=(true).
+   Or development mode in Ruby on Rails.
+
 = Ruby-GetText-Package-1.4.0 (2006-04-15)
 
  * Support OpenBSD.

data/README

@@ -101,34 +101,37 @@ License
 
 Translators
 -----------
-Czech              - Karel Miarka <kajism at yahoo.com>
-Dutch              - Menno Jonkers <ruby-gettext at jonkers.com>
-French             - Laurent Sansonetti <laurent.sansonetti at gmail.com>
-German             - Detlef Reichl <detlef.reichl at gmx.org>
-                     Sven Herzberg <herzi at abi02.de>
-                     Sascha Ebach <se at digitale-wertschoepfung.de>
-Greek              - Damphyr <damphyr at gmx.net>
-Italian            - Gabriele Renzi <surrender_it at yahoo.it>
-Japanese           - Masao Mutoh <mutoh at highway.ne.jp>
-Korean             - Gyoung-Yoon Noh <nohmad at gmail.com>
-Portuguese(Brazil) - Joao Pedrosa <joaopedrosa at gmail.com>
-Spanish            - David Espada <davinci at escomposlinux.org> (current)
-                     David Moreno Garza <damog at damog.net>
-Swedish            - Nikolai Weibull <mailing-lists.ruby-talk at rawuncut.elitemail.org>
+Czech(cs)                 - Karel Miarka <kajism at yahoo.com>
+Dutch(nl)                 - Menno Jonkers <ruby-gettext at jonkers.com>
+French(fr)                - Laurent Sansonetti <laurent.sansonetti at gmail.com>
+German(de)                - Detlef Reichl <detlef.reichl at gmx.org>
+                            Sven Herzberg <herzi at abi02.de>
+                            Sascha Ebach <se at digitale-wertschoepfung.de>
+Greek(el)                 - Damphyr <damphyr at gmx.net>
+Italian(it)               - Gabriele Renzi <surrender_it at yahoo.it>
+Japanese(ja)              - Masao Mutoh <mutoh at highway.ne.jp>
+Korean(ko)                - Gyoung-Yoon Noh <nohmad at gmail.com>
+Portuguese(Brazil)(pt_BR) - Joao Pedrosa <joaopedrosa at gmail.com>
+Russian(ru)               - Yuri Kozlov <kozlov.y at gmail.com>
+Spanish(es)               - David Espada <davinci at escomposlinux.org> (current)
+                            David Moreno Garza <damog at damog.net>
+Swedish(sv)               - Nikolai Weibull <mailing-lists.ruby-talk at rawuncut.elitemail.org>
 
 Status of translations
 ----------------------
-cs    - 1.4.0
-fr    - 1.4.0
-de    - 1.4.0
-el    - 1.4.0
-es    - 1.4.0
-it    - 1.0.0 (old)
-ja    - 1.4.0
-ko    - 1.4.0
-nl    - 1.4.0
-pt_BR - 1.4.0
-sv    - 0.8.0 (old)
+Czech(cs)                 - 1.5.0
+Dutch(nl)                 - 1.5.0
+English(default)          - 1.5.0
+French(fr)                - 1.5.0
+German(de)                - 1.5.0
+Greek(el)                 - 1.5.0
+Spanish(es)               - 1.5.0
+Italian(it)               - 1.0.0 (old)
+Japanese(ja)              - 1.5.0
+Korean(ko)                - 1.5.0
+Portuguese(Brazil)(pt_BR) - 1.5.0
+Russian(ru)               - 1.5.0
+Swedish(sv)               - 0.8.0 (old)
 
 Maintainer
 ----------

data/lib/gettext/mo.rb

@@ -1,7 +1,7 @@
 =begin
     mo.rb - A simple class for operating GNU MO file.
 
-    Copyright (C) 2003-2005  Masao Mutoh
+    Copyright (C) 2003-2006  Masao Mutoh
     Copyright (C) 2002  Masahiro Sakai, Masao Mutoh
     Copyright (C) 2001  Masahiro Sakai
 
@@ -12,7 +12,7 @@
     of Ruby.  License of Ruby is included with Ruby distribution in
     the file "README".
 
-    $Id: mo.rb,v 1.3 2006/02/23 14:53:59 mutoh Exp $
+    $Id: mo.rb,v 1.4 2006/04/29 17:17:15 mutoh Exp $
 =end
 
 require 'gettext/iconv'
@@ -33,21 +33,42 @@ class MOFile < Hash #:nodoc:
 
   def self.open(arg = nil, output_charset = nil)
     result = self.new(output_charset)
-    case arg
-    when String
-      result.load_from_file(arg)
-    when IO
-      result.load_from_stream(arg)
-    end
-    result
+    result.load(arg)
   end
 
   def initialize(output_charset = nil)
+    @filename = nil
+    @last_modified = Time.now
     @little_endian = true
     @output_charset = output_charset
     super()
   end
 
+  def update!
+    if FileTest.exist?(@filename)
+      load (@filename) unless (@last_modified == File.ctime(@filename))
+    else
+      puts "#{@filename} was lost." if $DEBUG
+      clear
+    end
+    self
+  end
+
+  def load(arg)
+    case arg
+    when String
+      begin
+	@last_modified = File.ctime(arg)
+      rescue Exception
+      end
+      load_from_file(arg)
+    when IO
+      load_from_stream(arg)
+    end
+    @filename = arg
+    self
+  end
+
   def load_from_stream(io)
     magic = io.read(4)
     case magic
@@ -238,7 +259,7 @@ class MOFile < Hash #:nodoc:
   end
 
 
-  attr_accessor :little_endian
+  attr_accessor :little_endian, :path, :last_modified
   attr_reader :charset, :nplurals, :plural
 end
 

data/lib/gettext/parser/activerecord.rb

@@ -7,7 +7,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: activerecord.rb,v 1.6 2006/02/22 16:42:41 mutoh Exp $
+  $Id: activerecord.rb,v 1.8 2006/05/06 14:59:08 mutoh Exp $
 =end
 
 require 'gettext'
@@ -70,15 +70,16 @@ module GetText
       loaded_constants.each do |classname|
 	klass = eval(classname)
 	if klass < ActiveRecord::Base
-	  targets << [::Inflector.singularize(klass.table_name.gsub(/_/, " ")), "#{file}:-"]
+	  add_target(targets, file, ::Inflector.singularize(klass.table_name.gsub(/_/, " ")))
 	  tablename = klass.class_name
 	  begin
 	    klass.columns.each do |column|
 	      if @config[:use_classname]
-		targets << [tablename + "|" +  klass.human_attribute_name(column.name), "#{file}:-"]
+		msgid = tablename + "|" +  klass.human_attribute_name(column.name)
 	      else
-		targets << [klass.human_attribute_name(column.name), "#{file}:-"]
+		msgid = klass.human_attribute_name(column.name)
 	      end
+	      add_target(targets, file, msgid)
 	    end
 	  rescue
 	    $stderr.puts _("No database is available.")
@@ -93,6 +94,16 @@ module GetText
       targets
     end
 
+    def add_target(targets, file, msgid) # :nodoc:
+      key_existed = targets.assoc(msgid)
+      if key_existed 
+	targets[targets.index(key_existed)] = key_existed << "#{file}:-"
+      else
+	targets << [msgid, "#{file}:-"]
+      end
+      targets
+    end
+
     def target?(file) # :nodoc:
       init(nil) unless @ar_re
       data = IO.readlines(file)

data/lib/gettext/poparser.rb

@@ -20,7 +20,7 @@ module GetText
 
   class PoParser < Racc::Parser
 
-module_eval <<'..end src/poparser.ry modeval..id9eaafde9e3', 'src/poparser.ry', 90
+module_eval <<'..end src/poparser.ry modeval..id4c20337d09', 'src/poparser.ry', 90
   include GetText
   GetText.bindtextdomain("rgettext")
 
@@ -103,7 +103,7 @@ module_eval <<'..end src/poparser.ry modeval..id9eaafde9e3', 'src/poparser.ry',
     @comments << comment
   end 
 
-..end src/poparser.ry modeval..id9eaafde9e3
+..end src/poparser.ry modeval..id4c20337d09
 
 ##### racc 1.4.4 generates ###
 

data/lib/gettext/rails.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rails.rb,v 1.29 2006/03/25 08:32:53 mutoh Exp $
+  $Id: rails.rb,v 1.33 2006/05/06 14:59:08 mutoh Exp $
 =end
 
 require 'gettext/cgi'
@@ -360,9 +360,9 @@ module ActionView #:nodoc:
 
 	  options = options.symbolize_keys
 
-	  unless object.errors.empty?
+	  if object && ! object.errors.empty?
 	    count = object.errors.count
-	    record = ActiveRecord::Base.human_attribute_table_name_for_error(object_name)
+	    record = ActiveRecord::Base.human_attribute_table_name_for_error(object_name.to_s)
 	    render_error_message(object, klass, record, count, options)
 	  end
 	end
@@ -409,6 +409,15 @@ module ActionMailer #:nodoc:
   end
 end
 
-Rails::Info.property("GetText version") do 
-  GetText::VERSION 
+begin
+  Rails::Info.property("GetText version") do 
+    GetText::VERSION 
+  end
+rescue Exception
+  $stderr.puts "GetText: #{GetText::VERSION} Rails::Info is not found." if $DEBUG
+end
+
+
+if ::RAILS_ENV == "development"
+  GetText::TextDomain.check_mo = true
 end

data/lib/gettext/string.rb

@@ -42,7 +42,12 @@ class String
       ret
     else
       ret = gsub(/%\{/, '%%{')
-      ret._old_format_m(args)
+      begin
+	ret._old_format_m(args)
+      rescue ArgumentError
+	$stderr.puts "  The string:#{ret}"
+	$stderr.puts "  args:#{args.inspect}"
+      end
     end
   end
 end

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.15 2006/03/15 16:55:47 mutoh Exp $
+  $Id: textdomain.rb,v 1.16 2006/04/29 17:17:15 mutoh Exp $
 =end
 
 require 'gettext/string'
@@ -29,6 +29,22 @@ module GetText
     attr_reader :current_locale
     attr_reader :current_mo
 
+    @@check_mo = false
+    # Check mo-file is modified or not, and if mo-file is modified,
+    # reload mo-file again. This is effective in debug mode.
+    # Default is false. If $DEBUG is true, mo-file is checked even if
+    # this value is false.
+    # * Returns: true if "check mo" mode.
+    def self.check_mo?
+      @@check_mo
+    end
+
+    # Sets to check mo-file or not. See GetText::TextDoman.check_mo? for more details.
+    # * val: true if "check mo" mode.
+    # * Returns: val
+    def self.check_mo=(val)
+      @@check_mo = val
+    end
     # The default locale paths.
     DEFAULT_LOCALE_PATHS = [
       "#{Config::CONFIG['datadir']}/locale/%{locale}/LC_MESSAGES/%{name}.mo",
@@ -145,8 +161,15 @@ module GetText
       unless reload
 	@current_mo = @mofiles[@current_locale]
 	if @current_mo
-	  @current_mo = (@current_mo == :empty) ? nil : @current_mo
-	  return @current_mo
+	  if @current_mo == :empty
+	    @current_mo = nil
+	    return nil unless (@@check_mo or $DEBUG)
+	  elsif (@@check_mo or $DEBUG)
+	    @current_mo.update!
+	    return @current_mo
+	  else
+	    return @current_mo
+	  end
 	end
       end
       locales = [@current_locale.orig_str, @current_locale.to_posix, @current_locale.language]
@@ -163,7 +186,13 @@ module GetText
 	}
       end
       unless @current_mo
-	@mofiles[@current_locale] = :empty
+        @mofiles[@current_locale] = :empty
+        if $DEBUG
+          $stderr.puts "MO file is not found in"
+          @search_files.each do |v|
+            $stderr.puts "  #{v}"
+          end
+        end
       end
       @current_mo
     end

data/lib/gettext/version.rb

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