gettext 1.5.0-mswin32 → 1.6.0-mswin32

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.33 2006/05/06 14:59:08 mutoh Exp $
+  $Id: rails.rb,v 1.36 2006/06/04 14:43:37 mutoh Exp $
 =end
 
 require 'gettext/cgi'
@@ -22,12 +22,15 @@ module GetText #:nodoc:
   # See <Ruby-GetText-Package HOWTO for Ruby on Rails (http://www.yotabanana.com/hiki/ruby-gettext-howto-rails.html>.
   module Rails
     include GetText
-    extend GetText
 
     Rails = ::Rails  #:nodoc:
 
     alias :_bindtextdomain :bindtextdomain #:nodoc:
 
+    def self.included(mod)  #:nodoc:
+      mod.extend self
+    end
+
     module_function
     # Bind a textdomain(#{path}/#{locale}/LC_MESSAGES/#{domainname}.mo) to your program. 
     # Notes the textdomain scope becomes all of the controllers/views/models in your app. 
@@ -39,58 +42,44 @@ module GetText #:nodoc:
     # On the other hand, you need to call this in helpers/plugins.
     #
     # * domainname: the textdomain name.
-    # * locale: the locale value such as "ja-JP". When the value is nil, 
-    # * charset: the charset. Generally UTF-8 is recommanded.
-    # * with_model: false if you want to ignore model support.
+    # * options: options as a Hash.
+    #    * :locale - the locale value such as "ja-JP". When the value is nil, 
+    #                locale is searched the order by this value > "lang" value of QUERY_STRING > 
+    #                params["lang"] > "lang" value of Cookie > HTTP_ACCEPT_LANGUAGE value 
+    #                > Default locale(en). 
+    #    * :path - the path to the mo-files. Default is "RAIL_ROOT/locale".
+    #    * :charset - the charset. Generally UTF-8 is recommanded.
+    #                 And the charset is set order by "the argument of bindtextdomain" 
+    #                 > HTTP_ACCEPT_CHARSET > Default charset(UTF-8).
+    #    * :with_model - false if you want to ignore ActiveRecord support.
+    #    * :with_helper - false if you want to ignore ApplicationHelper support.
     #
-    # locale is searched the order by this value > "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).
+    # Note: Don't use locale, charset, with_model argument(not in options). 
+    # They are remained for backward compatibility.
     #
-    def bindtextdomain(domainname, _cgi = nil, locale = nil, charset = nil, with_model = true)
+    def bindtextdomain(domainname, options = {}, locale = nil, charset = nil, with_model = true)
+      opt = {:with_helper => true, :with_model => true}
+      if options.kind_of? CGI
+	# For backward compatibility
+	opt.merge!(:cgi => options, :locale => locale, :charset => charset, :with_model => with_model)
+      else
+	opt.merge!(options)
+      end
+      opt[:path] ||= File.join(RAILS_ROOT, "locale")
       Locale.set_current(nil)  # IMPORTANT! current locale should be nil once(default is used).
-      set_cgi(_cgi) if _cgi
-      @gettext_container_domainname = domainname
-      path = File.join(RAILS_ROOT, "locale")
-      _bindtextdomain(domainname, path, locale, charset)
-
-      bindtextdomain_to(ActiveRecord::Base, domainname) if with_model
+      set_cgi(opt[:cgi]) if opt[:cgi]
+      ret = _bindtextdomain(domainname, opt)
+      bindtextdomain_to(ActiveRecord::Base, domainname) if opt[:with_model]
+      bindtextdomain_to(ApplicationHelper, domainname) if opt[:with_helper]
+      ret
     end
 
     def bindtextdomain_to(klass, domainname) #:nodoc:
       klass.class_eval {
+	include GetText
 	textdomain(domainname)
-	def self.human_attribute_name(attribute_key_name) #:nodoc:
-	  s_("#{self}|#{attribute_key_name.humanize}")
-	end
-	def self.human_attribute_table_name_for_error(table_name) #:nodoc:
-	  _(table_name.gsub(/_/, " "))
-	end
       }
     end
-
-    def callersrc  #:nodoc:
-      @gettext_container_domainname = nil unless defined? @gettext_container_domainname
-      @gettext_container_domainname
-    end
-
-    # true to use localized templates such as list.rhtml, list_ja.rhtml, list_ja_JP.rhtml.
-    # * setting: true if localized, otherwise false. Default is true.
-    # * Returns: setting
-    def use_localized_templates(setting)
-      @@gettext_use_localized_templates = setting
-    end
-
-    # true if it use localized templates. See GetText::Rails.use_localized_templates 
-    # for more details.
-    # * Returns: true or false.
-    def use_localized_templates?
-      if defined? @@gettext_use_localized_templates
-	@@gettext_use_localized_templates 
-      else
-	true
-      end
-    end
   end
 end
 
@@ -99,7 +88,6 @@ module ActionController #:nodoc:
   class Base
     helper GetText::Rails
     include GetText::Rails
-    extend GetText::Rails
 
     @@gettext_domainname = nil
     @@gettext_content_type = nil
@@ -111,9 +99,9 @@ module ActionController #:nodoc:
       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.
+	bindtextdomain(@@gettext_domainname, {:cgi => cgi_})  #You need to pass CGI object first.
       else
-	bindtextdomain(@@gettext_domainname, nil, @params["lang"])
+	bindtextdomain(@@gettext_domainname, {:locale => @params["lang"]})
       end
     end
 
@@ -131,19 +119,23 @@ module ActionController #:nodoc:
       ActiveRecord::Errors.class_eval{
 	# You need to call bindtextdomain here because ActiveRecord::Errors doesn't know
 	# what locale is used in.
-	GetText.bindtextdomain("rails")
+	bindtextdomain("rails")
       }
     end
     
     # Bind a 'textdomain' to all of the controllers/views/models. Call this instead of GetText.bindtextdomain.
     # * textdomain: the textdomain
-    # * charset: the output charset. Default is "UTF-8"
-    # * content_type: the content type. Default is "text/html"
+    # * options: options as a Hash.
+    #    * :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).
     #
+    # Note: Don't use content_type argument(not in options). 
+    # They are remained for backward compatibility.
+    #
     # If you want to separate the textdomain each controllers, you need to call this function in the each controllers.
     #
     # app/controller/blog_controller.rb:
@@ -154,10 +146,15 @@ module ActionController #:nodoc:
     #      :
     #      :
     #    end
-    def self.init_gettext(domainname, charset = "UTF-8", content_type = "text/html")
-      GetText.output_charset = charset
+    def self.init_gettext(domainname, options = {}, content_type = "text/html")
+      opt = {:charset => "UTF-8", :content_type => content_type}
+      if options.kind_of? String
+	# For backward compatibility
+	opt.merge!(:charset => options, :content_type => content_type)
+      end
+      GetText.output_charset = opt[:charset]
       @@gettext_domainname = domainname
-      @@gettext_content_type = content_type
+      @@gettext_content_type = opt[:content_type]
     end
   end
 
@@ -183,8 +180,13 @@ module ActiveRecord #:nodoc:
   end
   
   class Base
-    include GetText::Rails  # Important
-    extend GetText::Rails   # Important
+    def self.human_attribute_name(attribute_key_name) #:nodoc:
+      s_("#{self}|#{attribute_key_name.humanize}")
+    end
+
+    def self.human_attribute_table_name_for_error(table_name) #:nodoc:
+      _(table_name.gsub(/_/, " "))
+    end
 
     @@error_message_title = nil
     @@error_message_explanation = nil
@@ -205,6 +207,19 @@ module ActiveRecord #:nodoc:
       @@error_message_title = [single_msg, plural_msg]
     end
 
+    # Very ugly but...
+    @@custom_error_messages_d = {}
+    def self.validates_length_of(*attrs)  #:nodoc:
+      if attrs.last.is_a?(Hash)
+        msg = attrs.last[:message] 
+        @@custom_error_messages_d[msg] = /#{Regexp.escape(msg).sub(/%d/, '(\d+)')}/ if msg
+      end
+      validates_size_of(*attrs)
+    end
+    def custom_error_messages_d  #:nodoc:
+      @@custom_error_messages_d
+    end
+
     def self.columns
       unless @columns
 	@columns = connection.columns(table_name, "#{name} Columns")
@@ -254,7 +269,6 @@ module ActiveRecord #:nodoc:
   
   class Errors #:nodoc:
     include GetText
-    extend GetText
     
     RE_FIELD_NAME = /%\{fn\}/  #:nodoc:
     
@@ -274,34 +288,39 @@ module ActiveRecord #:nodoc:
 				  :not_a_number => N_("%{fn} is not a number")
 				  )
     @@default_error_messages_d = {
-      :too_long => /#{Regexp.escape(default_error_messages[:too_long]).sub(/%d/, '(\d+)')}/,
-      :too_short => /#{Regexp.escape(default_error_messages[:too_short]).sub(/%d/, '(\d+)')}/,
-      :wrong_length => /#{Regexp.escape(default_error_messages[:wrong_length]).sub(/%d/, '(\d+)')}/,
+      default_error_messages[:too_long] => /#{Regexp.escape(default_error_messages[:too_long]).sub(/%d/, '(\d+)')}/,
+      default_error_messages[:too_short] =>/#{Regexp.escape(default_error_messages[:too_short]).sub(/%d/, '(\d+)')}/,
+      default_error_messages[:wrong_length] =>/#{Regexp.escape(default_error_messages[:wrong_length]).sub(/%d/, '(\d+)')}/,
     }
+    cattr_accessor :default_error_messages_d
 
     def full_messages #:nodoc:
       full_messages = []
       @errors.each_key do |attr|
-	@errors[attr].each do |msg|
-	  next if msg.nil?
-	  #Ugly but... :-<
-	  @@default_error_messages_d.each do |key, regexp|
-	    if regexp =~ msg
-	      msg = _(default_error_messages[key]) % $1.to_i
-	      break
-	    end
-	  end
-	  custom_msg = @base.gettext(msg)
-	  custom_msg = _(msg) if custom_msg == msg 
-
-	  if attr == "base"
-	    full_messages << custom_msg
-	  elsif  RE_FIELD_NAME =~ msg
-	    full_messages << custom_msg % {:fn => @base.class.human_attribute_name(attr)}
-	  else
-	    full_messages << @base.class.human_attribute_name(attr) + " " + custom_msg
-	  end
-	end
+        @errors[attr].each do |msg|
+          next if msg.nil?
+          custom_msg = nil
+          #Ugly but... :-<
+          @@default_error_messages_d.merge(@base.custom_error_messages_d).each do |key, regexp|
+            if regexp =~ msg
+              custom_msg = @base.gettext(key)
+              custom_msg = _(msg) if custom_msg == msg 
+	            custom_msg = _(custom_msg) % $1.to_i
+	            break
+            end
+          end
+          unless custom_msg
+            custom_msg = @base.gettext(msg)
+            custom_msg = _(msg) if custom_msg == msg 
+          end
+          if attr == "base"
+            full_messages << custom_msg
+          elsif  RE_FIELD_NAME =~ custom_msg
+            full_messages << custom_msg % {:fn => @base.class.human_attribute_name(attr)}
+          else
+            full_messages << @base.class.human_attribute_name(attr) + " " + custom_msg
+          end
+        end
       end
       full_messages
     end
@@ -315,12 +334,10 @@ module ActionView #:nodoc:
     # This provides to find localized template files such as foo_ja.rhtml, foo_ja_JP.rhtml
     # instead of foo.rhtml. If the file isn't found, foo.rhtml is used.
     def render_file(template_path, use_full_path = true, local_assigns = {})
-      if GetText::Rails.use_localized_templates?
-	locale = GetText.locale
-	[locale.to_general, locale.to_s, locale.language, Locale.default.language].each do |v|
-	  localized_path = "#{template_path}_#{v}"
-	  return render_file_without_locale(localized_path, use_full_path, local_assigns) if file_exists? localized_path
-	end
+      locale = GetText.locale
+      [locale.to_general, locale.to_s, locale.language, Locale.default.language].each do |v|
+	localized_path = "#{template_path}_#{v}"
+	return render_file_without_locale(localized_path, use_full_path, local_assigns) if file_exists? localized_path
       end
       render_file_without_locale(template_path, use_full_path, local_assigns)
     end
@@ -375,36 +392,38 @@ module ActionView #:nodoc:
   end
 end
 
-module ActionMailer #:nodoc:
-  class Base #:nodoc:
-    helper GetText::Rails 
-    include GetText::Rails 
-    extend GetText::Rails
-
-    alias :_create! :create! #:nodoc:
-
-    def base64(text, charset="iso-2022-jp", convert=true)
-      if convert
-        if charset == "iso-2022-jp"
-          text = NKF.nkf('-j -m0', text)
-        end
-      end
-      text = TMail::Base64.folding_encode(text)
-      "=?#{charset}?B?#{text}?="
-    end
-
-    def create!(*arg) #:nodoc:
-      _create!(*arg)
-      if Locale.get.language == "ja"
-        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)
+if defined? ActionMailer
+  module ActionMailer #:nodoc:
+    class Base #:nodoc:
+      helper GetText::Rails
+      include GetText::Rails 
+      extend GetText::Rails
+      
+      alias :_create! :create! #:nodoc:
+      
+      def base64(text, charset="iso-2022-jp", convert=true)
+	if convert
+	  if charset == "iso-2022-jp"
+	    text = NKF.nkf('-j -m0', text)
         end
+	end
+	text = TMail::Base64.folding_encode(text)
+	"=?#{charset}?B?#{text}?="
       end
+      
+      def create!(*arg) #:nodoc:
+	_create!(*arg)
+	if Locale.get.language == "ja"
+	  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
     end
   end
 end

data/lib/gettext/rgettext.rb

@@ -14,6 +14,7 @@
 
 require 'optparse'
 require 'gettext'
+require 'rbconfig'
 
 module GetText
 
@@ -24,7 +25,7 @@ module GetText
 
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2006/02/22 16:42:41 $)[1]
+    DATE = %w($Date: 2006/06/04 15:07:34 $)[1]
     MAX_LINE_LEN = 70
 
     @ex_parsers = []
@@ -142,6 +143,7 @@ msgstr ""
 
       opts.on_tail("--version", _("display version information and exit")) do
 	puts "#{$0} #{VERSION} (#{DATE})"
+	puts "#{File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
 	exit
       end
 

data/lib/gettext/rmsgfmt.rb

@@ -11,6 +11,7 @@ require 'optparse'
 require 'fileutils'
 require 'gettext'
 require 'gettext/poparser'
+require 'rbconfig'
 
 module GetText
   GetText.bindtextdomain("rgettext")
@@ -19,7 +20,7 @@ module GetText
     extend GetText 
 
     VERSION = GetText::VERSION 
-    DATE = %w($Date: 2006/02/22 16:42:41 $)[1] # :nodoc:
+    DATE = %w($Date: 2006/06/04 15:07:34 $)[1] # :nodoc:
     
     module_function
     def run(targetfile = nil, output_path = nil) # :nodoc:
@@ -55,6 +56,7 @@ module GetText
 
       opts.on_tail("--version", _("display version information and exit")) do
 	puts "#{$0} #{VERSION} (#{DATE})"
+	puts "#{File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
 	exit
       end
       opts.parse!(ARGV)

data/lib/gettext/rmsgmerge.rb

@@ -11,6 +11,7 @@
 require 'optparse'
 require 'gettext'
 require 'gettext/poparser'
+require 'rbconfig'
 
 module GetText
     
@@ -393,7 +394,7 @@ module GetText
     
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2006/02/23 14:53:59 $)[1]
+    DATE = %w($Date: 2006/06/04 15:07:34 $)[1]
     
     module_function
 
@@ -419,6 +420,7 @@ module GetText
       
       opts.on_tail("--version", _("display version information and exit")) do
         puts "#{$0} #{VERSION} (#{DATE})"
+	puts "#{File.join(::Config::CONFIG["bindir"], ::Config::CONFIG["RUBY_INSTALL_NAME"])} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
         exit
       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.16 2006/04/29 17:17:15 mutoh Exp $
+  $Id: textdomain.rb,v 1.17 2006/06/04 14:43:37 mutoh Exp $
 =end
 
 require 'gettext/string'
@@ -27,7 +27,9 @@ module GetText
     GEM_PATH_RE = /(.*)\/lib$/  # :nodoc:
 
     attr_reader :current_locale
+    attr_reader :locale_paths
     attr_reader :current_mo
+    attr_reader :name
 
     @@check_mo = false
     # Check mo-file is modified or not, and if mo-file is modified,
@@ -46,10 +48,12 @@ module GetText
       @@check_mo = val
     end
     # The default locale paths.
+    CONFIG_PREFIX = Config::CONFIG['prefix'].gsub(/\/local/, "")
     DEFAULT_LOCALE_PATHS = [
       "#{Config::CONFIG['datadir']}/locale/%{locale}/LC_MESSAGES/%{name}.mo",
-      "#{Config::CONFIG['prefix']}/share/locale/%{locale}/LC_MESSAGES/%{name}.mo",
-      "#{Config::CONFIG['prefix']}/local/share/locale/%{locale}/LC_MESSAGES/%{name}.mo"
+      "#{Config::CONFIG['datadir'].gsub(/\/local/, "")}/locale/%{locale}/LC_MESSAGES/%{name}.mo",
+      "#{CONFIG_PREFIX}/share/locale/%{locale}/LC_MESSAGES/%{name}.mo",
+      "#{CONFIG_PREFIX}/local/share/locale/%{locale}/LC_MESSAGES/%{name}.mo"
     ].uniq
 
     # Add default locale path. Usually you should use GetText.add_default_locale_path instead.
@@ -109,13 +113,13 @@ module GetText
 
     # Gets the translated string.
     # * msgid: the original message.
-    # * Returns: the translated string.
+    # * Returns: the translated string or nil if not found.
     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
-        msgid
+        nil
       end
     end
 
@@ -123,11 +127,13 @@ module GetText
     # * msgid: the original message(single).
     # * msgid: the original message(plural).
     # * n: the number
-    # * Returns: the translated string.
+    # * Returns: the translated string or nil if not found.
     def ngettext(msgid, msgid_plural, n)
       key = msgid + "\000" + msgid_plural
       msg = gettext(key)
-      if msg == key
+      if ! msg
+	nil
+      elsif msg == key
 	msg = n == 1 ? msgid : msgid_plural
       elsif msg.include?("\000")
         ary = msg.split("\000")
@@ -172,7 +178,7 @@ module GetText
 	  end
 	end
       end
-      locales = [@current_locale.orig_str, @current_locale.to_posix, @current_locale.language]
+      locales = [@current_locale.orig_str, @current_locale.to_posix, @current_locale.language].uniq
       @locale_paths.each do |dir|
 	locales.each{|locale|
 	  fname = dir % {:locale => locale, :name => @name}