gettext 1.9.0-mswin32 → 1.10.0-mswin32

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/ext/gettext/Makefile

@@ -13,7 +13,7 @@ prefix = $(DESTDIR)/ruby
 exec_prefix = $(prefix)
 sitedir = $(prefix)/lib/ruby/site_ruby
 rubylibdir = $(libdir)/ruby/$(ruby_version)
-top_srcdir = $(DESTDIR)/develop/win/ruby/ruby-1.8.5
+top_srcdir = $(DESTDIR)/develop/win/ruby/ruby-1.8.5-p12
 archdir = $(rubylibdir)/$(arch)
 sbindir = $(exec_prefix)/sbin
 datadir = $(prefix)/share
@@ -75,7 +75,7 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  oldnames.lib user32.lib advapi32.lib wsock32.lib  
+LIBS = $(LIBRUBYARG_SHARED)  oldnames.lib user32.lib advapi32.lib ws2_32.lib  
 SRCS = locale_system.c
 OBJS = locale_system.obj
 TARGET = locale_system

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: