gettext 1.2.0 → 1.3.0

data/ChangeLog

@@ -1,3 +1,77 @@
+2006-03-11  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: ActiveRecord::Column.human_name translates 
+	the column name using s_("Model|fieldname").
+	Pointed out by Kazuhiro NISHIYAMA.
+	* samples/rails/lib/tasks/gettext.rake: Move from Rakefile.
+	Pointed out by Kazuhiro NISHIYAMA.
+	* samples/rails/Rakefile: Move gettext tasks to lib/tasks/gettext.rake.
+	* samples/rails/*: Updates files to which generated with rails 1.0.
+	* NEWS: Updated.
+
+2006-03-10  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: Localized ActiveRecord::Base.validates_* works correctly
+	under production mode.
+	Reported by Nickolay Kolev.
+	ActionView::Base#render_file supports localized template such as 
+	foo_ja.rhml, foo_ja_JP.rhtml. Revert Action::Controller::Base#render.
+	* NEWS: follow this change.
+
+2006-03-09  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: ActiveRecord::Base.error_message_(title|explanation)
+	works production mode.
+	
+2006-03-08  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* NEWS: Updated.
+	* lib/gettext/rails.rb: Fix a problem of ActionMailer in "ja".
+	* lib/gettext/version.rb: Incremented version number.
+
+2006-03-04  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/rails.rb: @params["lang"] is treated as cgi["lang"].
+	Reported by Erkki Eilonen.
+
+2006-03-03  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/locale_cgi.rb: Remove debug code.
+	* lib/gettext/locale_object.rb: 
+	  - Fix a memory leak. Reported by Jonas Schwertfeger.
+	  - Locale::Object.parser improved.
+	  - Rename Locale::Object#sort_order to #variant.
+	  - "POSIX" and "C" locale strings are converted to "en".
+	  - Add Locale::Object#to_general.
+	* test/gettext_test_locale.rb: Add tests follow the changes.
+	* lib/gettext/rails.rb: 
+	  - ActionMailer sends a mail 
+	  - in ISO-2022-JP if the language is japanese. The idea from 
+	    Iso2022Mailer by drawnboy.
+	  - ActionController::Base.render_text is overrided to find
+	    localized templates such as foo_ja.rhml, foo_ja_JP.rhtml.
+	    You can reject this to set false to 
+	    GetText::Rails.use_localized_templates.
+	    The idea is from Yugui.
+
+2006-03-02  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* samples/rails/app/models/article.rb: Add a sample of 
+        ActiveRecord::Base.set_error_message_(title|explanation).
+	* lib/gettext/rails.rb: Fix a non-translated problem on production mode.
+	ActionMailer supported by Albert Ramstedt.
+	ActiveRecord::Base.set_error_message_(title|explanation) accepts Nn_() 
+	value(Array).
+
+2006-02-25  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext/locale.rb: Fix to return system value when @@default is unset.
+	* lib/gettext/rails.rb: Fix a problem with Locale.default=.
+
+2006-02-24  Masao Mutoh  <mutoh@highway.ne.jp>
+
+	* lib/gettext.rb: Fix a typo.
+
 2006-02-23  Masao Mutoh  <mutoh@highway.ne.jp>
 
 	* Rakefile: Fix a problem to make package on Win32.

data/NEWS

@@ -1,3 +1,19 @@
+= Ruby-GetText-Package-1.3.0 (2006-03-08)
+
+ * Improve Local::Object
+   * POSIX, C convert to "en".
+ * Enhance supports of Ruby on Rails.
+   * ActionMailer localization support.
+      * Use GetText function(_() N_() etc) in template.
+      * ISO-2022-JP charset is used when language is "ja"(Japanese).
+   * Localization templates support.
+      * ActionController::Base.render_text is overrided to find
+        localized templates such as foo_ja.rhml, foo_ja_JP.rhtml.
+   * @params["lang"] is treated as cgi["lang"]
+   * Use N_() as localized messages of validates_* instead of _().
+   * Translates ActiveRecord::Column.human_name values automatically.
+ * Fix memory leak, other bugs.
+
 = Ruby-GetText-Package-1.2.0 (2006-02-23)
 
  * Re-implement Locale module and Implements Locale::Object, 

data/README

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

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.8 2006/02/20 12:35:06 mutoh Exp $
+  $Id: gettext.rb,v 1.10 2006/03/03 09:22:03 mutoh Exp $
 =end
 
 require 'rbconfig'
@@ -145,6 +145,7 @@ module GetText
 
   # This is same function as N_ but for ngettext. 
   # * msgid: the message id.
+  # * msgid_plural: the plural message id.
   # * Returns: msgid.
   def Nn_(msgid, msgid_plural)
     [msgid, msgid_plural]
@@ -181,15 +182,19 @@ module GetText
     caller(2)[0].sub(/:\d+(?::in \`\S+\')?\Z/, '')
   end
 
-  # Sets locale(String) such as "de", "fr", "it", "ko", "ja_JP.eucJP", "zh_CN.EUC" ... 
+  # Sets locale such as "de", "fr", "it", "ko", "ja_JP.eucJP", "zh_CN.EUC" ... 
   #
   # Notice that you shouldn't use this for your own Libraries.
-  # * locale: a locale string
+  # * locale: a locale string or Locale::Object.
   # * src: internal usage only. You shouldn't use this.
   # * Returns: self
   def set_locale(locale, src = callersrc)
     if locale
-      ret = Locale::Object.new(locale)
+      if locale.kind_of? Locale::Object
+	ret = locale
+      else
+	ret = Locale::Object.new(locale.to_s)
+      end
       ret.charset = @@__output_charset if @@__output_charset
     else
       ret = nil

data/lib/gettext/locale.rb

@@ -1,12 +1,12 @@
 =begin
   locale.rb - Locale module
 
-  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.rb,v 1.9 2006/02/20 12:35:06 mutoh Exp $
+  $Id: locale.rb,v 1.10 2006/03/03 07:03:50 mutoh Exp $
 =end
 
 require 'gettext/locale_object'
@@ -87,8 +87,7 @@ module Locale
   # If the default locale not set, this returns system locale.
   # * Returns: the default locale (Locale::Object).
   def default
-    @@default = system unless @@default
-    @@default
+    @@default ? @@default : system
   end
 
   # Gets the current locale (Locale::Object).
@@ -143,6 +142,11 @@ module Locale
   #   set(lang)
   #   set(lang, country = nil, charset = nil)
   #
+  # * lang: language as String, or Locale::Object
+  # * country: country as String or nil
+  # * charset: charset as String or nil
+  # * Returns: a Locale::Object.
+  #
   # Sets a default locale. This function is an alias of Locale.set_default.
   #
   # *Notice*: Locale.set(lctype, locale) is deprecated.
@@ -155,8 +159,10 @@ module Locale
       charset = nil
     end
 
-    if lang
+    if lang.kind_of? String
       set_default(Locale::Object.new(lang, country, charset))
+    elsif lang.kind_of? Locale::Object
+      set_default(lang)
     else
       set_default(nil)
     end

data/lib/gettext/locale_cgi.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_cgi.rb,v 1.1 2006/02/20 12:35:06 mutoh Exp $
+  $Id: locale_cgi.rb,v 1.3 2006/03/07 17:26:57 mutoh Exp $
 =end
 
 
@@ -23,16 +23,13 @@ module Locale # :nodoc:
     def system
       cgi_ = cgi
       if ret = cgi_["lang"] and ret.size > 0
-	$stderr.print "query_string: lang = #{ret}\n" if $DEBUG
       elsif ret = cgi_.cookies["lang"][0]
-	$stderr.print "cookie: lang = #{ret}\n" if $DEBUG
       elsif lang = cgi_.accept_language and lang.size > 0
-	$stderr.print "accept lanaugage: lang = #{lang}\n" if $DEBUG
 	ret = lang.split(/,|;/).first
       else
 	ret = @@default_locale.to_str
       end
-      
+ 
       codesets = cgi_.accept_charset
       if codesets and codesets.size > 0
 	ary = codesets.split(',')

data/lib/gettext/locale_object.rb

@@ -6,23 +6,29 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale_object.rb,v 1.6 2006/02/20 16:12:05 mutoh Exp $
+  $Id: locale_object.rb,v 1.7 2006/03/03 07:03:50 mutoh Exp $
 =end
 
 
 module Locale # :nodoc:
   class Object
-    attr_accessor :language, :country, :charset, :script, :sort_order, :modifier, :orig_str
+    attr_accessor :language, :country, :charset, :script, :variant, :modifier, :orig_str
 
     # Parse POSIX or RFC 3066 style locale name to Array.
     #
     # * locale_name: locale name as String 
     #   
     #   * Basic POSIX format: <language>_<COUNTRY>.<charset>@<modifier>
+    #      * Both of POSIX and C are converted to "en".
     #   * Basic RFC3066 format: <language>-<COUNTRY>
+    #   * Win32 format: <language>-<COUNTRY>-<Script>_<sort order>
+    #   * CLDR format: <language>_<Script>_<COUNTRY>_<variant>@<modifier>
+    #   * Some broken format: <language>_<country>_<script>  # Don't use this.
     #   * The max locale format is below:     
-    #     <language>-<COUNTRY>-<Script>_<sort order>.<charset>@<modifier>
-    #       * both of '-' and '_' are separators.
+    #      * <language>-<COUNTRY>-<Script>_<sort order>.<charset>@<modifier>
+    #      * format: <language>_<Script>_<COUNTRY>_<variant>@<modifier>
+    #         * both of '-' and '_' are separators.
+    #         * each elements are omittable.
     #   
     #   (e.g.) uz-UZ-Latn, ja_JP.eucJP, wa_BE.iso885915@euro
     # * Returns: [language, country, charset, script, modifier]
@@ -30,10 +36,9 @@ module Locale # :nodoc:
     #   * country: an uppercase ISO 3166-1 country/region identifier.
     #   * charset: charset(codeset) (no standard)
     #   * script: an initial-uppercase ISO 15924 script code. 
-    #   * sort_order: (Win32 only?)
+    #   * variant: variant value in CLDR or sort order in Win32.
     #   * modifier: (no standard)
     #
-    # script, sort_order and modifier are not used now. 
     #
     #  "ja_JP.eucJP" => ["ja", "JP", "eucJP", nil, nil]
     #  "ja-jp.utf-8" => ["ja", "JP", "utf-8", nil, nil]
@@ -41,16 +46,38 @@ module Locale # :nodoc:
     #  "ja" => ["ja", nil, nil, nil, nil]
     #  "uz@Latn" => ["uz", nil, nil, nil, "Latn"]
     #  "uz-UZ-Latn" => ["uz", "UZ", nil, "Latn", nil]
+    #  "uz_UZ_Latn" => ["uz", "UZ", nil, "Latn", nil]
     #  "wa_BE.iso885915@euro" => ["wa", "BE", "iso885915", nil, "euro"]
+    #  "C" => ["en", nil, nil, nil, nil]
+    #  "POSIX" => ["en", nil, nil, nil, nil]
+    #  "zh_Hant" => ["zh", nil, nil, "Hant", nil]
+    #  "zh_Hant_HK" => ["zh", "HK", nil, "Hant", nil]
+    #  "de_DE@collation=phonebook,currency=DDM" => ["de", "DE", nil, nil, "collation=phonebook,currency=DDM"]
     def self.parse(locale_name)
       lang_charset, modifier = locale_name.split(/@/)
       lang, charset = lang_charset.split(/\./)
-      language, country, script, sort_order = lang.sub(/_/, "-").split('-')
+      language, country, script, variant = lang.gsub(/_/, "-").split('-')
       language = language ? language.downcase : nil
-      language = "C" if language == "c"
-      country = country ? country.upcase : nil
-      script = script ? script[0].chr.upcase + script[1..script.size].downcase : nil
-      [language, country, charset, script, sort_order, modifier]
+      language = "en" if language == "c" || language == "posix"
+      if country
+	if country =~ /[A-Z][a-z]+/  #Latn => script
+	  tmp = script
+	  script = country
+	  if tmp =~ /[A-Z]+/ # US => country
+	    country = tmp
+	  else
+	    country = nil
+	    variant = tmp
+	  end
+	else
+	  country = country.upcase
+	  if script !~ /[A-Z][a-z]+/ #Latn => script
+	    variant = script
+	    script = nil
+	  end
+	end
+      end
+      [language, country, charset, script, variant, modifier]
     end
 
     # Initialize Locale::Object.
@@ -70,11 +97,17 @@ module Locale # :nodoc:
     #   -> language = "en", country = "CA", charset = nil.
     #  Locale::Object.new("uz-uz-latn")
     #   -> language = "uz", country = "UZ", charset = nil, script = "Latn"
+    #  Locale::Object.new("uz_UZ_Latn")
+    #   -> language = "uz", country = "UZ", charset = nil, script = "Latn"
     #  Locale::Object.new("we_BE.iso885915@euro")
     #   -> language = "we", country = "BE", charset = "iso885915", modifier = "euroo".
+    #  Locale::Object.new("C")
+    #   -> language = "en", country = nil, charset = nil.
+    #  Locale::Object.new("POSIX")
+    #   -> language = "en", country = nil, charset = nil.
     def initialize(language_or_locale_name, country = nil, charset = nil)
       @orig_str = language_or_locale_name
-      @language, @country, @charset, @script, @sort_order, @modifier = 
+      @language, @country, @charset, @script, @variant, @modifier = 
 	self.class.parse(language_or_locale_name)
       @country = country if country
       @charset = charset if charset
@@ -94,7 +127,9 @@ module Locale # :nodoc:
       ret
     end
 
-    # Returns the locale as Win32 format. (e.g.) "az_AZ-Latn"
+    # Returns the locale as Win32 format. (e.g.) "az-AZ-Latn".
+    # 
+    # This is used to find the charset from locale table.
     def to_win
       ret = @language
       ret += "-#{@country}" if @country
@@ -102,29 +137,41 @@ module Locale # :nodoc:
       ret
     end
 
+    # Returns the locale as 'ruby' general format. (e.g.) "az_AZ_Latn"
+    def to_general
+      ret = @language
+      ret += "_#{@country}" if @country
+      ret += "_#{@script}" if @script
+      ret      
+    end
+
     # Gets the locale informations as an Array.
-    # * Returns [language, country, charset, script, sort_order, modifier]
+    # * Returns [language, country, charset, script, variant, modifier]
     #   * language: a lowercase ISO 639(or 639-2/T) language code.
     #   * country: an uppercase ISO 3166-1 country/region identifier.
     #   * charset: charset(codeset) (no standard)
     #   * script: an initial-uppercase ISO 15924 script code. 
-    #   * sort_order: (Win32 only?)
+    #   * variant: variant value in CLDR or sort order in Win32.
     #   * modifier: (no standard)
     def to_a
-      [@language, @country, @charset, @script, @sort_order, @modifier]
+      [@language, @country, @charset, @script, @variant, @modifier]
     end
 
-    # Compare self and another object
-    # * other: another object.
-    # * Returns: true if the 2 objects are same object.
-    def ==(other)
+    def ==(other)  #:nodoc:
       other != nil and 
 	@language == other.language and @country == other.country and 
 	@charset == other.charset and @script == other.script and 
-	@sort_order == other.sort_order and @modifier == other.modifier and
+	@variant == other.variant and @modifier == other.modifier and
 	@charset == other.charset
     end
 
+    def eql?(other) #:nodoc:
+      self.==(other)
+    end
+
+    def hash #:nodoc:
+      "#{self.class}:#{to_general}.#{@charset}@#{modifier}".hash
+    end
     alias :to_s :to_posix
     alias :to_str :to_posix
   end