gettext 1.6.0-mswin32 → 1.7.0-mswin32

data/ChangeLog

@@ -1,3 +1,68 @@
+2006-07-16  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Code cleanup.
+	ActiveRecord::Base.set_error_message_(title|explanation) have been deprecated.
+	Use ActionView::Helpers::ActiveRecordHelper::L10n.set_error_message_(title|explanation)
+	instead. Suggested by Kouhei Sutou
+	* po/zh/rails.po, rgettext.po: Updated by Yingfeng.
+	* NEWS: Updated.
+
+2006-07-15  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Localize ActiveRecord::Errors#on.
+	Now error_message_on is localized.
+	Reported by kdmsnr.
+
+2006-07-14  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/parser/activerecord.rb: Add "untranslate" feature.
+	* lib/gettext/rails.rb: ditto. Add ActiveRecord::Base.untranslate
+	.untranslate_all, .unstranslate?
+	The idea is from Gyoung-Yoon Noh.
+
+2006-07-13  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/nl/rails.po, rgettext.po: Updated by Menno Jonkers.
+	* lib/gettext/rails.rb: Support ActiveRecord::Migration.
+	Suggested by OZAWA Sakuro.
+
+2006-07-12  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/ko/rails.po, rgettext.po: Updated by Gyoung-Yoon Noh.
+
+2006-07-11  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/ru/rails.po, rgettext.po: Updated by Yuri Kozlov.
+	* po/fr/rails.po, rgettext.po: Updated by Laurent Sansonetti.
+	* po/cs/rails.po, rgettext.po: Updated by Karel Miarka.
+
+2006-07-09  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/es/rails.po, rgettext.po: Updated by David Espada.
+	* lib/gettext/rails.rb: Increment minor version.
+	* README: Updated.
+
+2006-06-14  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Fix a problem N_() isn't found in 
+	ActiveRecord. Reported by arton.
+
+2006-06-12  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/parser/glade.rb: Show error message correctly.
+	* Rakefile: Added src/poparse.ry as the target for updatepo.
+	* po/rgettext.pot, po/*/rgettext.po: Updated.
+
+2006-06-11  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/parser/ruby.rb: Fixed to extract duplicated messages when "\n"
+	was used in msgid.
+	* lib/gettext/rails.rb, po/rails.pot, po/*/rails.po: Localize 
+	ActionView::Helpers::DateHelper.distance_of_time_in_words.
+	* lib/gettext.rb: Added GetText.current_textdomain_info for debuging.
+	* lib/gettext/textdomain.rb: Break if the first mo-file found.
+	* lib/gettext/mo.rb: Added to accessor(r) to filename.
+
 2006-06-09  Masao Mutoh  <mutoh@highway.ne.jp>
 
 	* samples/*.rb, samples/po/*: Code cleanup 2. 

data/NEWS

@@ -1,3 +1,23 @@
+= Ruby-GetText-Package-1.7.0 (2006-07-17)
+
+ * GetText.current_textdomain_info for debuging
+ * Fixed bugs, code cleanup.
+ * Update translations
+   * Chinese(zh), Czech(cs), Dutch(nl), English(default), French(fr)
+     Spanish(es), Japanese(ja), Korean(ko), Russian(ru)
+ * Improve to support Ruby on Rails
+   * Localize ActionView::Helpers::DateHelper.distance_of_time_in_words.
+   * Localize #error_message_on.
+   * Add ActiveRecord::Base.untranslate, .untranslate_all to prevend to
+     translate columns.
+
+ Thanks to:
+  Translators:
+    David Espada, Karel Miarka, Laurent Sansonetti, Yuri Kozlov, 
+    Gyoung-Yoon Noh, Menno Jonkers, Yingfeng
+  Bug reports and suggestions:
+    arton, OZAWA Sakuro, kdmsnr, Kouhei Sutou
+
 = Ruby-GetText-Package-1.6.0 (2006-06-09)
 
  * Support Chinese(zh_CN), Italian(it).

data/README

@@ -128,19 +128,19 @@ Swedish(sv)                - Nikolai Weibull <mailing-lists.ruby-talk at rawuncu
 
 Status of translations
 ----------------------
-Chinese(zh)               - 1.6.0
-Czech(cs)                 - 1.6.0
-Dutch(nl)                 - 1.6.0
-English(default)          - 1.6.0
-French(fr)                - 1.6.0
+Chinese(zh)               - 1.7.0
+Czech(cs)                 - 1.7.0
+Dutch(nl)                 - 1.7.0
+English(default)          - 1.7.0
+French(fr)                - 1.7.0
 German(de)                - 1.6.0
 Greek(el)                 - 1.6.0
-Spanish(es)               - 1.6.0
+Spanish(es)               - 1.7.0
 Italian(it)               - 1.6.0
-Japanese(ja)              - 1.6.0
-Korean(ko)                - 1.6.0
+Japanese(ja)              - 1.7.0
+Korean(ko)                - 1.7.0
 Portuguese(Brazil)(pt_BR) - 1.6.0
-Russian(ru)               - 1.6.0
+Russian(ru)               - 1.7.0
 Swedish(sv)               - 0.8.0 (old)
 
 Maintainer

data/Rakefile

@@ -82,7 +82,7 @@ end
 
 desc "Create *.mo from *.po"
 task :makemo => [:makemo_test] do
-  $stderr.puts "Create rgettext/rmsgfmt mo files."
+  $stderr.puts "Create rgettext/rails mo files."
   mkdir_p "samples/rails/log" unless FileTest.exist? "samples/rails/log"
 
   GetText.create_mofiles(false)
@@ -104,7 +104,7 @@ desc "Update pot/po files to match new version."
 task :updatepo do
   #lib/gettext/*.rb -> rgettext.po
   GetText.update_pofiles("rgettext", 
-			 Dir.glob("lib/**/*.rb") - ["lib/gettext/rails.rb"], 
+			 Dir.glob("lib/**/*.rb") + ["src/poparser.ry"] - ["lib/gettext/rails.rb"], 
 			 "ruby-gettext #{GetText::VERSION}")
 
   #lib/gettext/rails.rb -> rails.po
@@ -139,7 +139,7 @@ end
 ############################################################
 # Package tasks
 ############################################################
-=begin
+
 if /mswin32/ =~ RUBY_PLATFORM
   task :gem => [:mswin32so]
   task :mswin32so do
@@ -150,7 +150,7 @@ if /mswin32/ =~ RUBY_PLATFORM
     end
   end
 end
-=end
+
 desc "Create gem and tar.gz"
 spec = Gem::Specification.new do |s|
   s.name = 'gettext'

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++ 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
+checked program was:
+/* begin */
+#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.14 2006/06/07 15:56:04 mutoh Exp $
+  $Id: gettext.rb,v 1.15 2006/06/11 15:36:20 mutoh Exp $
 =end
 
 require 'rbconfig'
@@ -31,27 +31,25 @@ module GetText
 
   @@__textdomainmanagers = Hash.new
 
+  # call-seq:
+  # bindtextdomain(domainname, options = {})
+  #
   # Bind a textdomain(%{path}/%{locale}/LC_MESSAGES/%{domainname}.mo) to your program.
   # Normally, the texdomain scope becomes a ruby-script-file. 
   # So you need to call this function each ruby-script-files. 
   # On the other hand, if you call this function under GetText::Container 
-  #(gettext/container, gettext/erb, gettext/rails), the textdomain scope becomes a Class/Module.
-  #
+  # (gettext/container, gettext/erb, gettext/rails), the textdomain scope becomes a Class/Module.
   # * domainname: the textdomain name.
   # * options: options as an Hash.
   #   * :path - the path to the mo-files. When the value is nil, it will search default paths such as 
   #     /usr/share/locale, /usr/local/share/locale)
   #   * :locale - the locale string such as "ja_JP.UTF-8".  Generally, you should use GetText.set_locale instead.
   #     The value is searched order by:
-  #   
   #     the value of this value > System default language.
-  #   
   #   * :charset - output charset.  This affect the current textdomain only. Generally, you should use GetText.set_output_charset instead.
   #     The value is searched order by:
-  #   
   #     the value of Locale.set_output_charset > ENV["OUTPUT_CHARSET"] > this value > System default charset.
   # * Returns: the GetText::TextDomain.
-  #
   # Note: Don't use locale_, charset argument(not in options). 
   # They are remained for backward compatibility. 
   #
@@ -102,7 +100,7 @@ module GetText
   # * klass: a class/module to find. Default is the class of self.
   # * ignore_targets: Ignore tragets.
   # * Returns: a bound GetText::TextDomain or nil.
-  def each_textdomain(klass = bound_target, ignore_targets = [])
+  def each_textdomain(klass = bound_target, ignore_targets = []) #:nodoc:
     (klass.ancestors + [GetText]).each do |target|
       unless ignore_targets.include? target
 	ignore_targets << target
@@ -145,7 +143,7 @@ module GetText
     }
     ret ? ret : msgid
   end
-  
+
   # call-seq:
   #   ngettext(msgid, msgid_plural, n)
   #   ngettext(msgids, n)  # msgids = [msgid, msgid_plural]
@@ -313,7 +311,7 @@ module GetText
   end
 
   # Deprecated. Now this function do nothing. Use GetText.output_charset= instead.
-  def set_charset(cs)
+  def set_charset(cs) #:nodoc:
     $stderr.puts "Deprecated. Now this function do nothing. Use GetText.output_charset= instead." if $DEBUG
     self
   end
@@ -325,12 +323,40 @@ module GetText
   
   # Add default locale path.
   # * path: a new locale path. (e.g.) "/usr/share/locale/%{locale}/LC_MESSAGES/%{name}.mo"
-  #    ('locale' => "ja_JP", 'name' => "textdomain")
+  #   ('locale' => "ja_JP", 'name' => "textdomain")
   # * Returns: the new DEFAULT_LOCALE_PATHS
   def add_default_locale_path(path)
     TextDomain.add_default_locale_path(path)
   end
 
+  # Show the current textdomain information. This function is for debugging.
+  # * options: options as a Hash.
+  #   * :with_messages - show informations with messages of the current mo file. Default is false.
+  #   * :out - An output target. Default is STDOUT.
+  #   * :with_paths - show the load paths for mo-files.
+  # * Returns: localized text by msgid. If there are not binded mo-file, it will return msgid.
+  def current_textdomain_info(options = {})
+    opts = {:with_messages => false, :with_paths => false, :out => STDOUT}.merge(options)
+    ret = nil
+    each_textdomain {|textdomain|
+      opts[:out].puts "TextDomain name: \"#{textdomain.name}\""
+      opts[:out].puts "TextDomain current locale: \"#{textdomain.current_locale}\""
+      opts[:out].puts "TextDomain current mo filename: \"#{textdomain.current_mo.filename}\""
+      if opts[:with_paths]
+	opts[:out].puts "TextDomain locale file paths:"
+	textdomain.locale_paths.each do |v|
+	  opts[:out].puts "  #{v}"
+	end
+      end
+      if opts[:with_messages]
+	opts[:out].puts "The messages in the mo file:"
+	textdomain.current_mo.each{|k, v|
+	  opts[:out].puts "  \"#{k}\": \"#{v}\""
+	}
+      end
+    }
+  end
+
   alias :setlocale :locale= #:nodoc:
   alias :_ :gettext   #:nodoc:
   alias :n_ :ngettext #:nodoc:
@@ -339,5 +365,5 @@ module GetText
   module_function :bindtextdomain, :textdomain, :each_textdomain,
     :N_, :gettext, :_, :ngettext, :n_, :sgettext, :s_, :bound_target,
     :setlocale, :set_locale, :locale=, :set_locale_all, :locale, :charset=, :set_charset,
-    :set_output_charset, :output_charset=, :output_charset
+    :set_output_charset, :output_charset=, :output_charset, :current_textdomain_info
 end