gettext 1.4.0-mswin32 → 1.5.0-mswin32

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

@@ -0,0 +1,178 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = e:/ruby/lib/ruby/1.8/i386-mswin32
+hdrdir = $(topdir)
+VPATH = $(srcdir);$(topdir);$(hdrdir)
+
+DESTDIR = e:
+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
+archdir = $(rubylibdir)/$(arch)
+sbindir = $(exec_prefix)/sbin
+datadir = $(prefix)/share
+includedir = $(prefix)/include
+infodir = $(prefix)/info
+sysconfdir = $(prefix)/etc
+mandir = $(prefix)/man
+libdir = $(exec_prefix)/lib
+sharedstatedir = $(DESTDIR)/etc
+oldincludedir = $(DESTDIR)/usr/include
+sitearchdir = $(sitelibdir)/$(sitearch)
+localstatedir = $(DESTDIR)/var
+bindir = $(exec_prefix)/bin
+sitelibdir = $(sitedir)/$(ruby_version)
+libexecdir = $(exec_prefix)/libexec
+
+CC = cl -nologo
+LIBRUBY = $(RUBY_SO_NAME).lib
+LIBRUBY_A = $(RUBY_SO_NAME)-static.lib
+LIBRUBYARG_SHARED = $(LIBRUBY)
+LIBRUBYARG_STATIC = $(LIBRUBY_A)
+
+CFLAGS   =  -MD -Zi -O2b2xg- -G6 
+CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) -DHAVE_WINDOWS_H 
+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
+AR = lib -nologo
+EXEEXT = .exe
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = msvcrt-ruby18
+arch = i386-mswin32
+sitearch = i386-msvcrt
+ruby_version = 1.8
+ruby = e:/ruby/bin/ruby
+RUBY = $(ruby:/=\)
+RM = $(RUBY) -run -e rm -- -f
+MAKEDIRS = @$(RUBY) -run -e mkdir -- -p
+INSTALL = copy > nul
+INSTALL_PROG = $(INSTALL)
+INSTALL_DATA = $(INSTALL)
+COPY = copy > nul
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = $(libdir)
+LIBPATH =  -libpath:"$(libdir)"
+DEFFILE = $(TARGET)-$(arch).def
+
+CLEANFILES = 
+DISTCLEANFILES = vc*.pdb $(DEFFILE)
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED)  oldnames.lib user32.lib advapi32.lib wsock32.lib  
+SRCS = locale_system.c
+OBJS = locale_system.obj
+TARGET = locale_system
+DLLIB = $(TARGET).so
+STATIC_LIB = 
+
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.obj *.lib *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS:/=\) $(CLEANOBJS:/=\) $(CLEANFILES:/=\)
+
+distclean:	clean
+		@-$(RM) Makefile extconf.h conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES:/=\)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB:/=\) $(RUBYARCHDIR:/=\)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .obj
+
+{$(srcdir)}.cc{}.obj:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(topdir)}.cc{}.obj:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(hdrdir)}.cc{}.obj:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+.cc.obj:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(srcdir)}.cxx{}.obj:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(topdir)}.cxx{}.obj:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(hdrdir)}.cxx{}.obj:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+.cxx.obj:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(srcdir)}.cpp{}.obj:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(topdir)}.cpp{}.obj:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(hdrdir)}.cpp{}.obj:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+.cpp.obj:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
+
+{$(srcdir)}.c{}.obj:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+
+{$(topdir)}.c{}.obj:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+
+{$(hdrdir)}.c{}.obj:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+
+.c.obj:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+
+$(DLLIB): $(DEFFILE) $(OBJS)
+	@-$(RM) $@
+	$(LDSHARED) -Fe$(@) $(OBJS) $(LIBS) $(LOCAL_LIBS) $(DLDFLAGS)
+
+
+
+$(DEFFILE): 
+	$(RUBY) -e "puts 'EXPORTS', 'Init_$(TARGET)'"  > $@
+
+$(OBJS): {.;$(srcdir);$(topdir);$(hdrdir)}ruby.h {.;$(srcdir);$(topdir);$(hdrdir)}defines.h

data/ext/gettext/locale_system-i386-mswin32.def

@@ -0,0 +1,2 @@
+EXPORTS
+Init_locale_system

data/ext/gettext/mkmf.log

@@ -0,0 +1,16 @@
+have_header: checking for windows.h... -------------------- yes
+
+"cl -I. -Ie:/ruby/lib/ruby/1.8/i386-mswin32  -MD -Zi -O2b2xg- -G6  conftest.c -P"
+Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14.00.50727.42 for 80x86
+Copyright (C) Microsoft Corporation.  All rights reserved.
+
+cl : Command line warning D9035 : option 'Og-' has been deprecated and will be removed in a future release
+cl : Command line warning D9002 : ignoring unknown option '-G6'
+conftest.c
+checked program was:
+/* begin */
+#include <windows.h>
+/* end */
+
+--------------------
+

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