gettext 1.8.0-mswin32 → 1.9.0-mswin32

data/ChangeLog

@@ -1,3 +1,123 @@
+2007-01-22  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* NEWS: Updated.
+	* lib/gettext/active_record.rb: Use alias_method_chain not to 
+	override original methods directly(again). [Feature Requests #7428]
+	* test/gettext_test_parser.rb: Add tests for activerecord parser. 
+	* lib/gettext/rails.rb: Require action_controller instead of activesupport
+	for Rails-1.2.1.
+	* po/el/*.po: Updated by Vassilis Rizopoulos.
+	* po/ja/rails.po: Fixed typos by NANKI Haruo.
+
+2007-01-16  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/parser/active_record.rb: Don't duplicate "file:-".
+
+2007-01-14  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/active_record.rb: Use alias_method_chain not to 
+	override original methods directly. [Feature Requests #7428]
+	* test/gettext_test_active_record.rb: Update to work Rails-1.2RC2.
+	
+2006-12-26  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/zh/*.po, po/zh_TW/*.po: Updated by Yang Bob.
+
+2006-12-22  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/rails/po/eo/blog.po: Fixed some typos by Malte Milatz.
+
+2006-12-22  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* **/po/ca/*.po: Added ca(Catalan) locale by Ramon Salvadó.
+
+2006-12-17  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/cs/*.po: Updated by Karel Miarka.
+	* **/po/eo/*.po: Added eo(Esperanto) locale by Malte Milatz.
+
+2006-12-15  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/ko/*.po: Updated by Gyoung-Yoon Noh.
+
+2006-12-10  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/de/*.po: Updated by Patrick Lenz.
+	* po/nl/*.po: Updated by Menno Jonkers.
+	* po/es/*.po: Updated by David Espada.
+
+2006-12-09  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/pt_BR/*.po: Updated by Joao Pedrosa.
+	* po/ru/*.po: Updated by Yuri Kozlov.
+	* po/ja/*.po: Updated.
+
+2006-12-08  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rgettext.rb: Improve option messages. 
+
+2006-12-07  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/erb.rb: Removed the dependency to GetText::Container which was 
+	deprecated.
+
+2006-12-05  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/poparser.rb: Added.
+
+2006-12-03  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext.rb: Changed GetText.locale= to set not only current locale
+	to all Textdomains but also default locale.
+	* lib/gettext/locale.rb: Locale.set_default accept locale as String.
+	* test/gettext_test_active_record.rb: Update to test activerecord-1.14.4.6657.
+
+2006-12-02  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Unit test works on 1.2RC1. Reported by KAKUTANI Shintaro.
+	* lib/gettext.rb: Updates default locale when using GetText.set_locale_all 
+	* po/**/rails.po[t]: Updated.
+
+2006-11-27  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Fix the deprecated accessing to instance variables
+	directly for rails 1.2RC1. 
+
+2006-11-06  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/utils.rb: Skip to create new po-files.
+	It avoids the po-files become empty when GNU msgmerge was failed.
+	By Fabian Kreutz.
+
+2006-10-21  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/fr/rails.po: Improved by David Sulc.
+
+2006-10-15  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/parser/active_record.rb: Work updatepo task with rails_edge.
+
+2006-10-08  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/parser/active_record.rb: Fixed an error using hbtm.
+	Reported by Mihnea Capraru.
+
+2006-10-04  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* README, lib/gettext/rgettext.rb: Changed the author e-mail address.
+
+2006-09-24  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/active_record.rb: Re-fix to work rails_edge again. 
+	Reported by Isak Hansen.
+	* po/pt_BR/rails.po: Updated by Antonio S. de A. Terceiro.
+
+2006-09-21  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Fixed a bug init_gettext can't accept
+	any options correctly and locale_path was set wrong value.
+	Reported by pedro palazon.
+
 2006-09-12  Masao Mutoh  <mutoh@highway.ne.jp>
 
 	* lib/gettext/textdomain.rb: Fixed a bug of add_default_locale_path.

data/NEWS

@@ -1,3 +1,19 @@
+= Ruby-GetText-Package-1.9.0 (2007-01-22)
+
+ * Support Catalan(ca), Esperanto(eo)
+ * Update translations: zh_CN, zh_TW, cs, nl, en, de, el, es, ja, ko, pt_BR, ru.
+ * Support Ruby on Rails-1.2.1.
+ * Code cleanupand improved. Fixed bugs.
+
+Thanks to:
+  Translators: 
+    Antonio S. de A. Terceiro, David Espada, David Sulc, Gyoung-Yoon Noh, 
+    Joao Pedrosa, Malte Milatz, Menno Jonkers, Patrick Lenz, Yang Bob, 
+    Yuri Kozlov, Vassilis Rizopoulos
+
+  Bug reports, suggestions and patches:
+    Fabian Kreutz, KAKUTANI Shintaro, Mihnea Capraru, NANKI Haruo, pedro palazon
+
 = Ruby-GetText-Package-1.8.0 (2006-09-11)
 
  * Support Chinese(Taiwan: zh_TW), Estonian(et: rails.po only)

data/README

@@ -107,7 +107,7 @@ License
 
 * rgettext 
   Copyright (C) 2001-2006 Masao Mutoh <mutoh at highwhay.ne.jp>
-  Copyright (C) 2001,2002 Yasushi Shoji <yashi at yashi.com>
+  Copyright (C) 2001,2002 Yasushi Shoji <yashi at atmark-techno.com>
 
 * setup.rb
   Copyright (C) 2000-2005 Minero Aoki <aamine at loveruby.net>
@@ -119,22 +119,28 @@ License
 
 Translators
 -----------
-Chinese(Simplified)(zh_CN) - Yingfeng <blogyingfeng at gmail.com>
-Chinese(Traditional)(zh_TW)- LIN CHUNG-YI <xmarsh 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>
 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>
+French(fr)                 - Laurent Sansonetti <laurent.sansonetti at gmail.com> (current)
+                             David Sulc <davidsulc 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>
                              Sascha Ebach <se at digitale-wertschoepfung.de>
-Greek(el)                  - Damphyr <damphyr at gmx.net>
+Greek(el)                  - Vassilis Rizopoulos <damphyr at gmx.net>
 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>
-Portuguese(Brazil)(pt_BR)  - Joao Pedrosa <joaopedrosa at gmail.com>
+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>
@@ -142,21 +148,23 @@ Swedish(sv)                - Nikolai Weibull <mailing-lists.ruby-talk at rawuncu
 
 Status of translations
 ----------------------
-Chinese(zh_CN)            - 1.8.0
-Chinese(zh_TW)            - 1.8.0
-Czech(cs)                 - 1.8.0
-Dutch(nl)                 - 1.8.0
-English(default)          - 1.8.0
+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
-German(de)                - 1.8.0
-Greek(el)                 - 1.6.0 (old)
-Spanish(es)               - 1.8.0
+French(fr)                - 1.8.0 (old)
+German(de)                - 1.9.0
+Greek(el)                 - 1.9.0
+Spanish(es)               - 1.9.0
 Italian(it)               - 1.6.0 (old)
-Japanese(ja)              - 1.8.0
-Korean(ko)                - 1.8.0
-Portuguese(Brazil)(pt_BR) - 1.8.0
-Russian(ru)               - 1.8.0
+Japanese(ja)              - 1.9.0
+Korean(ko)                - 1.9.0
+Portuguese(Brazil)(pt_BR) - 1.9.0
+Russian(ru)               - 1.9.0
 Swedish(sv)               - 0.8.0 (old)
 
 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.4
+top_srcdir = $(DESTDIR)/develop/win/ruby/ruby-1.8.5
 archdir = $(rubylibdir)/$(arch)
 sbindir = $(exec_prefix)/sbin
 datadir = $(prefix)/share
@@ -36,8 +36,10 @@ LIBRUBY_A = $(RUBY_SO_NAME)-static.lib
 LIBRUBYARG_SHARED = $(LIBRUBY)
 LIBRUBYARG_STATIC = $(LIBRUBY_A)
 
+RUBY_EXTCONF_H = 
 CFLAGS   =  -MD -Zi -O2b2xg- -G6 
-CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) -DHAVE_WINDOWS_H 
+INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
+CPPFLAGS =  
 CXXFLAGS = $(CFLAGS) 
 DLDFLAGS =  -link -incremental:no -debug -opt:ref -opt:icf -dll $(LIBPATH) -def:$(DEFFILE) -implib:$(*F:.so=)-$(arch).lib -pdb:$(*F:.so=)-$(arch).pdb 
 LDSHARED = cl -nologo -LD
@@ -78,6 +80,7 @@ SRCS = locale_system.c
 OBJS = locale_system.obj
 TARGET = locale_system
 DLLIB = $(TARGET).so
+EXTSTATIC = 
 STATIC_LIB = 
 
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
@@ -95,7 +98,7 @@ clean:
 		@-$(RM) $(CLEANLIBS:/=\) $(CLEANOBJS:/=\) $(CLEANFILES:/=\)
 
 distclean:	clean
-		@-$(RM) Makefile extconf.h conftest.* mkmf.log
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES:/=\)
 
 realclean:	distclean
@@ -119,52 +122,52 @@ site-install-rb: install-rb
 .SUFFIXES: .c .m .cc .cxx .cpp .obj
 
 {$(srcdir)}.cc{}.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
 
 {$(topdir)}.cc{}.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
 
 {$(hdrdir)}.cc{}.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
 
 .cc.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
 
 {$(srcdir)}.cxx{}.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
 
 {$(topdir)}.cxx{}.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
 
 {$(hdrdir)}.cxx{}.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
 
 .cxx.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
 
 {$(srcdir)}.cpp{}.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
 
 {$(topdir)}.cpp{}.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
 
 {$(hdrdir)}.cpp{}.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
 
 .cpp.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+	$(CXX) $(INCFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
 
 {$(srcdir)}.c{}.obj:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
 
 {$(topdir)}.c{}.obj:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
 
 {$(hdrdir)}.c{}.obj:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
 
 .c.obj:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+	$(CC) $(INCFLAGS) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
 
 $(DLLIB): $(DEFFILE) $(OBJS)
 	@-$(RM) $@

data/ext/gettext/mkmf.log

@@ -1,15 +1,9 @@
-have_header: checking for windows.h... -------------------- yes
+have_header: checking for windows.h... -------------------- no
 
-"cl -I. -Ie:/ruby/lib/ruby/1.8/i386-mswin32  -MD -Zi -O2b2xg- -G6  conftest.c -P"
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 13.10.3077 for 80x86
-Copyright (C) Microsoft Corporation 1984-2002. All rights reserved.
-
-cl : Command line warning D4029 : optimization is not available in the standard edition compiler
-cl : Command line warning D4002 : ignoring unknown option '-Og-'
-conftest.c
+"cl -I. -Ie:/ruby/lib/ruby/1.8/i386-mswin32 -I.  -MD -Zi -O2b2xg- -G6  conftest.c -P"
 checked program was:
 /* begin */
-#include <windows.h>
+1: #include <windows.h>
 /* end */
 
 --------------------

data/lib/gettext.rb

@@ -10,7 +10,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: gettext.rb,v 1.20 2006/09/10 15:08:32 mutoh Exp $
+  $Id: gettext.rb,v 1.22 2006/12/03 16:26:59 mutoh Exp $
 =end
 
 require 'rbconfig'
@@ -241,7 +241,7 @@ module GetText
     msg
   end
 
-  # Sets the default locale to the current class/module
+  # Sets the current locale to the current class/module
   #
   # Notice that you shouldn't use this for your own Libraries.
   # * locale: a locale string or Locale::Object.
@@ -276,9 +276,9 @@ module GetText
     self
   end
 
-  # Sets locale to the all textdomains.
+  # Sets current locale to the all textdomains.
   #
-  # Notice that you shouldn't use this for your own Libraries.
+  # Note that you shouldn't use this for your own Libraries.
   # * locale: a locale string or Locale::Object, otherwise nil to use default locale.
   # * Returns: self
   def set_locale_all(locale)
@@ -289,24 +289,27 @@ module GetText
       else
 	ret = Locale::Object.new(locale.to_s)
       end
-      Locale.set_current(ret)
     else
-      Locale.set_current(nil)
-      ret = Locale.get
+      ret = Locale.default
     end
     ret.charset = output_charset if output_charset
+    Locale.set_current(ret)
     TextDomainManager.each_all {|textdomain|
       textdomain.set_locale(ret)
     }
     self
   end
 
-  # Same as GetText.set_locale_all.
-  # * locale: a locale string
+  # Sets the default/current locale. This method haves the strongest infulence.
+  # All of the Textdomains are set the new locale. 
+  #
+  # Note that you shouldn't use this for your own Libraries.
+  # * locale: a locale string or Locale::Object
   # * Returns: a locale string
   def locale=(locale)
+    Locale.default = locale
     set_locale_all(locale)
-    locale
+    Locale.default
   end
 
   # Sets charset(String) such as "euc-jp", "sjis", "CP932", "utf-8", ...