gettext 2.1.0 → 2.2.0

data/lib/gettext/cgi.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 =begin
   gettext/cgi.rb - GetText for CGI
 

data/lib/gettext/core_ext/iconv.rb

@@ -18,12 +18,12 @@ begin
   require 'iconv.so'
 rescue LoadError
   # Pseudo Iconv class
-  # 
+  #
   # ==== For Matz Ruby:
-  # If you don't have iconv but Ruby/GLib2, this library uses Ruby/GLib2's 
+  # If you don't have iconv but Ruby/GLib2, this library uses Ruby/GLib2's
   # iconv functions.
   #
-  # Ruby/GLib is a module which is provided from Ruby-GNOME2 Project. 
+  # Ruby/GLib is a module which is provided from Ruby-GNOME2 Project.
   # You can get binaries for Win32(One-Click Ruby Installer).
   # <URL: http://ruby-gnome2.sourceforge.jp/>
   # ==== For JRuby:
@@ -47,16 +47,16 @@ rescue LoadError
     else
       begin
         require 'glib2'
-      
+
         def self.check_glib_version?(major, minor, micro) # :nodoc:
           (GLib::BINDING_VERSION[0] > major ||
-           (GLib::BINDING_VERSION[0] == major && 
+           (GLib::BINDING_VERSION[0] == major &&
             GLib::BINDING_VERSION[1] > minor) ||
-           (GLib::BINDING_VERSION[0] == major && 
+           (GLib::BINDING_VERSION[0] == major &&
             GLib::BINDING_VERSION[1] == minor &&
             GLib::BINDING_VERSION[2] >= micro))
         end
-        
+
         if check_glib_version?(0, 11, 0)
           # This is a function equivalent of Iconv.iconv.
           # * to: encoding name for destination

data/lib/gettext/core_ext/string.rb

@@ -1,19 +1,21 @@
+# encoding: utf-8
+
 =begin
   string.rb - Extension for String.
 
   Copyright (C) 2005-2009 Masao Mutoh
- 
+
   You may redistribute it and/or modify it under the same
   license terms as Ruby or LGPL.
 =end
 
 # Extension for String class. This feature is included in Ruby 1.9 or later but not occur TypeError.
 #
-# String#% method which accept "named argument". The translator can know 
+# String#% method which accept "named argument". The translator can know
 # the meaning of the msgids using "named argument" instead of %s/%d style.
 class String
 
-  unless instance_methods.find {|m| m.to_s == 'bytesize'} 
+  unless instance_methods.find {|m| m.to_s == 'bytesize'}
     # For older ruby (such as ruby-1.8.5)
     alias :bytesize :size
   end
@@ -30,9 +32,9 @@ class String
   #  %(arg)
   #  %(hash)
   #
-  # Format - Uses str as a format specification, and returns the result of applying it to arg. 
-  # If the format specification contains more than one substitution, then arg must be 
-  # an Array containing the values to be substituted. See Kernel::sprintf for details of the 
+  # Format - Uses str as a format specification, and returns the result of applying it to arg.
+  # If the format specification contains more than one substitution, then arg must be
+  # an Array containing the values to be substituted. See Kernel::sprintf for details of the
   # format string. This is the default behavior of the String class.
   # * arg: an Array or other class except Hash.
   # * Returns: formatted String

data/lib/gettext/parser/erb.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 warn "DEPRECATED: Use 'gettext/tools/parser/erb' instead."
 
 require 'gettext/tools/parser/erb'

data/lib/gettext/parser/glade.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 warn "DEPRECATED: Use 'gettext/tools/parser/glade' instead."
 
 require 'gettext/tools/parser/glade'

data/lib/gettext/parser/ruby.rb

@@ -5,7 +5,7 @@
   Copyright (C) 2003-2005  Masao Mutoh
   Copyright (C) 2005       speakillof
   Copyright (C) 2001,2002  Yasushi Shoji, Masao Mutoh
- 
+
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
 
@@ -22,13 +22,13 @@ class RubyLexX < RubyLex  # :nodoc: all
       s = get_readed
       if RubyToken::TkSTRING === tk
         def tk.value
-          @value 
+          @value
         end
-        
+
         def tk.value=(s)
           @value = s
         end
-        
+
         if @here_header
           s = s.sub(/\A.*?\n/, '').sub(/^.*\n\Z/, '')
         else
@@ -38,10 +38,10 @@ class RubyLexX < RubyLex  # :nodoc: all
             # Do nothing.
           end
         end
-        
+
         tk.value = s
       end
-      
+
       if $DEBUG
         if tk.is_a? TkSTRING
           $stderr.puts("#{tk}: #{tk.value}")
@@ -51,7 +51,7 @@ class RubyLexX < RubyLex  # :nodoc: all
           $stderr.puts(tk)
         end
       end
-      
+
       yield tk
     end
     return nil
@@ -62,7 +62,7 @@ end
 module GetText
   module RubyParser
     extend self
-    
+
     unless defined? ID
       ID = ['gettext', '_', 'N_', 'sgettext', 's_']
       PLURAL_ID = ['ngettext', 'n_', 'Nn_', 'ns_', 'nsgettext']
@@ -154,7 +154,7 @@ module GetText
     def target?(file)  # :nodoc:
       true # always true, as default parser.
     end
-  end 
+  end
 end
 
 
@@ -164,9 +164,9 @@ if __FILE__ == $0
   ARGV.each do |file|
     pp GetText::RubyParser.parse(file)
   end
-  
-  #rl = RubyLexX.new; rl.set_input(ARGF)  
+
+  #rl = RubyLexX.new; rl.set_input(ARGF)
   #rl.parse do |tk|
     #p tk
-  #end  
+  #end
 end

data/lib/gettext/runtime/class_info.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'locale/util/memoizable'
 
 module GetText
@@ -12,7 +14,7 @@ module GetText
     # klass should kind of the class, not object.
     def normalize_class(klass)
       ret = (klass.kind_of? Module) ? klass : klass.class
-      if ret.name =~ /^\#<|^$/ or ret == GetText
+      if ret.name =~ /^\#<|^$/ or ret == GetText or ret.name.nil?
         ret = Object
       end
       ret
@@ -47,13 +49,13 @@ module GetText
       end
 
       if all_classes.size > 0
-        (ret & all_classes).uniq 
+        (ret & all_classes).uniq
       else
         ret.uniq
       end
     end
 
-    # Returns the classes which related to klass 
+    # Returns the classes which related to klass
     # (klass's ancestors, included modules and nested modules)
     def related_classes(klass, all_classes = [])
       ret = related_classes_internal(klass, all_classes)

data/lib/gettext/runtime/locale_path.rb

@@ -1,7 +1,9 @@
+# encoding: utf-8
+
 =begin
   locale_path.rb - GetText::LocalePath
 
-  Copyright (C) 2001-2009  Masao Mutoh
+  Copyright (C) 2001-2010  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby or LGPL.
@@ -17,12 +19,12 @@ module GetText
     include Locale::Util::Memoizable
 
     # The default locale paths.
-    CONFIG_PREFIX = Config::CONFIG['prefix'].gsub(/\/local/, "")
+    CONFIG_PREFIX = RbConfig::CONFIG['prefix'].gsub(/\/local/, "")
     DEFAULT_RULES = [
                      "./locale/%{lang}/LC_MESSAGES/%{name}.mo",
                      "./locale/%{lang}/%{name}.mo",
-                     "#{Config::CONFIG['datadir']}/locale/%{lang}/LC_MESSAGES/%{name}.mo",
-                     "#{Config::CONFIG['datadir'].gsub(/\/local/, "")}/locale/%{lang}/LC_MESSAGES/%{name}.mo",
+                     "#{RbConfig::CONFIG['datadir']}/locale/%{lang}/LC_MESSAGES/%{name}.mo",
+                     "#{RbConfig::CONFIG['datadir'].gsub(/\/local/, "")}/locale/%{lang}/LC_MESSAGES/%{name}.mo",
                      "#{CONFIG_PREFIX}/share/locale/%{lang}/LC_MESSAGES/%{name}.mo",
                      "#{CONFIG_PREFIX}/local/share/locale/%{lang}/LC_MESSAGES/%{name}.mo"
                     ].uniq
@@ -37,33 +39,29 @@ module GetText
       def add_default_rule(path)
         DEFAULT_RULES.unshift(path)
       end
-      
-      # Returns path rules as an Array. 
-      # (e.g.) ["/usr/share/locale/%{lang}/LC_MESSAGES/%{name}.mo", ...] 
-      def default_path_rules 
+
+      # Returns path rules as an Array.
+      # (e.g.) ["/usr/share/locale/%{lang}/LC_MESSAGES/%{name}.mo", ...]
+      def default_path_rules
         default_path_rules = []
 
         if ENV["GETTEXT_PATH"]
-          ENV["GETTEXT_PATH"].split(/,/).each {|i| 
-            default_path_rules = ["#{i}/%{lang}/LC_MESSAGES/%{name}.mo", "#{i}/%{lang}/%{name}.mo"]
+          ENV["GETTEXT_PATH"].split(/,/).each {|i|
+            default_path_rules += ["#{i}/%{lang}/LC_MESSAGES/%{name}.mo", "#{i}/%{lang}/%{name}.mo"]
           }
         end
-        
         default_path_rules += DEFAULT_RULES
-        
-        load_path = $LOAD_PATH
-        if defined? ::Gem
-          load_path += Gem.all_load_paths
-        end
+
+        load_path = $LOAD_PATH.dup
         load_path.map!{|v| v.match(/(.*?)(\/lib)*?$/); $1}
         load_path.each {|path|
           default_path_rules += [
-                                 "#{path}/data/locale/%{lang}/LC_MESSAGES/%{name}.mo", 
-                                 "#{path}/data/locale/%{lang}/%{name}.mo", 
+                                 "#{path}/data/locale/%{lang}/LC_MESSAGES/%{name}.mo",
+                                 "#{path}/data/locale/%{lang}/%{name}.mo",
                                  "#{path}/locale/%{lang}/%{name}.mo"]
         }
         # paths existed only.
-        default_path_rules = default_path_rules.select{|path| 
+        default_path_rules = default_path_rules.select{|path|
           Dir.glob(path % {:lang => "*", :name => "*"}).size > 0}.uniq
         default_path_rules
       end
@@ -77,7 +75,7 @@ module GetText
     # * topdir: the locale path ("%{topdir}/%{lang}/LC_MESSAGES/%{name}.mo") or nil.
     def initialize(name, topdir = nil)
       @name = name
-      
+
       if topdir
         path_rules = ["#{topdir}/%{lang}/LC_MESSAGES/%{name}.mo", "#{topdir}/%{lang}/%{name}.mo"]
       else
@@ -89,7 +87,7 @@ module GetText
         this_path_rules = rule % {:lang => "([^\/]+)", :name => name}
         Dir.glob(rule %{:lang => "*", :name => name}).each do |path|
           if /#{this_path_rules}/ =~ path
-            @locale_paths[$1] = path unless @locale_paths[$1]
+            @locale_paths[$1] = path.untaint unless @locale_paths[$1]
           end
         end
       end
@@ -117,6 +115,6 @@ module GetText
       nil
     end
     memoize :current_path
-    
+
   end
 end

data/lib/gettext/runtime/mofile.rb

@@ -1,6 +1,9 @@
+# encoding: utf-8
+
 =begin
     mofile.rb - A simple class for operating GNU MO file.
 
+    Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
     Copyright (C) 2003-2009  Masao Mutoh
     Copyright (C) 2002  Masahiro Sakai, Masao Mutoh
     Copyright (C) 2001  Masahiro Sakai
@@ -14,11 +17,10 @@
 
 =end
 
-require 'gettext/core_ext/iconv'
 require 'stringio'
 
 module GetText
-  class MOFile < Hash 
+  class MOFile < Hash
     class InvalidFormat < RuntimeError; end;
 
     attr_reader :filename
@@ -31,7 +33,7 @@ module GetText
                         :hash_table_size,
                         :hash_table_offset)
 
-    # The following are only used in .mo files 
+    # The following are only used in .mo files
     # with minor revision >= 1.
     class HeaderRev1 < Header
       attr_accessor :n_sysdep_segments,
@@ -43,6 +45,10 @@ module GetText
 
     MAGIC_BIG_ENDIAN    = "\x95\x04\x12\xde"
     MAGIC_LITTLE_ENDIAN = "\xde\x12\x04\x95"
+    if "".respond_to?(:force_encoding)
+      MAGIC_BIG_ENDIAN.force_encoding("ASCII-8BIT")
+      MAGIC_LITTLE_ENDIAN.force_encoding("ASCII-8BIT")
+    end
 
     def self.open(arg = nil, output_charset = nil)
       result = self.new(output_charset)
@@ -145,17 +151,8 @@ module GetText
             @plural = "0" unless @plural
           end
         else
-          if @output_charset
-            begin
-              str = Iconv.conv(@output_charset, @charset, str) if @charset
-            rescue Iconv::Failure
-              if $DEBUG
-                warn "@charset = ", @charset
-                warn"@output_charset = ", @output_charset
-                warn "msgid = ", original_strings[i]
-                warn "msgstr = ", str
-              end
-            end
+          if @charset and @output_charset
+            str = convert_encoding(str, original_strings[i])
           end
         end
         self[original_strings[i]] = str.freeze
@@ -186,7 +183,7 @@ module GetText
     # From gettext-0.12.1/gettext-runtime/intl/hash-string.h
     # Defines the so called `hashpjw' function by P.J. Weinberger
     # [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
-    # 1986, 1987 Bell Telephone Laboratories, Inc.] 
+    # 1986, 1987 Bell Telephone Laboratories, Inc.]
     def hash_string(str)
       hval = 0
       i = 0
@@ -208,7 +205,7 @@ module GetText
       header_size = 4 * 7
       table_size  = 4 * 2 * size
 
-      hash_table_size = next_prime((size * 4) / 3) 
+      hash_table_size = next_prime((size * 4) / 3)
       hash_table_size = 3 if hash_table_size <= 2
       header = Header.new(
                           MAGIC_LITTLE_ENDIAN,          # magic
@@ -302,8 +299,38 @@ module GetText
 
     attr_accessor :little_endian, :path, :last_modified
     attr_reader :charset, :nplurals, :plural
-  end
 
+    private
+    if "".respond_to?(:encode)
+      def convert_encoding(string, original_string)
+        begin
+          string.encode(@output_charset, @charset)
+        rescue EncodingError
+          if $DEBUG
+            warn "@charset = ", @charset
+            warn "@output_charset = ", @output_charset
+            warn "msgid = ", original_string
+            warn "msgstr = ", string
+          end
+          string
+        end
+      end
+    else
+      require 'gettext/core_ext/iconv'
+      def convert_encoding(string, original_string)
+        begin
+          Iconv.conv(@output_charset, @charset, string)
+        rescue Iconv::Failure
+          if $DEBUG
+            warn "@charset = ", @charset
+            warn "@output_charset = ", @output_charset
+            warn "msgid = ", original_string
+            warn "msgstr = ", str
+          end
+        end
+      end
+    end
+  end
 end
 
 # Test
@@ -313,7 +340,7 @@ if $0 == __FILE__
     STDERR.puts("mo.rb [filename.mo ...]")
     exit
   end
-  
+
   ARGV.each{ |item|
     mo = GetText::MOFile.open(item)
     puts "------------------------------------------------------------------"

data/lib/gettext/runtime/textdomain.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 =begin
   textdomain.rb - GetText::Textdomain
 
@@ -60,7 +62,7 @@ module GetText
       @locale_path = LocalePath.new(@name, topdir)
       @mofiles = {}
     end
-    
+
     # Translates the translated string.
     # * lang: Locale::Tag::Simple's subclass.
     # * msgid: the original message.
@@ -77,7 +79,7 @@ module GetText
       unless mofile
         mofile = load_mo(lang)
       end
-     
+
       if (! mofile) or (mofile ==:empty)
         return nil
       end
@@ -89,7 +91,7 @@ module GetText
         # Check "aaa\000bbb" and show warning but return the singluar part.
         ret = nil
         msgid_single = msgid.split("\000")[0]
-        mofile.each{|key, val| 
+        mofile.each{|key, val|
           if key =~ /^#{Regexp.quote(msgid_single)}\000/
             # Usually, this is not caused to make po-files from rgettext.
             warn %Q[Warning: n_("#{msgid_single}", "#{msgid.split("\000")[1]}") and n_("#{key.gsub(/\000/, '", "')}") are duplicated.]
@@ -100,7 +102,7 @@ module GetText
         ret
       else
         ret = nil
-        mofile.each{|key, val| 
+        mofile.each{|key, val|
           if key =~ /^#{Regexp.quote(msgid)}\000/
             ret = val.split("\000")[0]
             break