gettext 1.0.0 → 1.1.0

data/ChangeLog

@@ -1,3 +1,197 @@
+2005-12-29  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/locale_win32.rb: Fixed a syntax error.
+	* po/{it,sv}/rgettext.po: Updated.
+	* samples/rails/po/ja/blog.po: Fixed a fuzzy message.
+	* po/de/rgettext.po: Fixed a compilingproblem.
+	* README, NEWS: Updated.
+	* lib/gettext/rails.rb: Fix a problem when 
+	http://localhost:3000/rails_info/properties is called.
+	Pointed out by Kazuhiro NISHIYAMA.
+	* po/de/rails.po: Added by Sasa Ebach.
+	* po/de/rgettext.po, samples/rails/po/de/*.po: 
+	Updated by Sasa Ebach.
+
+2005-12-28  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* NEWS: Updated.
+	* README: Updated.
+	* po/es/rails.po: Added by David Espada.
+	* po/es/rgettext.po, samples/rails/po/es/*.po: 
+	Updated by David Espada.
+
+2005-12-27  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* test/gettext_test_string.rb: Add a test.
+
+2005-12-26  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/rails/app/controllers/blog_controller.rb: Updated.
+
+2005-12-25  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* NEWS: Updated.
+	* README: Updated.
+	* lib/gettext/parser/activerecord.rb: Don't show the messages
+	when ActiveRecord and its subclasses are not found.
+	* po/ja/rgettext.po: Updated.
+
+2005-12-24  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/po/nl/*.po, samples/cgi/po/nl/*.po, 
+	samples/rails/po/nl/*.po, po/nl/rgettext.po, 
+	rails.po: Added Dutch locale by Menno Jonkers.
+
+2005-12-23  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* README: Updated.
+	* README.ja: Removed.
+	* po/ko/rails.po: Added by Gyoung-Yoon Noh.
+	* po/ko/rgettext.po, samples/po/ko/*.po, samples/cgi/po/ko/*.po,
+	samples/rails/po/ko/*.po: Updated by Gyoung-Yoon Noh.
+	* lib/gettext/textdomain.rb: Fixed a bug when mo-files are not found.
+	* samples/rails/po/en/blog.po: Added for English. 
+	You can change the table names, field names of ActiveRecord even you use English.
+	* lib/gettext/textdomain.rb: Code cleanup.
+	* samples/rails/vendor/plugins/gettext/lib/gettext_plugin.rb: begin a new line
+	each 6 language.
+	* samples/rails/vendor/plugins/gettext/po/*: Update version info.
+	
+2005-12-21  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/rails/README: Updated.
+	* lib/gettext/utils.rb: Added. GetText.update_pofiles.
+	* Rakefile, samples/rails/Rakefile: Use GetText.update_pofiles.
+
+2005-12-20  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/utils.rb: Added. Implement GetText.updatepo.
+	* Rakefile: 
+
+2005-12-19  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/po/cs/*.po, samples/cgi/po/cs/*.po, 
+	samples/rails/po/cs/*.po, po/cs/rgettext.po, 
+	rails.po: Added Czech locale by Karel Miarka.
+
+2005-12-18  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/fr/rgettext.po, samples/cgi/po/fr/main.po: 
+	Updated by Laurent Sansonetti.
+	* po/fr/rails.po: Added by Laurent Sansonetti.
+	* po/pt_BR/rails.po, samples/cgi/po/pt_BR/*.po,
+	samples/rails/po/pt_BR/*.po: 
+	Added by Joao Pedrosa.
+	* po/pt_BR/rgettext.po, samples/po/pt_BR/*.po: 
+	Updated by Joao Pedrosa.
+
+2005-12-17  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/rails.pot, po/ja/rails.po: Added.
+	* test/gettext_test_string.rb: Added.
+
+2005-12-12  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/rails/Rakefile: Added "updatepo" task.
+	* lib/gettext/parser/activerecord.rb: Added a parser for 
+	ActiveRecord.
+
+2005-12-10  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Added GetText information to 
+	Rails::Info.
+
+2005-12-08  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* test/gettext_test_cgi.rb: Added tests for Locale.normalize.
+	* lib/gettext/cgi.rb: Fix a problem of Locale.normalize.
+
+2005-12-07  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/cgi.rb: Separate Locale.normalize.
+
+2005-12-06  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* test/gettext_test.rb, test/po/{da,fr}/plural_error.po: 
+	Fix test_plural_format_invalid.
+
+2005-12-05  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* test/gettext_test.rb, test/po/*/plural.po: Fix test case.
+
+2005-12-04  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/rails/vendor/plugins/gettext/lib/gettext_plugin.rb: Revised comments.
+
+2005-12-01  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Improved to support L10n for ActiveRecord::Errors.
+	  Improve ActionController::Base.init_gettext(_main).
+	* samples/rails/app/controller/application.rb: Improved comments.
+	* samples/rails/app/views/blog/_form.rhtml: Add information to validate.
+	
+2005-11-27  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/string.rb: Added. New syntax ":{foo} is bar." % {:foo => "foo"} 
+	  is supported.
+	* lib/gettext/rmsgmerge.rb: Added.
+	* lib/gettext.rb, lib/gettext/textdomain.rb: Fix a bug of GetText.ngettext.
+
+2005-11-25  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/rails/app/*: Rewrite for RoR 0.14.x. 
+	* lib/gettext/rails.rb: Added ActionController::Base.init_gettext.
+	* samples/rails/app/controllers/application.rb: ditto.
+
+2005-11-23  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/rails/app/controllers/application.rb: Use 
+	GetText.output_charset to set the Content-Type.
+	* lib/gettext/rails.rb: Call bindtextdomain in models(ActiveRecord)
+	when bindtextdomain is called in before_filter of ActionController.
+	Inspired from Simon Santoro.
+	* samples/rails/app/models/article.rb: Added to validate description
+	with localized message.
+
+2005-10-22  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/*: Merge rmsgfmt to rgettext.
+	* po/**/rmsgfmt.po[t]: Removed(merge to rgettext.po[t]).
+	* lib/gettext/rmsgmerge.rb: Added by speakillof.
+	* bin/rmsgmerge: Added.
+	* src/poparser.ry: Renamed rmsgfmt.ry to poparser.ry.
+	* lib/gettext/rmsgfmt.rb: Added. Separate code from rmsgfmt.ry.
+	* Rakefile: Check racc is existed or not.
+	* lib/gettext/mo.rb: Follow poparser.ry changes.
+
+2005-09-16  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rgettext.rb: Fixed a header of time strings.
+	Reported by Karel Miarka.
+
+2005-09-12  speakillof <speakillof@yahoo.co.jp>
+
+	* lib/gettext/parser/ruby.rb: Added "here document" support.
+
+2005-09-05  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext.rb: Added GetText.locale. Both of GetText.locale= and
+	GetText.locale behaves "global". If you set this once, follow bindtextdomain(s)
+	use this value.
+	* lib/gettext/cgi.rb: Added Locale.set. 
+	* lib/gettext/locale_win32.rb: ENV value is prior to native locale.
+	Added Locale.set.
+	* test/gettext_test.rb: Follow above changes.
+
+2005-09-04  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* Rakefile: move test task to testunit task.
+	* samples/cgi/*.cgi: Support rubygems.
+	* lib/gettext/rails.rb: The default of "charset" parameter becomes nil
+	instead of "UTF-8". You need to call GetText.output_charset=() first.
+	* samples/rails/app/controllers/application.rb: 
+	Call GetText.output_charset = "UTF-8" first.
+
 2005-09-03  Masao Mutoh  <mutoh@highway.ne.jp>
 
 	* src/rmsgfmt.ry: Fixed VERSION info.

data/NEWS

@@ -1,3 +1,52 @@
+= Ruby-GetText-Package-1.1.0 (2005-12-29)
+
+ * Added some functions which managed po/mo files easily.
+   * GetText.update_pofiles creates/updates pot/po files.
+     The idea is from Sascha Ebach.
+
+ * String% is extended to accept named argument. 
+   "%{file} is selected." % {:file => "foo.rb"}
+   Proposed by Sascha Ebach and Kazuhiro NISHIYAMA.
+
+ * Enhanced Ruby on Rails support.
+   * ActiveRecord support. Inspired from Simon Santoro(rgtrans).
+     * the error messages are localized.
+       Also, you can add your own messages with _("").
+     * You can use gettext methods in the models unless
+       preparing anything.
+
+     * rgettext extracts the table names/field names
+       of the subclass of ActiveRecord::Base as the msgid.
+
+       Even for the English developers who don't need 
+       to localize their application, this function is
+       useful because the developer can rename 
+       the table/field names using "en" locale.
+ 
+     * More simple to set up ApplicationController.
+       Now, you need to call just init_gettext only.
+  
+       class ApplicationController < ActionController::Base
+         init_gettext "myapp"  #Easy!
+       end
+
+       This "myapp" domain affects all of the controllers/views/models.
+
+     * Sample "blog" application with rails.
+       Improved the sample application on RoR. See: samples/rails/*.
+
+ * New/Updated translations:
+    Czech              - Karel Miarka (NEW)
+    Dutch              - Menno Jonkers (NEW)
+    French             - Laurent Sansonetti
+    German             - Sasa Ebach
+    Japanese           - Masao Mutoh
+    Korean             - Gyoung-Yoon Noh 
+    Portuguese(Brazil) - Joao Pedrosa
+    Spanish            - David Espada
+
+ * bugfixes.
+
 = Ruby-GetText-Package-1.0.0 (2005-09-03)
 
  * Ruby on Rails is supported.

data/README

@@ -39,6 +39,8 @@ Requirements
   * Racc-1.4.3 or later
     <http://www.ruby-lang.org/raa/list.rhtml?name=racc>
     (for compiling src/rmsgfmt.ry only)
+  * Ruby on Rails 1.0.0 or later (if you use this package with Ruby on Rails)
+    <http://www.rubyonrails.org/>
 
 Install
 -------
@@ -97,15 +99,32 @@ License
 
 Translators
 -----------
-French             - Laurent Sansonetti
-German             - Detlef Reichl, Sven Herzberg
-Italian            - Gabriele Renzi
-Japanese           - Masao Mutoh
-Korean             - Gyoung-Yoon Noh
-Portuguese(Brazil) - Joao Pedrosa 
-Spanish            - David Espada, David Moreno Garza
-Swedish            - Nikolai Weibull
-
+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>
+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>
+
+Status of translations
+----------------------
+cs    - 1.1.0
+fr    - 1.1.0
+de    - 1.1.0
+es    - 1.1.0
+it    - 1.0.0
+ja    - 1.1.0
+ko    - 1.1.0
+nl    - 1.1.0
+pt_BR - 1.1.0
+sv    - 0.8.0
 
 Maintainer
 ----------

data/Rakefile

@@ -16,27 +16,34 @@ require 'rubygems'
 require 'rake'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
+require 'gettext/version'
 
 RUBYBIN = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']) + " "
 
+PKG_VERSION = GetText::VERSION
+
 task :default => [:makemo]
 
 ############################################################
 # GetText tasks
 ############################################################
-desc "Create lib/gettext/rmsgfmt.rb"
-task :rmsgfmt do
+desc "Create lib/gettext/poparser.rb"
+task :poparser do
+  poparser_path = "lib/gettext/poparser.rb"
   racc = File.join(Config::CONFIG['bindir'], "racc")
-  if FileTest.exist?(racc)
-    cmd = "#{RUBYBIN} #{racc} -g src/rmsgfmt.ry -o src/rmsgfmt.tmp.rb"
+  if ! FileTest.exist?(racc)
+    puts "racc was not found: #{racc}"
+    exit 1
+  else FileTest.exist?(racc)
+    cmd = "#{RUBYBIN} #{racc} -g src/poparser.ry -o src/poparser.tmp.rb"
     system(cmd)
     $stderr.puts cmd
 
-    file = open("lib/gettext/rmsgfmt.rb", "w")
+    file = open(poparser_path, "w")
 
     file.print "=begin\n"
     file.print <<-EOS
-  rmsgfmt.rb - Generate a .mo
+  poparser.rb - Generate a .mo
 
   Copyright (C) 2003-2005 Masao Mutoh <mutoh@highway.ne.jp>
 
@@ -45,26 +52,29 @@ task :rmsgfmt do
 EOS
     file.print "=end\n\n"
 
-    tmpfile = open("src/rmsgfmt.tmp.rb")
+    tmpfile = open("src/poparser.tmp.rb")
     file.print tmpfile.read
     file.close
     tmpfile.close
-    File.delete("src/rmsgfmt.tmp.rb")
+    File.delete("src/poparser.tmp.rb")
+   $stderr.puts "Create #{poparser_path}."
   end
 end
 
+############################################################
+# Manage po/mo files
+############################################################
+require 'gettext/utils'
+
 task :makemo_test do
-  require 'gettext/rmsgfmt'
   $stderr.puts "Create test mo files."
   GetText.create_mofiles(false, "test/po", "test/locale")
 end
 
 desc "Create *.mo from *.po"
-task :makemo => [:rmsgfmt, :makemo_test] do
-  require 'gettext/rmsgfmt'
-
+task :makemo => [:poparser, :makemo_test] do
   $stderr.puts "Create rgettext/rmsgfmt mo files."
-  GetText.create_mofiles(false)
+  GetText.create_mofiles(true)
 
   $stderr.puts "Create samples mo files."
   GetText.create_mofiles(false, "samples/po", "samples/locale")
@@ -77,42 +87,45 @@ task :makemo => [:rmsgfmt, :makemo_test] do
 
 end
 
-def msgmerge(name, po_root, tmp_file = "tmp.pot")
-  system("msgmerge #{po_root}/#{name}.pot #{tmp_file} -o #{po_root}/#{name}.pot")
-
-  Dir.glob("#{po_root}/*/#{name}.po"){ |f|
-    lang = /#{po_root}\/(.*)\//.match(f).to_a[1]
-    system("msgmerge #{po_root}/#{lang}/#{name}.po #{tmp_file} -o #{po_root}/#{lang}/#{name}.po")
-    cont =IO.read(f)
-    cont.sub!(/(Project-Id-Version\:.*)(\d\.\d\.\d)/, "\\1#{GetText::VERSION}")
-    File.open(f, "w") do |out| 
-      out.write(cont)
-    end
-  }
-end
-
-desc "Update *po files to match new version.(for me)"
+desc "Update pot/po files to match new version."
 task :updatepo do
-  require 'gettext/rgettext'
-  # Update rgettext po files.
-  GetText.rgettext("lib/gettext/rgettext.rb", "tmp.pot")
-  msgmerge("rgettext", "po")
-
-  # Update rmsgfmt po files.
-  GetText.rgettext("lib/gettext/rmsgfmt.rb", "tmp.pot")
-  msgmerge("rmsgfmt", "po")
-  File.delete("tmp.pot")
+  #lib/gettext/*.rb -> rgettext.po
+  GetText.update_pofiles("rgettext", 
+			 Dir.glob("lib/**/*.rb") - ["lib/gettext/rails.rb"], 
+			 "ruby-gettext #{GetText::VERSION}")
+
+  #lib/gettext/rails.rb -> rails.po
+  GetText.update_pofiles("rails", ["lib/gettext/rails.rb"], 
+			 "ruby-gettext #{GetText::VERSION}")
 end
 
 desc "Setup Ruby-GetText-Package. (for setup.rb)"
 task :setup => [:makemo]
 
+desc "Gather the newest po files. (for me)"
+task :gatherpo => [:updatepo] do
+  mkdir_p "pofiles/original" unless FileTest.exist? "pofiles/original"
+  Dir.glob("**/*.pot").each do |f|
+    unless /^(pofiles|test)/ =~ f
+      copy f, "pofiles/original/"
+    end
+  end
+  Dir.glob("**/*.po").each do |f|
+    unless /^(pofiles|test)/ =~ f
+      lang = /po\/([^\/]*)\/(.*.po)/.match(f).to_a[1]
+      mkdir_p "pofiles/#{lang}" unless FileTest.exist? "pofiles/#{lang}"
+      copy f, "pofiles/#{lang}/"
+      Dir.glob("pofiles/original/*.pot").each do |f|
+	newpo = "pofiles/#{lang}/#{File.basename(f, ".pot")}.po"
+	copy f, newpo unless FileTest.exist? newpo
+      end
+    end
+  end	
+end
+
 ############################################################
 # Package tasks
 ############################################################
-require 'gettext/version'
-
-PKG_VERSION = GetText::VERSION
 desc "Create gem and tar.gz"
 spec = Gem::Specification.new do |s|
   s.name = 'gettext'
@@ -163,7 +176,7 @@ end
 # Misc tasks
 ############################################################
 desc "Test task (for shell environment only)"
-task :test => [:makemo_test] do 
+task :testunit => [:makemo_test] do 
   unless /mswin32/ =~ RUBY_PLATFORM
     sh 'cd test; sh test.sh'
   end