gettext 1.3.0-mswin32 → 1.4.0-mswin32

data/ChangeLog

@@ -1,3 +1,50 @@
+2006-04-15  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* NEWS: Updated.
+	* lib/gettext/version.rb: Increment minor version.
+	* test/gettext_test_rails.rb: Works with Rails-1.1.2.
+	* test/gettext_test_locale.rb: Works on OpenBSD 3.8.
+	* ext/gettext/locale_system.c: Set nil instead of "UTF-8" 
+        when nl_langinfo is not found.
+	* samples/rails/README: Updated.
+
+2006-04-05  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* ext/gettext/locale_system.c: Fix compilation problem
+	when /usr/include/langinfo.h doesn't have CODESET such as OpenBSD.
+	You may need to set OUTPUT_CHARSET to ENV variable in such
+	environment.
+	Reported by Johan Allard.
+
+2006-03-25  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Revised docs.
+
+2006-03-24  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Support ActionWebService.
+	Reported by Nick Snels.
+
+2006-03-19  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Improve multipart-mail in ja locale by Nobuhiro IMAI.
+
+2006-03-16  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: ActiveMailer works with multipart-mail in ja locale.
+	Reported by Nobuhiro IMAI.
+	* lib/gettext/textdomain.rb: GetText::TextDomain.gettext returns "" when
+	arg is "" or nil.
+	* lib/gettext.rb, locale.rb: Fix the problem to switch the locale again.
+	* test/gettext_test.rb: Add the test for above problem.
+	* test/gettext_test_rails.rb: Added, too.
+	* test/test.sh: ditto.
+	
+2006-03-12  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext.rb: GetText.locale= reset Locale's default locale.
+	Reported by Donald Piret.
+
 2006-03-11  Masao Mutoh  <mutoh@highway.ne.jp>
 
 	* lib/gettext/rails.rb: ActiveRecord::Column.human_name translates 

data/NEWS

@@ -1,4 +1,13 @@
-= Ruby-GetText-Package-1.3.0 (2006-03-08)
+= Ruby-GetText-Package-1.4.0 (2006-04-15)
+
+ * Support OpenBSD.
+ * Fix bugs
+ * Enhance supports of Ruby on Rails.
+   * Improved ActionMailer localization support.
+   * Support ActionWebService
+   * test/gettext_test_rails.rb works with Rails-1.1.2.
+
+= Ruby-GetText-Package-1.3.0 (2006-03-11)
 
  * Improve Local::Object
    * POSIX, C convert to "en".

data/README

@@ -118,17 +118,17 @@ Swedish            - Nikolai Weibull <mailing-lists.ruby-talk at rawuncut.elitem
 
 Status of translations
 ----------------------
-cs    - 1.3.0
-fr    - 1.3.0
-de    - 1.3.0
-el    - 1.3.0
-es    - 1.3.0
-it    - 1.0.0
-ja    - 1.3.0
-ko    - 1.3.0
-nl    - 1.3.0
-pt_BR - 1.3.0
-sv    - 0.8.0
+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)
 
 Maintainer
 ----------

data/ext/gettext/locale_system.c

@@ -5,7 +5,7 @@
  * You may redistribute it and/or modify it under the same
  * license terms as Ruby.
  * 
- * $Id: locale_system.c,v 1.3 2006/02/20 12:35:06 mutoh Exp $
+ * $Id: locale_system.c,v 1.5 2006/04/15 03:58:52 mutoh Exp $
  */
 
 #include "ruby.h"
@@ -50,13 +50,14 @@ gt_codeset(self)
 	VALUE self;
 {
 #if defined HAVE_WINDOWS_H
+	/* This isn't used now. See lib/gettext/locale_win32.rb */
 	char buf[2 + 10 + 1];
 	sprintf (buf, "CP%u", GetACP ());
 	return rb_str_new2(buf);
-#elif defined HAVE_NL_LANGINFO
+#elif defined HAVE_NL_LANGINFO && defined CODESET
 	return rb_str_new2(nl_langinfo(CODESET));
 #else
-	return rb_str_new2("UTF-8");
+	return Qnil;
 #endif
 }
 

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.10 2006/03/03 09:22:03 mutoh Exp $
+  $Id: gettext.rb,v 1.11 2006/03/15 16:34:05 mutoh Exp $
 =end
 
 require 'rbconfig'
@@ -199,7 +199,7 @@ module GetText
     else
       ret = nil
     end
-    Locale.set_current(ret)
+    Locale.set(ret)
 
     textdomain = @@__textdomain[src]
     textdomain.set_locale(ret, true) if textdomain
@@ -217,7 +217,6 @@ module GetText
   end
 
   # Sets charset(String) such as "euc-jp", "sjis", "CP932", "utf-8", ... 
-  # This affect all of the TextDomains which are created after calling this method. 
   # You shouldn't use this in your own Libraries.
   # * charset: an output_charset
   # * Returns: charset

data/lib/gettext/locale.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale.rb,v 1.10 2006/03/03 07:03:50 mutoh Exp $
+  $Id: locale.rb,v 1.11 2006/03/15 16:34:05 mutoh Exp $
 =end
 
 require 'gettext/locale_object'
@@ -159,6 +159,7 @@ module Locale
       charset = nil
     end
 
+    set_current(nil)
     if lang.kind_of? String
       set_default(Locale::Object.new(lang, country, charset))
     elsif lang.kind_of? Locale::Object

data/lib/gettext/poparser.rb

@@ -20,7 +20,7 @@ module GetText
 
   class PoParser < Racc::Parser
 
-module_eval <<'..end src/poparser.ry modeval..id3abd401c4d', 'src/poparser.ry', 90
+module_eval <<'..end src/poparser.ry modeval..idca67f10f94', 'src/poparser.ry', 90
   include GetText
   GetText.bindtextdomain("rgettext")
 
@@ -103,7 +103,7 @@ module_eval <<'..end src/poparser.ry modeval..id3abd401c4d', 'src/poparser.ry',
     @comments << comment
   end 
 
-..end src/poparser.ry modeval..id3abd401c4d
+..end src/poparser.ry modeval..idca67f10f94
 
 ##### racc 1.4.5 generates ###
 

data/lib/gettext/rails.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rails.rb,v 1.26 2006/03/11 13:16:39 mutoh Exp $
+  $Id: rails.rb,v 1.29 2006/03/25 08:32:53 mutoh Exp $
 =end
 
 require 'gettext/cgi'
@@ -108,9 +108,13 @@ module ActionController #:nodoc:
     after_filter :init_content_type
     
     def init_gettext_main #:nodoc:
-      cgi_ = request.cgi
-      cgi_.params["lang"] = [@params["lang"]] if @params["lang"]
-      bindtextdomain(@@gettext_domainname, cgi_)  #You need to pass CGI object first.
+      if defined? request.cgi
+	cgi_ = request.cgi
+	cgi_.params["lang"] = [@params["lang"]] if @params["lang"]
+	bindtextdomain(@@gettext_domainname, cgi_)  #You need to pass CGI object first.
+      else
+	bindtextdomain(@@gettext_domainname, nil, @params["lang"])
+      end
     end
 
     def init_content_type #:nodoc:
@@ -136,6 +140,10 @@ module ActionController #:nodoc:
     # * charset: the output charset. Default is "UTF-8"
     # * content_type: the content type. Default is "text/html"
     #
+    # locale is searched the order by @params["lang"] > "lang" value of QUERY_STRING > 
+    # "lang" value of Cookie > HTTP_ACCEPT_LANGUAGE value > Default locale(en). 
+    # And the charset is set order by "the argument of bindtextdomain" > HTTP_ACCEPT_CHARSET > Default charset(UTF-8).
+    #
     # If you want to separate the textdomain each controllers, you need to call this function in the each controllers.
     #
     # app/controller/blog_controller.rb:
@@ -386,14 +394,15 @@ module ActionMailer #:nodoc:
     end
 
     def create!(*arg) #:nodoc:
+      _create!(*arg)
       if Locale.get.language == "ja"
-	require 'nkf'
-        _create!(*arg)
-	@mail.charset = 'iso-2022-jp'
-	@mail.subject = base64(@mail.subject)
-	@mail.body = NKF.nkf('-j', @mail.body)
-      else
-        _create!(*arg)
+        require 'nkf'
+        @mail.subject = base64(@mail.subject)
+        part = @mail.parts.empty? ? @mail : @mail.parts.first
+        if part.content_type == 'text/plain'
+          part.charset = 'iso-2022-jp'
+          part.body = NKF.nkf('-j', part.body)
+        end
       end
       @mail
     end

data/lib/gettext/textdomain.rb

@@ -10,7 +10,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: textdomain.rb,v 1.14 2006/02/23 14:53:59 mutoh Exp $
+  $Id: textdomain.rb,v 1.15 2006/03/15 16:55:47 mutoh Exp $
 =end
 
 require 'gettext/string'
@@ -95,6 +95,7 @@ module GetText
     # * msgid: the original message.
     # * Returns: the translated string.
     def gettext(msgid)
+      return "" if msgid == "" or msgid.nil?
       if @current_mo and @current_mo[msgid] and (@current_mo[msgid].size > 0)
 	@current_mo[msgid]
       else

data/lib/gettext/version.rb

@@ -8,5 +8,5 @@
   license terms as Ruby.
 =end
 module GetText
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/samples/rails/README

@@ -2,8 +2,8 @@ Ruby-GetText Sample blog for Ruby on Rails and Ruby-GetText-Package.
 
 Requirement
 -----------
-* ruby-1.8.3
-* rails-1.0.0
+* ruby-1.8.3 or later
+* rails-1.0.0 or later
 * rake
 * mysql
 

data/test/gettext_test.rb

@@ -55,6 +55,8 @@ class TestGetText < Test::Unit::TestCase
     GetText.locale = nil
     bindtextdomain("test1", "locale")
     assert_equal("japanese", gettext("language"))
+    assert_equal("", gettext(""))
+    assert_equal("", gettext(nil))
   end
 
   def test_class
@@ -239,6 +241,14 @@ DDD
     setlocale("fr")
     assert_equal("french", _("language"))
 
+    Locale.set "en"
+    bindtextdomain("test1", "locale")
+    assert_equal("language", _("language"))
+
+    Locale.set "ja"
+    bindtextdomain("test1", "locale")
+    assert_equal("japanese", _("language"))
+
     # Confirm to set Locale::Object.
     loc = Locale::Object.new("ja_JP.eucJP")
     assert_equal(loc, GetText.locale = loc)

data/test/gettext_test_locale.rb

@@ -230,12 +230,20 @@ class TestLocale < Test::Unit::TestCase
     else
       loc = Locale.get
       assert_equal("ja_JP", Locale.get.to_str)
-      assert_equal("EUC-JP", Locale.codeset)
+      if /openbsd/ =~ RUBY_PLATFORM
+        assert_equal("eucJP", Locale.codeset)
+      else
+        assert_equal("EUC-JP", Locale.codeset)
+      end
 
       loc = Locale.set("ja_JP")
       assert_equal("ja_JP", loc.to_str)
       assert_equal("ja_JP", Locale.get.to_str)
-      assert_equal("EUC-JP", Locale.codeset)
+      if /openbsd/ =~ RUBY_PLATFORM
+        assert_equal(nil, Locale.codeset)
+      else
+        assert_equal("EUC-JP", Locale.codeset)
+      end
 
       # Confirm to set Locale::Object
       assert_equal(loc, Locale.set(loc))

data/test/gettext_test_rails.rb

@@ -0,0 +1,38 @@
+require 'test/unit'
+require 'rubygems'
+require_gem 'rails'
+require 'initializer'
+begin
+  require 'rails_info'
+rescue Gem::Exception
+  module Rails
+    module Info
+      module_function
+      def property(name, &block)
+	
+      end
+    end
+  end
+end
+require 'gettext/rails'
+require 'stringio'
+
+class TestRails < Test::Unit::TestCase
+  def setup_cgi(str)
+    $stdin = StringIO.new(str)
+    cgi = CGI.new
+    Locale.cgi = cgi
+  end
+
+  def test_bindtextdomain
+    #query string
+    Locale.default = Locale::Object.new("ja_JP.UTF-8")
+    GetText.locale = "fr"
+    GetText.bindtextdomain("test1", "locale")
+    assert_equal("french", GetText._("language"))
+    setup_cgi("lang=ja_JP")
+    ENV["HTTP_ACCEPT_LANGUAGE"] = "ja,en-us;q=0.7,en;q=0.3"
+    GetText.bindtextdomain("test1", "locale")
+    assert_equal("french", GetText._("language"))
+  end
+end

data/test/test.sh

@@ -3,4 +3,4 @@
 export LC_ALL="ja_JP.eucJP"; 
 ruby -I../lib -I../ext/gettext gettext_runner.rb $1
 ruby -I../lib -I../ext/gettext gettext_test_cgi.rb
-
+ruby -I../lib -I../ext/gettext gettext_test_rails.rb

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: gettext
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
-date: 2006-03-11
+  version: 1.4.0
+date: 2006-04-15
 summary: Ruby-GetText-Package is a libary and tools to localize messages.
 require_paths: 
   - lib
@@ -92,19 +92,9 @@ files:
   - data/locale/sv/LC_MESSAGES/rgettext.mo
   - ext/gettext
   - ext/gettext/extconf.rb
-  - ext/gettext/locale_system-i386-mswin32.def
   - ext/gettext/locale_system.c
-  - ext/gettext/locale_system.exp
-  - ext/gettext/locale_system.lib
-  - ext/gettext/locale_system.obj
-  - ext/gettext/locale_system.pdb
-  - ext/gettext/locale_system.so
-  - ext/gettext/Makefile
-  - ext/gettext/mkmf.log
-  - ext/gettext/vc70.pdb
   - lib/gettext
   - lib/gettext.rb
-  - lib/locale_system.so
   - lib/gettext/cgi.rb
   - lib/gettext/container.rb
   - lib/gettext/erb.rb
@@ -663,6 +653,7 @@ files:
   - test/gettext_test_cgi.rb
   - test/gettext_test_locale.rb
   - test/gettext_test_parser.rb
+  - test/gettext_test_rails.rb
   - test/gettext_test_string.rb
   - test/locale
   - test/po
@@ -745,6 +736,7 @@ files:
   - test/po/li/plural.po
   - test/po/po/plural.po
   - test/po/sl/plural.po
+  - lib/locale_system.so
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []

data/ext/gettext/Makefile

@@ -1,145 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = e:/ruby/lib/ruby/1.8/i386-mswin32
-hdrdir = $(topdir)
-VPATH = $(srcdir)
-
-DESTDIR = e:
-prefix = $(DESTDIR)/ruby
-exec_prefix = $(prefix)
-bindir = $(exec_prefix)/bin
-sitelibdir = $(sitedir)/$(ruby_version)
-datadir = $(prefix)/share
-sitedir = $(prefix)/lib/ruby/site_ruby
-sharedstatedir = $(DESTDIR)/etc
-archdir = $(rubylibdir)/$(arch)
-localstatedir = $(DESTDIR)/var
-infodir = $(prefix)/info
-oldincludedir = $(DESTDIR)/usr/include
-libexecdir = $(exec_prefix)/libexec
-compile_dir = $(DESTDIR)/Dev/RubyDev/rubyinstaller/cvs-repo/installer-win/stable/download/ruby-1.8.2/win32
-sbindir = $(exec_prefix)/sbin
-includedir = $(prefix)/include
-sysconfdir = $(prefix)/etc
-sitearchdir = $(sitelibdir)/$(sitearch)
-mandir = $(prefix)/man
-libdir = $(exec_prefix)/lib
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-
-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)  -I. -I./.. -I./../missing
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS =  -link -incremental:no -debug -opt:ref -opt:icf -dll $(LIBPATH) -def:$(DEFFILE) 
-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_PROG = $(RUBY) -run -e install -- -vpm 0755
-INSTALL_DATA = $(RUBY) -run -e install -- -vpm 0644
-
-#### End of system configuration section. ####
-
-
-LIBPATH =  -libpath:"$(libdir)"
-DEFFILE = $(TARGET)-$(arch).def
-
-CLEANFILES = 
-DISTCLEANFILES = $(DEFFILE)
-
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  oldnames.lib user32.lib advapi32.lib wsock32.lib  
-OBJS = locale_system.obj
-TARGET = locale_system
-DLLIB = $(TARGET).so
-STATIC_LIB = $(TARGET).lib
-
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-
-CLEANLIBS     = "$(TARGET).{lib,exp,il?,tds,map}" $(DLLIB)
-CLEANOBJS     = "*.{obj,lib,s[ol],pdb,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: $(RUBYARCHDIR)
-install: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB) $(RUBYARCHDIR)
-	@$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-$(RUBYARCHDIR):
-	@$(MAKEDIRS) $(RUBYARCHDIR)
-
-site-install: install
-
-.SUFFIXES: .c .cc .m .cxx .cpp .C .obj
-
-{$(srcdir)}.cc{}.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
-
-.cc.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
-
-{$(srcdir)}.cpp{}.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
-
-.cpp.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
-
-{$(srcdir)}.cxx{}.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
-
-.cxx.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
-
-{$(srcdir)}.C{}.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
-
-.C.obj:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -Tp$(<:\=/)
-
-{$(srcdir)}.c{}.obj:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
-
-.c.obj:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
-
-$(DLLIB): $(OBJS) $(DEFFILE)
-	@-$(RM) $@
-	@-$(RM) $(TARGET).lib
-	$(LDSHARED) -Fe$(@) $(OBJS) $(LIBS) $(LOCAL_LIBS) $(DLDFLAGS)
-
-$(STATIC_LIB): $(OBJS)
-	$(AR) -machine:x86 -out:$@ $(OBJS)
-
-$(DEFFILE): 
-	$(RUBY) -e "puts 'EXPORTS', 'Init_$(TARGET)'"  > $@
-

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

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

data/ext/gettext/mkmf.log

@@ -1,10 +0,0 @@
-have_header: checking for windows.h... -------------------- no
-
-"cl -IE:/gettext/ext/gettext -Ie:/ruby/lib/ruby/1.8/i386-mswin32 -I. -I./.. -I./../missing -MD -Zi -O2b2xg- -G6  conftest.c -P"
-checked program was:
-/* begin */
-#include <windows.h>
-/* end */
-
---------------------
-