gettext 1.1.1 → 1.2.0

data/ChangeLog

@@ -1,3 +1,131 @@
+2006-02-23  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* Rakefile: Fix a problem to make package on Win32.
+	* lib/gettext/textdomain.rb: Rename @mo to @current_mo
+	and add a attr_reader for @current_mo.
+	* README, NEWS: updated.
+	* lib/gettext/rails.rb: Fix to translate error message 
+	title/explanation.
+	* lib/gettext/parser/activerecord.rb: Fix an abort when 
+	config/database.xml is not defined.
+
+2006-02-22  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rmsgfmt.rb, string.rb, iconv.rb, utils.rb, rgettext.rb,
+	lib/gettext/parser/*.rb: Apply RDoc.
+	* lib/gettext/version.rb: Increment minor version.
+
+2006-02-21  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* test/test.bat: Added for Win32.
+	* test/gettext_test_locale.rb: Added Win32 tests.
+	* lib/gettext/locale_win32.rb: Fix problems.
+	* lib/gettext/locale_object.rb: Added Locale::Object#to_win
+
+2006-02-20  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* src/poparser.ry: Added ignore_fuzzy as the 3rd parameter 
+	of GetText::PoParser#parse to parse fuzzy comments.
+	Pointed out by speakillof.
+	* lib/gettext/rmsgmerge.rb: Follow the PoParser change below.
+	* test/gettext_test_locale.rb: Apply Locale.clear.
+	* lib/gettext/locale.rb: Added Locale.clear.
+
+2006-02-18  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/locale_cgi.rb: Separate from cgi.rb.
+	* lib/gettext/locale_posix.rb: Rename from locale_default.rb.
+
+2006-02-16  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/textdomain.rb: Add comments.
+	* lib/gettext.rb: Apply Locale::Object. Code cleanup. Add RDoc.
+	* test/gettext_test.rb: Apply gettext.rb changes
+	* test/test.sh: Remove OUTPUT_CHARSET setting.
+
+2006-02-15  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/locale_win32.rb, locale_default.rb, locale.rb: A first argument
+	of Locale::System.get_charset becomes Locale::Object.
+	* lib/gettext/textdomain.rb: Apply Locale::Object, Code cleanup.
+	* lib/gettext.rb: Add GetText.add_default_locale_path.
+	* lib/gettext/locale_object.rb: Add Locale::Object#==.
+	* lib/gettext/textdomain.rb: Add GetText::TextDomain.add_default_locale_path.
+          Pointed out at Bug#3510.
+
+2006-02-14  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* Rakefile: Fix compilation problems on mswin32.
+	* ext/gettext/locale_system.c: locale_id returns language ID not LCID.
+	
+2006-02-13  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/locale_table_win32.rb: Replace the table and add charset info.
+	* lib/gettext/locale_win32.rb: ditto.
+
+2006-02-10  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/locale_object.rb: Add script, sort_order properties.
+
+2006-02-09  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* test/gettext_test_locale.rb: Added modifier test.
+	* lib/gettext/locale_object.rb: Added to parse modifier.
+	* lib/gettext/locale.rb: Fixed bug of Locale#set_current.
+	* test/gettext_test_cgi.rb: Added tests.
+	* lib/gettext/cgi.rb: Apply RDoc.
+	* lib/gettext/locale_default.rb, locale.rb: Modify RDoc.
+	* lib/gettext/locale_win32.rb: Imprement pseudo Locale::System.get_charset().
+
+2006-02-07  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* test/gettext_test_locale.rb: Added for new Locale.
+	* lib/gettext/locale.rb: Refactored. Follow to support Locale::Object.
+	Add Locale.set_default, .default=, .system, .default, .current, 
+	.set_current, .current=, .current_charset. Reimplemented .get/.set.
+	Locale.set(loctype, localestr) is deprecated. Use Locale.set(localestr) instead.
+	Locale.setlocale(loctype, localestr) is deprecated. Use Locale.set(localestr) instead.
+	Locale.get(loctype) is deprecated. Use Locale.get instead.
+
+2006-02-05  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* test/test_rubyparser_n_.rb: Rename from test/test_rubyparser_n.rb.
+	This has a problem on Windows with test/test_rubyparser_N.rb.
+
+2006-02-04  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* pre-setup.rb: Remove previous installed files first.
+	* ext/gettext/gettext: Removed. 
+	* ext/gettext/locale_system.c: Added as Accessor to system(win32/posix).
+	(Move from ext/gettext/gettext/_locale.c)
+	* ext/gettext/extconf.rb: ditto.
+	* lib/gettext/locale_default.rb: Follow above changes. Apply RDoc.
+	* lib/gettext/locale_win32.rb: Follow above changes. Apply RDoc.
+	* lib/gettext/locale.rb: Code cleanup. Apply RDoc.
+	* lib/gettext/locale_object.rb: Added Locale::Object. Apply RDoc.
+	* setup.rb: Update to 3.4.1.
+
+2006-01-25  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rmsgmerge.rb: Fixed bugs.
+	Follow the comment messages to GNU GetText. By speakillof.
+
+2006-01-20  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Added ActiveRecord::Base#error_message_(title|explanation).
+	 Reimplement ActionView::Helpers::ActiveRecordHelper::L10n.error_messages_for to
+	separate error_message_(title|explanation) to be able to be overrided by user.
+	The idea is from Trung Tran.
+	* samples/rails/app/models/article.rb: Add a sample of 
+	ActiveRecord::Base#error_message_(title|explanation).
+	
+2006-01-19  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext.rb: n_() accepts first arguments as an Array([msgid, msgid_plural]).
+	* test/gettext_test.rb: Add tests for n_(ary, n), Nn_().
+	* lib/gettext/parser/ruby.rb: Added Nn_() is same purpose with N_, but for n_.
+	* lib/gettext.rb: Added Nn_(msgid, msgid_plural).
+
 2006-01-14  Masao Mutoh  <mutoh@highway.ne.jp>
 
 	* samples/rails/po/*/blog.po: Updated.

data/NEWS

@@ -1,3 +1,13 @@
+= Ruby-GetText-Package-1.2.0 (2006-02-23)
+
+ * Re-implement Locale module and Implements Locale::Object, 
+   Locale::System, etc.
+ * Fix bugs.
+ * Apply RDoc (not complete)
+ * Improve to support Ruby on Rails.
+ * Add GetText.Nn_.
+ * Add rmsgmerge (Experimental)
+ 
 = Ruby-GetText-Package-1.1.1 (2006-01-14)
 
  * Bugfixes.

data/README

@@ -4,8 +4,12 @@ Ruby-Gettext-Package
   Ruby-GetText-Package is a Localization(L10n) library and tools 
   which modeled after GNU gettext package.
 
-  It converts the messages to localized messages properly using 
-  client-side locale information(environment variable or CGI variable).
+  This library provides to translate original messages to localized 
+  messages properly using client-side locale information(environment
+  variable or CGI variable).
+
+  And the tools for developers support to create, use, and modify 
+  localized message files(message catalogs) easily.
 
   Features:
 
@@ -36,7 +40,9 @@ Ruby-Gettext-Package
 Requirements
 ------------
 
-  * Ruby 1.8.2 or later <http://www.ruby-lang.org/ja/>
+  * Ruby 1.8.3 or later <http://www.ruby-lang.org/ja/>
+
+  (options)
   * GNU gettext 0.10.35 or later 
     <http://www.gnu.org/software/gettext/gettext.html>
     (for Development only)
@@ -66,18 +72,13 @@ Usage
 
   If you are developer of the application which depends on this library,
   see:
-  http://gettext.rubyforge.org/    (English)
-  http://gettext.rubyforge.org/ja/ (Japanese)
-
+  http://gettext.rubyforge.org/
 
 License
 -------
   This program is licenced under the same licence as Ruby.
   (See the file 'COPYING'.)
 
-* Ruby-GetText-Package
-  Copyright (C) 2001-2006 Masao Mutoh <mutoh@highwhay.ne.jp>
-
 * mo.rb
   Copyright (C) 2001-2004 Masao Mutoh <mutoh@highwhay.ne.jp>
   Copyright (C) 2001,2002 Masahiro Sakai <s01397ms@sfc.keio.ac.jp>
@@ -90,11 +91,8 @@ License
   Copyright (C) 2001-2005 Masao Mutoh <mutoh@highwhay.ne.jp>
   Copyright (C) 2001,2002 Yasushi Shoji <yashi@yashi.com>
 
-* rmsgfmt 
-  Copyright (C) 2003,2005 Masao Mutoh <mutoh@highwhay.ne.jp>
-
 * setup.rb
-  Copyright (C) 2000-2004 Minero Aoki <aamine@loveruby.net>
+  Copyright (C) 2000-2005 Minero Aoki <aamine@loveruby.net>
   This file is released under LGPL. See the top of the install.rb.
 
 * Others
@@ -120,18 +118,18 @@ Swedish            - Nikolai Weibull <mailing-lists.ruby-talk at rawuncut.elitem
 
 Status of translations
 ----------------------
-cs    - 1.1.1
-fr    - 1.1.1
-de    - 1.1.1
-el    - 1.1.1
-es    - 1.1.1
+cs    - 1.2.0
+fr    - 1.2.0
+de    - 1.2.0
+el    - 1.2.0
+es    - 1.2.0
 it    - 1.0.0
-ja    - 1.1.1
-ko    - 1.1.1
-nl    - 1.1.1
-pt_BR - 1.1.1
+ja    - 1.2.0
+ko    - 1.2.0
+nl    - 1.2.0
+pt_BR - 1.2.0
 sv    - 0.8.0
 
 Maintainer
 ----------
-  Masao Mutoh<mutoh@highway.ne.jp>
+  Masao Mutoh <mutoh@highway.ne.jp>

data/Rakefile

@@ -11,6 +11,7 @@
 #
 
 $:.unshift "./lib"
+$:.unshift "./ext/gettext"
 
 require 'rubygems'
 require 'rake'
@@ -57,16 +58,24 @@ EOS
     file.close
     tmpfile.close
     File.delete("src/poparser.tmp.rb")
-   $stderr.puts "Create #{poparser_path}."
+    $stderr.puts "Create #{poparser_path}."
+    require 'gettext/utils'
   end
 end
 
 ############################################################
 # Manage po/mo files
 ############################################################
-require 'gettext/utils'
+begin
+  require 'gettext'
+  require 'gettext/poparser'
+  require 'gettext/utils'
+rescue LoadError
+  puts "gettext/poparser was not found."
+end
 
 task :makemo_test do
+  require 'gettext/utils'
   $stderr.puts "Create test mo files."
   GetText.create_mofiles(false, "test/po", "test/locale")
 end
@@ -126,27 +135,38 @@ end
 ############################################################
 # Package tasks
 ############################################################
+
+if /mswin32/ =~ RUBY_PLATFORM
+  task :gem => [:mswin32so]
+  task :mswin32so do
+    FileUtils.cd 'ext/gettext' do
+      system "#{RUBYBIN} extconf.rb"
+      system "nmake"
+      FileUtils.cp 'locale_system.so', '../../lib/'
+    end
+  end
+end
+
 desc "Create gem and tar.gz"
 spec = Gem::Specification.new do |s|
   s.name = 'gettext'
   s.version = PKG_VERSION
-if /mswin32/ =~ RUBY_PLATFORM
-  s.platform = Gem::Platform::WIN32
-  FileUtils.cd 'ext/gettext/gettext/' do
-    system "#{RUBYBIN} extconf.rb"
-    system "nmake"
-    FileUtils.cp '_locale.so', '../../../lib/'
+
+  if /mswin32|mingw/ =~ RUBY_PLATFORM
+    s.platform = Gem::Platform::WIN32
+  else
+    s.extensions << "ext/gettext/extconf.rb"
+    s.extensions.concat Dir.glob('**/extconf.rb')
   end
-else
-  s.extensions << "ext/gettext/gettext/extconf.rb"
-  s.extensions.concat Dir.glob('**/extconf.rb')
-end
-  s.summary = 'Ruby-GetText-Package is Native Language Support Library and Tools which modeled after GNU gettext package.'
+
+  s.summary = 'Ruby-GetText-Package is a libary and tools to localize messages.'
   s.author = 'Masao Mutoh'
   s.email = 'mutoh@highway.ne.jp'
-  s.homepage = 'http://ponx.s5.xrea.com/hiki/ruby-gettext.html'
+  s.homepage = 'http://www.yotabanana.com/hiki/ruby-gettext.html'
   s.rubyforge_project = "gettext"
-  s.files = FileList['**/*'].to_a.select{|v| v !~ /pkg|CVS/}
+  files = FileList['**/*'].to_a.select{|v| v !~ /pkg|CVS/}
+  files << "lib/locale_system.so" if /mswin32/ =~ RUBY_PLATFORM
+  s.files = files
   s.require_path = 'lib'
   s.executables = Dir.entries('bin').delete_if {|item| /^\.|CVS|~$/ =~ item }
   s.bindir = 'bin'
@@ -158,10 +178,10 @@ end
 end
 
 unless /mswin32/ =~ RUBY_PLATFORM
-  Rake::PackageTask.new("ruby-gettext-package", PKG_VERSION) do |p|
-    p.package_files = FileList['**/*'].to_a.select{|v| v !~ /pkg|CVS/}
-    p.need_tar_gz = true
-    p.need_zip = false
+  Rake::PackageTask.new("ruby-gettext-package", PKG_VERSION) do |o|
+    o.package_files = FileList['**/*'].to_a.select{|v| v !~ /pkg|CVS/}
+    o.need_tar_gz = true
+    o.need_zip = false
   end
 end
 
@@ -171,7 +191,6 @@ Rake::GemPackageTask.new(spec) do |p|
   p.need_zip = false
 end
 
-
 ############################################################
 # Misc tasks
 ############################################################

data/bin/rgettext

@@ -7,7 +7,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rgettext,v 1.4 2005/11/27 15:35:54 mutoh Exp $
+  $Id: rgettext,v 1.8 2006/02/22 16:42:41 mutoh Exp $
 =end
 
 begin

data/bin/rmsgfmt

@@ -7,7 +7,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rmsgfmt,v 1.3 2005/11/27 15:35:54 mutoh Exp $
+  $Id: rmsgfmt,v 1.7 2006/02/22 16:42:41 mutoh Exp $
 =end
 
 begin

data/bin/rmsgmerge

@@ -7,7 +7,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rmsgmerge,v 1.2 2005/11/27 15:35:54 mutoh Exp $
+  $Id: rmsgmerge,v 1.6 2006/02/22 16:42:41 mutoh Exp $
 =end
 
 begin

data/ext/gettext/extconf.rb

@@ -0,0 +1,20 @@
+=begin
+  extconf.rb
+
+  Copyright (C) 2002-2006 Masao Mutoh <mutoh@highway.ne.jp>
+ 
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby.
+
+ $Id: extconf.rb,v 1.1 2006/02/07 00:24:45 mutoh Exp $
+=end
+
+require 'mkmf'
+
+if RUBY_PLATFORM =~ /cygwin|mingw|mswin32|bccwin32/
+  have_header 'windows.h'
+else
+  have_func 'setlocale'
+  have_func 'nl_langinfo'
+end
+create_makefile 'locale_system'

data/ext/gettext/{gettext/_locale.c → locale_system.c}

@@ -1,11 +1,11 @@
 /* -*- c-file-style: "ruby"; tab-width: 4 -*-
  *
- * Copyright (C) 2002-2005 Masao Mutoh
+ * Copyright (C) 2002-2006 Masao Mutoh
  * 
  * You may redistribute it and/or modify it under the same
  * license terms as Ruby.
  * 
- * $Id: _locale.c,v 1.2 2005/08/20 17:05:34 mutoh Exp $
+ * $Id: locale_system.c,v 1.3 2006/02/20 12:35:06 mutoh Exp $
  */
 
 #include "ruby.h"
@@ -29,11 +29,7 @@ static VALUE
 gt_locale_id_win32(self)
     VALUE self;
 {
-	int lcid, pri_id, sub_id;
-	lcid = GetUserDefaultLangID();
-	pri_id = lcid & 0x3ff;
-	sub_id = lcid >> 10;
-	return rb_assoc_new(INT2FIX(pri_id), INT2FIX(sub_id));
+    return INT2NUM(GetUserDefaultLangID());
 }
 #endif
 static VALUE
@@ -64,23 +60,23 @@ gt_codeset(self)
 #endif
 }
 
-void Init__locale()
+void Init_locale_system()
 {
     VALUE mLocale = rb_define_module("Locale");
-
+    VALUE mSystem = rb_define_module_under(mLocale, "System");
 #if defined HAVE_WINDOWS_H
-    rb_define_module_function(mLocale, "__locale_id", gt_locale_id_win32, 0);
+    rb_define_module_function(mSystem, "locale_id", gt_locale_id_win32, 0);
 #endif
-    rb_define_module_function(mLocale, "set", gt_setlocale, 2);
-    rb_define_module_function(mLocale, "codeset", gt_codeset, 0);
+    rb_define_module_function(mSystem, "set", gt_setlocale, 2);
+    rb_define_module_function(mSystem, "codeset", gt_codeset, 0);
 # if defined HAVE_SETLOCALE
-    rb_define_const(mLocale, "ALL", INT2NUM(LC_ALL));
-    rb_define_const(mLocale, "COLLATE", INT2NUM(LC_COLLATE));
-    rb_define_const(mLocale, "CTYPE", INT2NUM(LC_CTYPE));
-    rb_define_const(mLocale, "MESSAGES", INT2NUM(LC_MESSAGES));
-    rb_define_const(mLocale, "MONETARY", INT2NUM(LC_MONETARY));
-    rb_define_const(mLocale, "NUMERIC", INT2NUM(LC_NUMERIC));
-    rb_define_const(mLocale, "TIME", INT2NUM(LC_TIME));
+    rb_define_const(mSystem, "ALL", INT2NUM(LC_ALL));
+    rb_define_const(mSystem, "COLLATE", INT2NUM(LC_COLLATE));
+    rb_define_const(mSystem, "CTYPE", INT2NUM(LC_CTYPE));
+    rb_define_const(mSystem, "MESSAGES", INT2NUM(LC_MESSAGES));
+    rb_define_const(mSystem, "MONETARY", INT2NUM(LC_MONETARY));
+    rb_define_const(mSystem, "NUMERIC", INT2NUM(LC_NUMERIC));
+    rb_define_const(mSystem, "TIME", INT2NUM(LC_TIME));
 #endif
 
 }