gettext 1.10.0 → 1.90.0

data/lib/gettext/mo.rb

@@ -12,7 +12,7 @@
     of Ruby.  License of Ruby is included with Ruby distribution in
     the file "README".
 
-    $Id: mo.rb,v 1.7 2006/06/11 15:36:20 mutoh Exp $
+    $Id: mo.rb,v 1.8 2007/11/10 02:51:21 mutoh Exp $
 =end
 
 require 'gettext/iconv'
@@ -104,7 +104,7 @@ class MOFile < Hash
       io.pos = trans_table_data[i * 2 + 1]
       str = io.read(trans_table_data[i * 2 + 0])
 
-      if original_strings[i] == ""
+      if (! original_strings[i]) || original_strings[i] == ""
         if str
           @charset = nil
           @nplurals = nil
@@ -124,7 +124,7 @@ class MOFile < Hash
       else
         if @output_charset
           begin
-            str = Iconv.iconv(@output_charset, @charset, str).join if @charset
+            str = Iconv.conv(@output_charset, @charset, str) if @charset
           rescue Iconv::Failure
             if $DEBUG
               $stderr.print "@charset = ", @charset, "\n"

data/lib/gettext/parser/erb.rb

@@ -6,7 +6,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: erb.rb,v 1.4 2006/02/22 16:42:41 mutoh Exp $
+  $Id: erb.rb,v 1.5 2007/08/01 01:39:14 mutoh Exp $
 =end
 
 require 'erb'
@@ -15,7 +15,7 @@ require 'gettext/parser/ruby.rb'
 module GetText
   module ErbParser
     @config = {
-      :extnames => ['.rhtml']
+      :extnames => ['.rhtml', '.erb']
     }
 
     module_function

data/lib/gettext/rails.rb

@@ -1,12 +1,12 @@
 =begin
   gettext/rails.rb - GetText for "Ruby on Rails"
 
-  Copyright (C) 2005,2006  Masao Mutoh
+  Copyright (C) 2005-2008  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: rails.rb,v 1.63 2007/07/05 16:55:59 mutoh Exp $
+  $Id: rails.rb,v 1.72 2008/01/29 16:30:29 mutoh Exp $
 =end
 
 require 'gettext/cgi'
@@ -54,20 +54,31 @@ module GetText
     #     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, options = {}, locale = nil, charset = nil, with_model = true)
-      opt = {}
-      if options.kind_of? CGI
-	# For backward compatibility
-	opt.merge!(:cgi => options, :locale => locale, :charset => charset)
-      else
-	opt.merge!(options)
+    def bindtextdomain(domainname, options = {})
+      options[:path] ||= File.join(RAILS_ROOT, "locale")
+      _bindtextdomain(domainname, options)
+    end
+
+    @@available_locales = nil
+    # Returns locales which supported by the application.
+    # This function returns an reversed array of the locale strings under RAILS_ROOT/locale/*.
+    # It is used for restriction such as caching files.
+    def available_locales
+      unless (GetText.cached? and @@available_locales)
+        @@available_locales = (Dir.glob(File.join(RAILS_ROOT, "locale/[a-z]*")).map{|path| File.basename(path)} << "en").uniq.sort.reverse
       end
-      opt[:path] ||= File.join(RAILS_ROOT, "locale")
-      _bindtextdomain(domainname, opt)
+      @@available_locales
+    end
+
+    # Returns a normalized locale which is in available_locales.
+    # * locale: a Locale::Object or nil.
+    def normalized_locale(locale = nil)
+      locale ||= GetText.locale
+      (available_locales &
+        [locale.to_general, locale.to_s, locale.language, Locale.default.language, "en"].uniq)[0]
     end
+
   end
 end
 
@@ -219,15 +230,6 @@ module ActionController #:nodoc:
       textdomain_to(ActionMailer::Base, domainname) if defined? ActionMailer::Base
     end
 
-    # Gets the textdomain name of this controller.
-    # This returns the first textdomain which is bound in app/controller/*.rb.
-    #
-    # *Notice* Deprecated since 1.8.
-    def self.textdomainname
-      textdomain = @@gettext_domainnames[0]
-      textdomain ? textdomain[0] : nil
-    end
-
     # Gets the textdomain name and path of this controller which is set 
     # with init_gettext. *(Since 1.8)*
     # 
@@ -273,7 +275,7 @@ module ActionView #:nodoc:
     # 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 = {})
       locale = GetText.locale
-      [locale.to_general, locale.to_s, locale.language, Locale.default.language].each do |v|
+      [locale.to_general, locale.to_s, locale.language, Locale.default.language].uniq.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
@@ -328,13 +330,10 @@ module ActionView #:nodoc:
 	  @error_message_explanation = [single_msg, plural_msg]
 	end
 
-
+        # 
 	def error_messages_for(instance, objects, object_names, count, options)
           record = ActiveRecord::Base.human_attribute_table_name_for_error(options[:object_name] || object_names[0].to_s)
 
-	  message_title = instance.error_message_title(@error_message_title)
-	  message_explanation = instance.error_message_explanation(@error_message_explanation)
-
           html = {}
           [:id, :class].each do |key|
             if options.include?(key)
@@ -345,36 +344,44 @@ module ActionView #:nodoc:
             end
           end
 
-          header_message = n_(message_title, count) % {:num => count, :record => record}
+          if options[:message_title]
+            header_message = instance.error_message(options[:message_title], count) % {:num => count, :record => record}
+          else
+            header_message = n_(@error_message_title, count) % {:num => count, :record => record}
+          end
+          if options[:message_explanation]
+            message_explanation = instance.error_message(options[:message_explanation], count) % {:num => count}
+          else
+            message_explanation = n_(@error_message_explanation, count) % {:num => count}
+          end
+
           error_messages = objects.map {|object| object.errors.full_messages.map {|msg| instance.content_tag(:li, msg) } }
             
           instance.content_tag(:div,
                             instance.content_tag(options[:header_tag] || :h2, header_message) <<
-                            instance.content_tag(:p, n_(message_explanation, count) % {:num => count}) <<
+                            instance.content_tag(:p, message_explanation) <<
                             instance.content_tag(:ul, error_messages),
                             html
                             )
 	end
       end
 
-      def error_message_title(msg) #:nodoc:
-        if msg
-          [_(msg[0]), _(msg[1])]
-        else
-          nil
-        end
-      end      
-	
-      def error_message_explanation(msg) #:nodoc:
-        if msg
-          [_(msg[0]), _(msg[1])]
-        else
-          nil
-        end
+      def error_message(msg, count) #:nodoc:
+        ngettext(msg, count)
       end
 
       alias error_messages_for_without_localize error_messages_for #:nodoc:
 
+      # error_messages_for overrides original method with localization.
+      # And also it extends to be able to replace the title/explanation of the header of the error dialog. (Since 1.90)
+      # If you want to override these messages in the whole application, 
+      #    use ActionView::Helpers::ActiveRecordHelper::L10n.set_error_message_(title|explanation) instead.
+      # * :message_title - the title of message. Use Nn_() to path the strings for singular/plural.
+      #                       e.g. Nn_("%{num} error prohibited this %{record} from being saved", 
+      # 			       "%{num} errors prohibited this %{record} from being saved")
+      # * :message_explanation - the explanation of message
+      #                       e.g. Nn_("There was a problem with the following field:", 
+      #                                "There were %{num} problems with the following fields:")
       def error_messages_for(*params)
         options = params.last.is_a?(Hash) ? params.pop.symbolize_keys : {}
         objects = params.collect {|object_name| instance_variable_get("@#{object_name}") }.compact
@@ -403,7 +410,7 @@ module ActionView #:nodoc:
 
       def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false)
 	textdomain("rails")
-	
+
 	msg = distance_of_time_in_words_without_locale(from_time, to_time, include_seconds)
 	match = false
 	[NMINUTES, NHOURS, NDAYS, NMONTHS].each do |regexp, nn|
@@ -459,16 +466,30 @@ module ActionController #:nodoc: all
   module Caching
     module Fragments
       def fragment_cache_key_with_gettext(name) 
-        fragment_cache_key_without_gettext(name).gsub('?', '.').gsub(/:/, ".") << "_#{Locale.current}"
+        ret = fragment_cache_key_without_gettext(name)
+        if ret.is_a? String
+          ret.gsub(/:/, ".") << "_#{normalized_locale}"
+        else
+          ret
+        end
       end
       alias_method_chain :fragment_cache_key, :gettext
 
       def expire_fragment_with_gettext(name, options = nil)
         return unless perform_caching
 
-        key = %r{#{fragment_cache_key_without_gettext(name).gsub('?', '.').gsub(/:/, ".")}}
-        self.class.benchmark "Expired fragments matching: #{key.source}" do
-          fragment_cache_store.delete_matched(key, options)
+        key = fragment_cache_key_without_gettext(name)
+        if key.is_a?(Regexp)
+          self.class.benchmark "Expired fragments matching: #{key.source}" do
+            fragment_cache_store.delete_matched(key, options)
+          end
+        else
+          key = key.gsub(/:/, ".")
+          self.class.benchmark "Expired fragment: #{key}, lang = #{available_locales.inspect}" do
+            available_locales.each do |lang|
+              fragment_cache_store.delete("#{key}_#{lang}", options)
+            end
+          end
         end
       end
       alias_method_chain :expire_fragment, :gettext

data/lib/gettext/rgettext.rb

@@ -25,7 +25,7 @@ module GetText
 
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2007/07/02 16:40:18 $)[1]
+    DATE = %w($Date: 2008/01/27 10:58:10 $)[1]
     MAX_LINE_LEN = 70
 
     @ex_parsers = []
@@ -132,7 +132,7 @@ msgstr ""
 
         ary.dup.each do |single_msg|
           if single_msg[0] == key or
-              (single_msg[0] =~ /#{Regexp.quote(key)}\000/ and 
+              (single_msg[0] =~ /^#{Regexp.quote(key)}\000/ and 
                single_msg[0] != plural_msg[0])
             if single_msg[0] != key 
               warn %Q[Warning: n_("#{plural_msg[0].gsub(/\000/, '", "')}") and n_("#{single_msg[0].gsub(/\000/, '", "')}") are duplicated. First msgid was used.] 

data/lib/gettext/rmsgmerge.rb

@@ -394,7 +394,7 @@ module GetText
     
     # constant values
     VERSION = GetText::VERSION
-    DATE = %w($Date: 2006/06/11 15:36:20 $)[1]
+    DATE = %w($Date: 2007/07/21 15:03:05 $)[1]
     
     module_function
 
@@ -459,7 +459,7 @@ module GetText
       
       m = Merger.new
       result = m.merge(defpo, refpot)      
-      pp result if $DEBUG
+      p result if $DEBUG
       print result.generate_po if $DEBUG
       
       begin

data/lib/gettext/string.rb

@@ -34,7 +34,6 @@ class String
   # * Returns: formatted String
   #
   #  (e.g.) "%{firstname}, %{familyname}" % {:firstname => "Masao", :familyname => "Mutoh"}
-  REGEXP_NORMAL = /%\{/  #:nodoc:
   def %(args)
     if args.kind_of?(Hash)
       ret = dup
@@ -43,12 +42,17 @@ class String
       }
       ret
     else
-      ret = gsub(REGEXP_NORMAL, '%%{')
+      ret = gsub(/%\{/, '%%{')
       begin
 	ret._old_format_m(args)
-      rescue ArgumentError
-	$stderr.puts "  The string:#{ret}"
-	$stderr.puts "  args:#{args.inspect}"
+      rescue ArgumentError => e
+        if $DEBUG
+  	   $stderr.puts "  The string:#{ret}"
+	   $stderr.puts "  args:#{args.inspect}"
+           puts e.backtrace
+	else	
+	  raise ArgumentError, e.message
+	end
       end
     end
   end

data/lib/gettext/textdomain.rb

@@ -1,7 +1,7 @@
 =begin
   textdomain.rb - GetText::Textdomain
 
-  Copyright (C) 2001-2006  Masao Mutoh
+  Copyright (C) 2001-2008  Masao Mutoh
   Copyright (C) 2001-2003  Masahiro Sakai
 
       Masahiro Sakai    <s01397ms@sfc.keio.ac.jp>
@@ -10,7 +10,7 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: textdomain.rb,v 1.22 2007/07/02 16:40:18 mutoh Exp $
+  $Id: textdomain.rb,v 1.23 2008/01/19 17:07:02 mutoh Exp $
 =end
 
 require 'gettext/string'
@@ -202,7 +202,7 @@ module GetText
     private
     def load_mo(reload = false)
       @current_mo = nil
-      return @current_mo unless @current_locale
+      return nil unless @current_locale
       unless reload
 	@current_mo = @mofiles[@current_locale]
 	if @current_mo

data/lib/gettext/textdomainmanager.rb

@@ -6,10 +6,10 @@
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: textdomainmanager.rb,v 1.2 2006/06/11 15:36:20 mutoh Exp $
+  $Id: textdomainmanager.rb,v 1.6 2008/01/29 16:30:29 mutoh Exp $
 =end
 
-require 'gettext/locale'
+require 'locale'
 require 'gettext/textdomain'
 
 module GetText
@@ -18,7 +18,7 @@ module GetText
   class TextDomainManager
     include Enumerable
 
-    attr_reader :target
+    attr_reader :target, :textdomains
 
     @@output_charset = ENV["OUTPUT_CHARSET"]
     @@textdomain_all = {}
@@ -33,7 +33,7 @@ module GetText
     # Gets the current output_charset.
     # * Returns: output_charset.
     def self.output_charset
-      @@output_charset
+      @@output_charset 
     end
 
     def self.each_all
@@ -93,7 +93,7 @@ module GetText
     def set_locale(locale, force = false)
       if locale != @locale or force
 	each do |textdomain|
-	  textdomain.set_locale(locale)
+	  textdomain.set_locale(locale, force)
 	end
 	@locale = locale
       end

data/lib/gettext/utils.rb

@@ -23,7 +23,7 @@ module GetText
 
   # Merges two Uniforum style .po files together. 
   #
-  # *Note* "msgmerge" tool is included in GNU GetText. So you need to install GNU GetText. 
+  # *Note* This function requires "msgmerge" tool included in GNU GetText. So you need to install GNU GetText. 
   #
   # The def.po file is an existing PO file with translations which will be taken 
   # over to the newly created file as long as they still match; comments will be preserved,
@@ -56,8 +56,9 @@ module GetText
     if cont.empty?
       failed_filename = refpo + "~"
       FileUtils.cp(refpo, failed_filename)
-      $stderr.puts _("Failed to merge with %{defpo} - skipping!") % {:defpo => defpo}
-      $stderr.puts _("Please check new .pot in %{failed_filename}") %{:failed_filename => failed_filename}
+      $stderr.puts _("Failed to merge with %{defpo}") % {:defpo => defpo}
+      $stderr.puts _("New .pot was copied to %{failed_filename}") %{:failed_filename => failed_filename}
+      raise _("`#{cmd}' may not be found. \nInstall GNU Gettext then set PATH or MSGMERGE_PATH correctly.")
     else
       cont.sub!(/(Project-Id-Version\:).*$/, "\\1 #{app_version}\\n\"")
       File.open(defpo, "w") do |out|

data/lib/gettext/version.rb

@@ -8,5 +8,5 @@
   license terms as Ruby.
 =end
 module GetText
-  VERSION = "1.10.0"
+  VERSION = "1.90.0"
 end

data/lib/{gettext/locale.rb → locale.rb}

@@ -1,62 +1,31 @@
 =begin
   locale.rb - Locale module
 
-  Copyright (C) 2002-2006  Masao Mutoh
+  Copyright (C) 2002-2007  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
-  $Id: locale.rb,v 1.13 2006/12/03 16:26:59 mutoh Exp $
+  $Id: locale.rb,v 1.2 2007/11/08 16:44:22 mutoh Exp $
 =end
 
-require 'gettext/locale_object'
-
-begin
-  require 'locale_system'
-rescue LoadError
-  # This is used for installation process(from rake only)
-  # And deprecated these constants.
-  module Locale
-    # Deprecated.
-    CTYPE = 0
-    # Deprecated.
-    NUMERIC = 1
-    # Deprecated.
-    TIME = 2
-    # Deprecated.
-    COLLATE = 3
-    # Deprecated.
-    MONETARY = 4
-    # Deprecated.
-    MESSAGES = 5
-    # Deprecated.
-    ALL = 6
-  end
-end
+require 'locale/object'
 
 if /cygwin|mingw|win32/ =~ RUBY_PLATFORM
-  require 'gettext/locale_win32'
+  require 'locale/win32'
+elsif /java/ =~ RUBY_PLATFORM
+  require 'locale/jruby'
 else
-  require 'gettext/locale_posix'
+  require 'locale/posix'
 end
 
 # Locale module manages the locale informations of the application.
 module Locale
-  unless defined? CTYPE
-    CTYPE = 0    #:nodoc:
-    NUMERIC = 1  #:nodoc:
-    TIME = 2     #:nodoc:
-    COLLATE = 3  #:nodoc:
-    MONETARY = 4 #:nodoc:
-    MESSAGES = 5 #:nodoc:
-    ALL = 6      #:nodoc:
-  end
-
   @@default = nil
   @@current = nil
 
   module_function
-  # Sets the default locale (Locale::Object or String(such as ja_JP.eucjP)).
+  # Sets the default locale (Locale::Object or String(such as ja_JP.eucJP)).
   #
   # * locale: the default locale
   # * Returns: self.
@@ -67,7 +36,7 @@ module Locale
       else
         @@default = Locale::Object.new(locale)
       end
-      @@default.charset ||= @@locale_system_module.get_charset(@@default)
+      @@default.charset ||= @@locale_system_module.charset
     else
       @@default = nil
     end
@@ -127,7 +96,7 @@ module Locale
       else
 	@@current = Locale::Object.new(lang, country, charset)
       end
-      @@current.charset ||= @@locale_system_module.get_charset(@@current)
+      @@current.charset ||= @@locale_system_module.charset
     end
     self
   end
@@ -158,14 +127,6 @@ module Locale
   #
   # *Notice*: Locale.set(lctype, locale) is deprecated.
   def set(lang, country = nil, charset = nil)
-    if lang.kind_of? Numeric
-      warn "Locale.set(lctype, locale) is deprecated. Use Locale.set(locale) instead." 
-      # Locale.set(Locale::CTYPE, "ja_JP.eucJP") "country" means locale.
-      lang = country
-      country = nil
-      charset = nil
-    end
-
     set_current(nil)
     if lang.kind_of? String
       set_default(Locale::Object.new(lang, country, charset))
@@ -180,23 +141,15 @@ module Locale
   # call-seq:
   #   current
   #   get
-  #   get(lctype = nil)  (Deprecated)
   #
   # * Returns: the current locale (Locale::Object).
   #
   # *Notice*: lctype is deprecated. Use this with no parameter instead.
-  def get(lctype = nil)
-    warn "Locale.get(lctype) is deprecated. Use Locale.get (noparam) instead." if lctype
+  def get
     @@current = default unless @@current
     @@current
   end
 
-  # *Deprecated*. Use Locale.set or Locale.set_current instead.
-  def setlocale(lctype, loc)
-    warn "Deprecated. Use Locale#set instead."
-    set(lctype, loc)
-  end
-
   # Same as charset. Gets the charset of the current locale.
   # * Returns: the charset of the current locale (String)
   def codeset