gettext 1.7.0 → 1.8.0

data/ChangeLog

@@ -1,3 +1,142 @@
+2006-09-12  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/textdomain.rb: Fixed a bug of add_default_locale_path.
+	* lib/gettext/parser/ruby.rb: Improve to output error messages.
+
+2006-09-11  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/active_record.rb: Works rails_edge again. 
+	Reported by Donald Piret. (http://dev.rubyonrails.org/ticket/5810)
+
+2006-09-07  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/locale_cgi.rb, locale_object.rb: Speed up.
+	* lib/gettext.rb: Fixed to extract correct textdomains in each_textdomain.
+
+2006-09-05  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* README, NEWS: Updated.
+
+2006-09-04  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rgettext.rb: Raise error when parsing was failed.
+	* lib/gettext.rb: GetText.locale= is the alias of GetText.set_locale_all instead 
+	of GetText.set_locale.
+	* test/gettext_test_active_record.rb: Added tests.
+	* test/fixtures/*.rb: updated.
+	* test/po/active_record.pot, test/po/ja/active_record.po: updated.
+
+2006-09-01  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* test/gettext_test_active_record.rb: Added tests.
+
+2006-08-31  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/active_record.rb: Fix the custom messages of validates_length_of
+	with :too_long, :too_short, :wrong_length.
+
+2006-08-30  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* test/Rakefile, test/db/*sql: Added.
+
+2006-08-29  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* test/gettext_test_active_record.rb, test/fixtures/*, test/po/active_record.pot,
+	test/po/ja/active_record.po: Added tests for ActiveRecord with GetText.
+	* lib/gettext/active_record.rb: Messages updated.
+	* po/*/rails.po[t]: ditto.
+
+2006-08-22  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/rails/db/schema.rb: Added.
+	* samples/rails/db/*.sql: Removed. Use rake db:schema:load instead.
+	* samples/rails/README: Follow above changes.
+	* samples/rails/po/*: Updated.
+	* lib/gettext/active_record.rb: Fixed the problem of untranslate(_all).
+	Reported by Tsutomu Kuroda.
+
+2006-08-21  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* README: Updated.
+	* **/po/zh_TW/*.po: Added zh_TW locale by LIN CHUNG-YI.
+
+2006-08-18  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/version.rb: Increment minor version.
+	* po/et/rails.po: Added Estonian by Erkki Eilonen.
+	* README: ditto.
+	* lib/gettext/rails.rb: Add ActionController::Base.(before|after)_init_gettext.
+
+2006-08-15  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* po/de/rails.po, rgettext.po: Updated by Partick Lenz.
+
+2006-08-13  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/locale.rb: Add Locale.system_module.
+	* lib/gettext/rails.rb: Remove ActionController::Base.textdomainname
+	* lib/gettext.rb, lib/gettext/rails.rb, locale_cgi.rb, 
+	locale_object.rb, string.rb: 
+	Speed up. Improve CPU usages.
+
+2006-08-10  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/parser/active_record.rb: Improved to find ActiveRecord class
+	by steve dp.
+
+2006-08-09  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Code clean up.
+	* lib/gettext.rb: Code clean up.
+	* lib/gettext/active_record.rb: Removed to call bindtextdomain in Validations.
+	It's called in bindtextdomain of init_gettext.
+	* lib/gettext/parser/active_record.rb: Rename from activerecord.rb.
+
+2006-08-08  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/active_record.rb: Fixed on, error_messages_for.
+	by Andreas Neuhaus.
+
+2006-08-04  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Move bindtextdomain_to to lib/gettext.rb.
+	New overrideable callback methods (before|after)_init_gettext(cgi).
+	These methods is called on the each WWW request.
+	* lib/gettext.rb: Add bindtextdomain_to, textdomain_to.
+	* samples/rails/app/controllers/application.rb: Add a sample of 
+	(before|after)_init_gettext(cgi).
+
+2006-07-29  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rgettext.rb: Added -r, -d options.
+	-r is to set an option parser. -d is for debugging mode.
+	  (e.g.) $ rgettext -r fooparser test.foo
+	The idea is from Kobayashi Noritada.
+	Fix a trivial bug by Kobayashi Noritada.
+
+2006-07-25  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/active_record.rb: Separate from rails.rb.
+
+2006-07-23  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: init_gettext manages plural textdomains.
+	bindtextdomain binds a domainname to ActionMailer::Base and ActionView::Base.
+
+2006-07-22  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: init_gettext finds the locale path with caller
+	not RAILS_ROOT now for supporting plugins which has app/controller directory
+	such as Rails Engines.
+	And init_gettext accepts :locale_path option to be able to set the locale
+	path manually.
+	* po/pt_BR/rails.po, rgettext.po: Updated by Joao Pedrosa.
+
+2006-07-17  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: bind the textdomain same with ApplictionController 
+	to the class which includes ActiveRecord::Validations.
+
 2006-07-16  Masao Mutoh  <mutoh@highway.ne.jp>
 
 	* lib/gettext/rails.rb: Code cleanup.

data/NEWS

@@ -1,3 +1,34 @@
+= Ruby-GetText-Package-1.8.0 (2006-09-11)
+
+ * Support Chinese(Taiwan: zh_TW), Estonian(et: rails.po only)
+ * Add GetText.bindtextdomain_to(klass, domainname), .textdomain_to(klass, domainname)
+ * rgettext supports -r, -d options.
+   -r is to set an option parser. -d is for debugging mode.
+    (e.g.) $ rgettext -r fooparser test.foo
+ * Update translations: pt_BR, de, zh_TW, 
+ * Code cleanup, fixed bugs.
+ * Enhance to support Ruby on Rails.
+   * init_gettext finds mo-files in /vendor/plugins/{plugin_name}/locale which has
+     app/controller directories such as Rails Engines.
+     And init_gettext accepts :locale_path option to be able to set the locale
+     path manually.
+   * init_gettext manages plural textdomains.
+   * Add before_init_gettext, after_init_gettext methods like as before/after_filter.
+   * Speed up(the sample blog is 1.5 times faster).
+   * gettext/active_record.rb from gettext/rails.rb.
+   * ActiveRecord::Validations is set the app's textdomain in init_gettext.
+     It means the class which includes ActiveRecord::Validtaions are localized with
+     the app's textdomain. 
+     e.g.) You can use gettext methods in the subclass of ActiveForm[1]
+           http://www.realityforge.org/svn/code/active-form/trunk/
+   * Works rails edge again (http://dev.rubyonrails.org/ticket/5810)
+
+ Thanks to:
+   Translators: Joao Pedrosa(pt_BR), Partick Lenz(de), Erkki Eilonen(et),
+                LIN CHUNG-YI(zh_TW)
+ Bug reports and suggestions:
+   Kobayashi Noritada, Andreas Neuhaus, steve dp, Tsutomu Kuroda, Donald Piret
+
 = Ruby-GetText-Package-1.7.0 (2006-07-17)
 
  * GetText.current_textdomain_info for debuging

data/README

@@ -20,6 +20,7 @@ Ruby-Gettext-Package
     * glade-2 XML file(.glade)
     * ERB file(.rhtml)
     * ActiveRecord(.rb)
+    * Others(with your own parsers)
     The po-file is compatible to GNU gettext.
 
   * rmsgfmt creates a mo-file from a po-file.
@@ -39,7 +40,17 @@ Ruby-Gettext-Package
   * ERB support (gettext/erb)
 
   * Ruby on Rails support (gettext/rails)
-
+    * before_init_gettext, init_gettext, after_init_gettext for initializing
+      GetText.
+    * ActionController, ActionView, ActionMailer and ActiveRecord are 
+      localized in a textdomain.
+    * Validation messages in ActiveRecord are localized.
+    * The table/field names of ActiveRecord are extracted by rgettext 
+      and translated in the application.
+    * plugins can have their own textdomains.
+    * ActionMailer supports ISO-2022-JP message in ja locale.
+
+  * String% is extended to use named argument such as "%{foo}" %{:foo => 1}
 
 Requirements
 ------------
@@ -109,10 +120,13 @@ License
 Translators
 -----------
 Chinese(Simplified)(zh_CN) - Yingfeng <blogyingfeng at gmail.com>
+Chinese(Traditional)(zh_TW)- LIN CHUNG-YI <xmarsh at gmail.com>
 Czech(cs)                  - Karel Miarka <kajism at yahoo.com>
 Dutch(nl)                  - Menno Jonkers <ruby-gettext at jonkers.com>
+Estonian(et)               - Erkki Eilonen <erkki at itech.ee>
 French(fr)                 - Laurent Sansonetti <laurent.sansonetti at gmail.com>
-German(de)                 - Detlef Reichl <detlef.reichl at gmx.org>
+German(de)                 - Patrick Lenz <patrick at limited-overload.de> (current)
+                             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>
@@ -128,19 +142,21 @@ Swedish(sv)                - Nikolai Weibull <mailing-lists.ruby-talk at rawuncu
 
 Status of translations
 ----------------------
-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.7.0
-Italian(it)               - 1.6.0
-Japanese(ja)              - 1.7.0
-Korean(ko)                - 1.7.0
-Portuguese(Brazil)(pt_BR) - 1.6.0
-Russian(ru)               - 1.7.0
+Chinese(zh_CN)            - 1.8.0
+Chinese(zh_TW)            - 1.8.0
+Czech(cs)                 - 1.8.0
+Dutch(nl)                 - 1.8.0
+English(default)          - 1.8.0
+Estonian(et)              - 1.8.0 (rails.po only)
+French(fr)                - 1.8.0
+German(de)                - 1.8.0
+Greek(el)                 - 1.6.0 (old)
+Spanish(es)               - 1.8.0
+Italian(it)               - 1.6.0 (old)
+Japanese(ja)              - 1.8.0
+Korean(ko)                - 1.8.0
+Portuguese(Brazil)(pt_BR) - 1.8.0
+Russian(ru)               - 1.8.0
 Swedish(sv)               - 0.8.0 (old)
 
 Maintainer

data/Rakefile

@@ -17,7 +17,6 @@ require 'rubygems'
 require 'rake'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
-require 'rake/rdoctask'
 require 'gettext/version'
 
 RUBYBIN = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']) + " "
@@ -103,13 +102,14 @@ end
 
 desc "Update pot/po files to match new version."
 task :updatepo do
+  rails = ["lib/gettext/rails.rb", "lib/gettext/active_record.rb"]
   #lib/gettext/*.rb -> rgettext.po
   GetText.update_pofiles("rgettext", 
-			 Dir.glob("lib/**/*.rb") + ["src/poparser.ry"] - ["lib/gettext/rails.rb"], 
+			 Dir.glob("lib/**/*.rb") + ["src/poparser.ry"] - rails,
 			 "ruby-gettext #{GetText::VERSION}")
 
   #lib/gettext/rails.rb -> rails.po
-  GetText.update_pofiles("rails", ["lib/gettext/rails.rb"], 
+  GetText.update_pofiles("rails", rails,
 			 "ruby-gettext #{GetText::VERSION}")
 end
 
@@ -205,30 +205,3 @@ task :testunit => [:makemo_test] do
     sh 'cd test; sh test.sh'
   end
 end
-
-Rake::RDocTask.new do |rd|
-  rd.main = "README"
-  rd.rdoc_files.include("README", "lib/**/*.rb")
-end
-
-PKG_GID = 855
-PKG_ID = 978
-def release_package(target)
-  cmd = "rubyforge add_release #{PKG_GID} #{PKG_ID} 'Ruby-GetText-Package-#{PKG_VERSION}' pkg/#{target}"
-  puts cmd
-  system(cmd)
-end
-
-desc "Publish the release files to RubyForge."
-task :rubyforge do
-  `rubyforge login`
-  release_package("gettext-#{PKG_VERSION}.gem")
-  release_package("ruby-gettext-package-#{PKG_VERSION}.tar.gz")
-end
-
-task :rubyforge_delete do
-  `rubyforge login`
-  cmd =  "rubyforge delete_package #{PKG_GID} #{PKG_ID}"
-  puts cmd
-  system(cmd)
-end

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.8 2006/02/22 16:42:41 mutoh Exp $
+  $Id: rgettext,v 1.12 2006/09/10 15:08:32 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.7 2006/02/22 16:42:41 mutoh Exp $
+  $Id: rmsgfmt,v 1.11 2006/09/10 15:08:32 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.6 2006/02/22 16:42:41 mutoh Exp $
+  $Id: rmsgmerge,v 1.10 2006/09/10 15:08:32 mutoh Exp $
 =end
 
 begin

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.15 2006/06/11 15:36:20 mutoh Exp $
+  $Id: gettext.rb,v 1.20 2006/09/10 15:08:32 mutoh Exp $
 =end
 
 require 'rbconfig'
@@ -49,7 +49,7 @@ module GetText
   #   * :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.
+  # * Returns: the GetText::TextDomainManager.
   # Note: Don't use locale_, charset argument(not in options). 
   # They are remained for backward compatibility. 
   #
@@ -76,12 +76,25 @@ module GetText
     manager
   end
 
+  # Includes GetText module and bind a textdomain to a class.
+  # * klass: the target ruby class.
+  # * domainname: the textdomain name.
+  # * options: options as an Hash. See GetText.bindtextdomain.
+  def bindtextdomain_to(klass, domainname, options = {}) 
+    ret = nil
+    klass.module_eval {
+      include GetText
+      ret = bindtextdomain(domainname, options)
+    }
+    ret
+  end
+
   # Binds a existed textdomain to your program. 
-  # This is the same function with GetText.bindtextdomain but simpler than bindtextdomain.
+  # This is the same function with GetText.bindtextdomain but simpler(and faster) than bindtextdomain.
   # Notice that you need to call GetText.bindtextdomain first. If the domainname hasn't bound yet, 
   # raises GetText::NoboundTextDomainError.
   # * domainname: a textdomain name.
-  # * Returns: the GetText::TextDomain.
+  # * Returns: the GetText::TextDomainManager.
   def textdomain(domainname)
     domain = TextDomainManager.textdomain(domainname)
     raise NoboundTextDomainError, "#{domainname} is not bound." unless domain
@@ -90,31 +103,37 @@ module GetText
       manager = TextDomainManager.new(bound_target, Locale.get)
       @@__textdomainmanagers[bound_target] = manager
     end
-    manager.add_textdomain(domainname)
     manager.set_locale(Locale.get)
+    manager.add_textdomain(domainname)
+    manager
   end
 
-  TARGET_REGEXP = /\:\:/  # :nodoc:
+  # Includes GetText module and bind an exsited textdomain to a class. 
+  # See textdomain for more detail.
+  # * klass: the target ruby class.
+  # * domainname: the textdomain name.
+  def textdomain_to(klass, domainname) 
+    ret = nil
+    klass.module_eval {
+      include GetText
+      ret = textdomain(domainname)
+    }
+    ret
+  end
 
   # Iterates bound textdomains.
   # * 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 = []) #:nodoc:
-    (klass.ancestors + [GetText]).each do |target|
+    bound_targets(klass).each do |target|
       unless ignore_targets.include? target
-	ignore_targets << target
 	manager = @@__textdomainmanagers[target]
 	if manager
 	  manager.each{ |textdomain|
 	    yield textdomain
 	  }
 	end
-	if target.to_s =~ TARGET_REGEXP
-	  each_textdomain(Module.const_get($`), ignore_targets){|domain|
-	    yield domain
-	  }
-	end
       end
     end
     self
@@ -128,6 +147,15 @@ module GetText
     end
   end
 
+  def bound_targets(klass)  # :nodoc:
+    ret = []
+    ary = klass.name.split(/::/)
+    while(v = ary.shift)
+      ret.unshift(((ret.size == 0) ? eval(v) : ret[0].const_get(v)))
+    end
+    ((ret + klass.ancestors + [GetText]) & @@__textdomainmanagers.keys).uniq
+  end
+
   # call-seq:
   #   gettext(msgid)
   #   _(msgid)
@@ -213,7 +241,7 @@ module GetText
     msg
   end
 
-  # Sets locale to the current class/module
+  # Sets the default locale to the current class/module
   #
   # Notice that you shouldn't use this for your own Libraries.
   # * locale: a locale string or Locale::Object.
@@ -232,7 +260,7 @@ module GetText
       ret.charset = output_charset if output_charset
       Locale.set(ret)
     else
-      Locale.clear
+      Locale.set(nil)
       ret = Locale.get
     end
     if this_target_only
@@ -251,7 +279,7 @@ module GetText
   # Sets locale to the all textdomains.
   #
   # Notice that you shouldn't use this for your own Libraries.
-  # * locale: a locale string or Locale::Object.
+  # * locale: a locale string or Locale::Object, otherwise nil to use default locale.
   # * Returns: self
   def set_locale_all(locale)
     ret = nil
@@ -261,24 +289,23 @@ module GetText
       else
 	ret = Locale::Object.new(locale.to_s)
       end
-      ret.charset = output_charset if output_charset
-      Locale.set(ret)
+      Locale.set_current(ret)
     else
-      Locale.set(nil)
+      Locale.set_current(nil)
       ret = Locale.get
     end
+    ret.charset = output_charset if output_charset
     TextDomainManager.each_all {|textdomain|
       textdomain.set_locale(ret)
     }
     self
   end
 
-  # Same as GetText.set_locale.
+  # Same as GetText.set_locale_all.
   # * locale: a locale string
-  # * src: internal usage only. You shouldn't use this.
   # * Returns: a locale string
   def locale=(locale)
-    set_locale(locale)
+    set_locale_all(locale)
     locale
   end
 
@@ -363,7 +390,7 @@ module GetText
   alias :s_ :sgettext #:nodoc:
 
   module_function :bindtextdomain, :textdomain, :each_textdomain,
-    :N_, :gettext, :_, :ngettext, :n_, :sgettext, :s_, :bound_target,
+    :N_, :gettext, :_, :ngettext, :n_, :sgettext, :s_, :bound_target, :bound_targets,
     :setlocale, :set_locale, :locale=, :set_locale_all, :locale, :charset=, :set_charset,
     :set_output_charset, :output_charset=, :output_charset, :current_textdomain_info
 end