gettext 1.9.0 → 1.10.0

data/ChangeLog

@@ -1,3 +1,124 @@
+2007-07-06  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Add to support Action/Fragment caching.
+	* test/gettext_test_rails_caching.rb, test.sh: Added the test for caching.
+	* NEWS: Updated.
+
+2007-07-05  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* src/poparser.ry, lib/gettext/poparser.rb: 
+	Fixed a bug of previous change.
+
+2007-07-04  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* NEWS: Updated.
+	* lib/gettext/version.rb: Increment minor version.
+	* lib/gettext/active_record.rb: Work with script/generate 
+	scaffold_resource. Reported by Bart ten Brinke(Bug#8308)
+	* lib/gettext/utils.rb: On the Win32 default environment, 
+	use "msgmerge" program provided by Ruby-GNOME2 Win32 Installer.
+	* lib/gettext/locale_win32.rb: Fix to find a charset from a locale.
+
+2007-07-03  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb:error_messages_for accept plural models.
+	Reported by Florian Hufsky.
+	Fixed set_error_message_title|explanation.
+	* test/rails/app/model/users.rb, test/rails/test/*: Add tests for 
+	error_messages_for with plural models.
+	* lib/gettext/parser/active_record.rb:
+	remove to require 'application.rb' to avoid the effect
+	of application.rb when parse models. Pointed out by Michel Loiseleur.
+	* po/ca/rails.po: Updated by Ramon Salvadó.
+	* src/poparser.ry, lib/gettext/poparser.rb: Don't append 
+	msgids/msgstrs if the msgstrs don't set.
+	* lib/gettext.rb, lib/gettext/parser/ruby.rb: 
+	Added GetText.nsgettext, ns_. This method has n_ + s_ function. 
+	(e.g.) ns_("File|A file", "%{num} files", i).
+	* test/test_nsgettext.rb, test/po/ja/test_nsgettext.po: Added for
+	the test ns_(), nsgettext.
+	* lib/gettext/rgettext.rb: Normalize msgids.
+	_("Foo") and n_("Foo", "Foos", i) become same msgid "Foo\000Foos".
+	This is the same behavior with xgettext.
+	Reported by Sava Chankov.
+	* lib/gettext/textdomain.rb: Follow above changes.
+	_("Foo") matches the single msgid of n_("Foo", "Foos", i).
+
+2007-06-29  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext.rb: Add GetText.cached=, .cached?, clear_cache.
+	messages are cached in default. If the value is false 
+	or $DEBUG = true then messages are not cached.
+	_ and n_ become 1.2-1.9 times faster than older versions. 
+	* lib/gettext/textdomain.rb, rails.rb: follow the changes 
+	below.
+
+2007-06-28  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* README: Updated.
+	* po/vi/rails.po: Updated by Ngoc Dao.
+	* po/(zh|zh_TW)/rails.po: Updated by Yang Bob.
+
+2007-06-27  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/nl/rails.po: Updated by Menno Jonker
+	* po/(bs|hr)/rails.po: Updated by Sanjin Sehic.
+	* po/pt_BR/rails.po: Updated by Joao Pedrosa.
+	* po/eo/rails.po: Updated by Malte Milatz.
+	* po/de/rails.po: Updated by Patrick Lenz.
+	* po/fr/rgettext.po, rails.po: Updated by David Sulc.
+	* po/et/rails.po: Updated by Erkki Eilonen .
+	*
+2007-06-26  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* test/rails/*: Added tests for ActionMailer.
+	
+2007-04-17  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* test/rails/* : Added tests for rails.
+
+2007-04-16  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: TestRequest#cgi returns GetTextMockGGI, not CGI. 
+
+2007-04-08  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/active_record.rb: Work ActiveRecord::Base::Validation
+	with non ActiveRecord::Base object again. Reported by Maksim Bartenev.
+	* test/gettext_test_activerecord.rb: Add a test for the above change.
+
+2007-04-07  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* **/po/nb/*.po: Added nb locales by Runar Ingebrigtsen.
+
+2007-03-24  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* **/po/(bs|hr)/*.po: Added bs/hr locales by Sanjin Sehic.
+
+2007-03-23  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* **/po/vi/*.po: Added vi locale by Ngoc Dao.
+
+2007-02-11  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails_compat.rb: Added for Rails-1.1.6.
+	(Works with both Rails-1.1.6 and 1.2.2)
+
+2007-02-09  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/nl/rails.po: Fixed wrong translations. 
+	Reported by Bart ten Brinke [Bug #8449]
+
+2007-01-30  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/nl/rails.po: Fixed wrong translations. 
+	Reported by Dirkjan Bussink 
+
+2007-01-25  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/active_record.rb: Fixed #columns again.
+	[Feature Requests #7428]
+
 2007-01-22  Masao Mutoh  <mutoh@highway.ne.jp>
 
 	* NEWS: Updated.
@@ -29,7 +150,7 @@
 
 2006-12-22  Masao Mutoh  <mutoh@highway.ne.jp>
 
-	* **/po/ca/*.po: Added ca(Catalan) locale by Ramon Salvadó.
+	* **/po/ca/*.po: Added ca(Catalan) locale by Ramon Salvad坦.
 
 2006-12-17  Masao Mutoh  <mutoh@highway.ne.jp>
 

data/NEWS

@@ -1,3 +1,24 @@
+= Ruby-GetText-Package-1.10.0 (2007-07-06)
+
+ * Support Vietnamese(vi), Bosnian(bs), Croatian(hr), Norwegian(nb)
+ * Cache messages. Both _() and n_() become 1.3-1.8 times faster 
+   than older version.
+ * Add GetText.ns_() 
+ * Fix bugs.
+ * Enhance to support Ruby on Rails.
+   * Work with script/generate scaffold_resource.
+   * error_messages_for accepts plural models.
+   * Support Action/Fragment caching.
+
+Thanks to:
+  Translators:
+    Dirkjan Bussink, Bart ten Brinke, Ngoc Dao, Sanjin Sehic, 
+    Runar Ingebrigtsen, Menno Jonker, Joao Pedrosa,  Malte Milatz, 
+    Patrick Lenz, David Sulc, Erkki Eilonen, Yang Bob, Ramon Salvadó 
+  Bug reports, suggestions and patches:
+    Maksim Bartenev, Bart ten Brinke, Florian Hufsky, 
+    Michel Loiseleur, Sava Chankov
+
 = Ruby-GetText-Package-1.9.0 (2007-01-22)
 
  * Support Catalan(ca), Esperanto(eo)

data/README

@@ -98,15 +98,15 @@ License
   (See the file 'COPYING'.)
 
 * mo.rb
-  Copyright (C) 2001-2006 Masao Mutoh <mutoh at highwhay.ne.jp>
+  Copyright (C) 2001-2007 Masao Mutoh <mutoh at highwhay.ne.jp>
   Copyright (C) 2001,2002 Masahiro Sakai <s01397ms at sfc.keio.ac.jp>
 
 * gettext.rb
-  Copyright (C) 2001-2006 Masao Mutoh <mutoh at highwhay.ne.jp>
+  Copyright (C) 2001-2007 Masao Mutoh <mutoh at highwhay.ne.jp>
   Copyright (C) 2001,2002 Masahiro Sakai <s01397ms at sfc.keio.ac.jp>
 
 * rgettext 
-  Copyright (C) 2001-2006 Masao Mutoh <mutoh at highwhay.ne.jp>
+  Copyright (C) 2001-2007 Masao Mutoh <mutoh at highwhay.ne.jp>
   Copyright (C) 2001,2002 Yasushi Shoji <yashi at atmark-techno.com>
 
 * setup.rb
@@ -114,22 +114,24 @@ License
   This file is released under LGPL. See the top of the install.rb.
 
 * Others
-  Copyright (C) 2001-2006 Masao Mutoh <mutoh at highwhay.ne.jp>
+  Copyright (C) 2001-2007 Masao Mutoh <mutoh at highwhay.ne.jp>
 
 
 Translators
 -----------
+Bosnian(bs)                - Sanjin Sehic <saserr at gmail.com>
 Catalan(ca)                - Ramon Salvadó <rsalvado at gnuine.com>
 Chinese(Simplified)(zh_CN) - Yang Bob <bob.yang.dev at gmail.com> (current)
                              Yingfeng <blogyingfeng at gmail.com>
 Chinese(Traditional)(zh_TW)- Yang Bob <bob.yang.dev at gmail.com> (current)
                              LIN CHUNG-YI <xmarsh at gmail.com>
+Croatian(hr)               - Sanjin Sehic <saserr at gmail.com>
 Czech(cs)                  - Karel Miarka <kajism at yahoo.com>
 Dutch(nl)                  - Menno Jonkers <ruby-gettext at jonkers.com>
 Esperanto(eo)              - Malte Milatz <malte at gmx-topmail.de>
 Estonian(et)               - Erkki Eilonen <erkki at itech.ee>
-French(fr)                 - Laurent Sansonetti <laurent.sansonetti at gmail.com> (current)
-                             David Sulc <davidsulc at gmail.com>
+French(fr)                 - David Sulc <davidsulc at gmail.com> (current)
+                             Laurent Sansonetti <laurent.sansonetti at gmail.com> 
 German(de)                 - Patrick Lenz <patrick at limited-overload.de> (current)
                              Detlef Reichl <detlef.reichl at gmx.org>
                              Sven Herzberg <herzi at abi02.de>
@@ -139,33 +141,39 @@ Italian(it)                - Marco Lazzeri <marco.lazzeri at gmail.com>
                              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>
+Norwegian(nb)              - Runar Ingebrigtsen <runar at mopo.no>
 Portuguese(Brazil)(pt_BR)  - Antonio S. de A. Terceiro <terceiro at softwarelivre.org>
                              Joao Pedrosa <joaopedrosa at gmail.com> (current)
 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>
+Vietnamese(vi)             - Ngoc Dao <ngocdaothanh at gmail.com>
 
 Status of translations
 ----------------------
-Catalan(ca)               - 1.9.0 (new)
-Chinese(zh_CN)            - 1.9.0
-Chinese(zh_TW)            - 1.9.0
-Czech(cs)                 - 1.9.0
-Dutch(nl)                 - 1.9.0
-English(default)          - 1.9.0
-Esperanto(eo)             - 1.9.0 (new)
-Estonian(et)              - 1.8.0 (rails.po only)
-French(fr)                - 1.8.0 (old)
-German(de)                - 1.9.0
-Greek(el)                 - 1.9.0
-Spanish(es)               - 1.9.0
+Bosnian(bs)               - 1.10.0 (new)
+Catalan(ca)               - 1.10.0
+Croatian(hr)              - 1.10.0 (new)
+Chinese(zh_CN)            - 1.10.0
+Chinese(zh_TW)            - 1.10.0
+Czech(cs)                 - 1.9.0 (old)
+Dutch(nl)                 - 1.10.0
+English(default)          - 1.9.0 (old)
+Esperanto(eo)             - 1.10.0
+Estonian(et)              - 1.10.0 (rails.po only)
+French(fr)                - 1.10.0
+German(de)                - 1.10.0
+Greek(el)                 - 1.9.0 (old)
+Spanish(es)               - 1.9.0 (old)
 Italian(it)               - 1.6.0 (old)
-Japanese(ja)              - 1.9.0
-Korean(ko)                - 1.9.0
-Portuguese(Brazil)(pt_BR) - 1.9.0
-Russian(ru)               - 1.9.0
+Japanese(ja)              - 1.10.0
+Korean(ko)                - 1.9.0 (old)
+Norwegian(nb)             - 1.9.0 (new)
+Portuguese(Brazil)(pt_BR) - 1.10.0
+Russian(ru)               - 1.10.0
 Swedish(sv)               - 0.8.0 (old)
+Vietnamese(vi)            - 1.10.0 (new)
 
 Maintainer
 ----------

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