gettext 2.3.9 → 3.0.0

data/lib/gettext/{runtime/mo.rb → mo.rb}

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 =begin
     mo.rb - A simple class for operating GNU MO file.
@@ -43,12 +43,8 @@ module GetText
       :trans_sysdep_tab_offset
     end
 
-    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
+    MAGIC_BIG_ENDIAN    = "\x95\x04\x12\xde".force_encoding("ASCII-8BIT")
+    MAGIC_LITTLE_ENDIAN = "\xde\x12\x04\x95".force_encoding("ASCII-8BIT")
 
     def self.open(arg = nil, output_charset = nil)
       result = self.new(output_charset)
@@ -312,35 +308,24 @@ module GetText
     attr_reader :charset, :nplurals, :plural
 
     private
-    if "".respond_to?(:encode)
-      def convert_encoding(string, original_string)
-        return string if @output_charset.nil? or @charset.nil?
+    def convert_encoding(string, original_string)
+      return string if @output_charset.nil? or @charset.nil?
 
-        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
+      if Encoding.find(@output_charset) == Encoding.find(@charset)
+        string.force_encoding(@output_charset)
+        return string
       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
+
+      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
 

data/lib/gettext/{tools/po.rb → po.rb}

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "gettext/tools/po_entry"
+require "gettext/po_entry"
 
 module GetText
 

data/lib/gettext/{tools/po_entry.rb → po_entry.rb}

@@ -53,9 +53,12 @@ module GetText
 
     class << self
       def escape(string)
-        string.gsub(/([\\"\n])/) do
+        string.gsub(/([\\"\t\n])/) do
           special_character = $1
-          if special_character == "\n"
+          case special_character
+          when "\t"
+            "\\t"
+          when "\n"
             "\\n"
           else
             "\\#{special_character}"
@@ -110,7 +113,8 @@ module GetText
     def add_comment(new_comment)
       if (new_comment and ! new_comment.empty?)
         @extracted_comment ||= ""
-        @extracted_comment += new_comment
+        @extracted_comment << "\n" unless @extracted_comment.empty?
+        @extracted_comment << new_comment
       end
       to_s
     end
@@ -328,7 +332,7 @@ module GetText
     #   param is symbol with the name of param
     #   value - new value
     def set_value(param, value)
-      send "#{param}=", (send(param) || '') + value.gsub(/\n/, '\n')
+      send "#{param}=", (send(param) || '') + value
     end
 
     def escape(value)

data/lib/gettext/{tools/poparser.rb → po_parser.rb}

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# poparser.rb - Generate a .mo
+# po_parser.rb - Generate a .mo
 #
 # Copyright (C) 2003-2009 Masao Mutoh <mutomasa at gmail.com>
 # Copyright (C) 2012 Kouhei Sutou <kou@clear-code.com>
@@ -16,21 +16,12 @@
 
 require 'racc/parser.rb'
 
-require "gettext/tools/po"
+require "gettext/po"
 
-# For suppressing warning. PoData is deprecated and will be removed.
-module GetText
-  module Tools
-    class MsgMerge
-      class PoData
-      end
-    end
-  end
-end
 module GetText
   class POParser < Racc::Parser
 
-module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 132)
+module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 123)
   if GetText.respond_to?(:bindtextdomain)
     include GetText
     GetText.bindtextdomain("gettext")
@@ -121,7 +112,7 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 132)
 	str = str[1..-1]
       end
     end
-    @q.push [false, '$end']
+    @q.push [false, "$end"]
     if $DEBUG
       @q.each do |a,b|
       puts "[#{a}, #{b}]"
@@ -143,8 +134,7 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 132)
   def on_message(msgid, msgstr)
     msgstr = nil if msgstr.empty?
 
-    if @data.instance_of?(PO) or
-        @data.instance_of?(GetText::Tools::MsgMerge::PoData)
+    if @data.instance_of?(PO)
       type = detect_entry_type
       entry = POEntry.new(type)
       entry.translator_comment = format_comment(@translator_comments)
@@ -157,15 +147,7 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 132)
       entry.msgid_plural = @msgid_plural
       entry.msgstr = msgstr
 
-      if @data.instance_of?(PO)
-        @data[@msgctxt, msgid] = entry
-      elsif @data.instance_of?(GetText::Tools::MsgMerge::PoData)
-        id = ""
-        id << "#{@msgctxt}\004" unless @msgctxt.nil?
-        id << msgid
-        id << "\000#{@msgid_plural}" unless @msgid_plural.nil?
-        @data[id] = entry
-      end
+      @data[@msgctxt, msgid] = entry
     else
       options = {}
       options[:msgctxt] = @msgctxt
@@ -195,8 +177,7 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 132)
 
   def on_comment(comment)
     @fuzzy = true if (/fuzzy/ =~ comment)
-    if @data.instance_of?(PO) or
-        @data.instance_of?(GetText::Tools::MsgMerge::PoData)
+    if @data.instance_of?(PO)
       if comment == "#"
         @translator_comments << ""
       elsif /\A(#.)\s*(.*)\z/ =~ comment
@@ -208,7 +189,7 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 132)
         when POEntry::EXTRACTED_COMMENT_MARK
           @extracted_comments << content
         when POEntry::REFERENCE_COMMENT_MARK
-          @references << content
+          @references.concat(parse_references_line(content))
         when POEntry::FLAG_MARK
           @flag << content
         when POEntry::PREVIOUS_COMMENT_MARK
@@ -233,15 +214,31 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 132)
     parse(File.open(*args) {|io| io.read }, data)
   end
 
+  private
   def detect_file_encoding(po_file)
-    open(po_file, :encoding => 'ASCII-8BIT') do |input|
+    open(po_file, :encoding => "ASCII-8BIT") do |input|
+      in_header = false
       input.each_line do |line|
-        return Encoding.find($1) if %r["Content-Type:.*\scharset=(.*)\\n"] =~ line
+        case line.chomp
+        when /\Amsgid\s+"(.*)"\z/
+          id = $1
+          break unless id.empty?
+          in_header = true
+        when /\A"Content-Type:.*\scharset=(.*)\\n"\z/
+          charset = $1
+          next unless in_header
+          break if template_charset?(charset)
+          return Encoding.find(charset)
+        end
       end
     end
     Encoding.default_external
   end
 
+  def template_charset?(charset)
+    charset == "CHARSET"
+  end
+
   def detect_entry_type
     if @msgctxt.nil?
       if @msgid_plural.nil?
@@ -257,8 +254,11 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 132)
       end
     end
   end
-  private :detect_file_encoding
-...end poparser.ry/module_eval...
+
+  def parse_references_line(line)
+    line.split(/\s+/)
+  end
+...end po_parser.ry/module_eval...
 ##### State transition tables begin ###
 
 racc_action_table = [
@@ -381,7 +381,7 @@ Racc_debug_parser = true
 
 # reduce 4 omitted
 
-module_eval(<<'.,.,', 'poparser.ry', 26)
+module_eval(<<'.,.,', 'po_parser.ry', 26)
   def _reduce_5(val, _values, result)
         @msgctxt = unescape(val[1])
   
@@ -393,7 +393,7 @@ module_eval(<<'.,.,', 'poparser.ry', 26)
 
 # reduce 7 omitted
 
-module_eval(<<'.,.,', 'poparser.ry', 38)
+module_eval(<<'.,.,', 'po_parser.ry', 38)
   def _reduce_8(val, _values, result)
         msgid_raw = val[1]
     msgid = unescape(msgid_raw)
@@ -418,7 +418,7 @@ module_eval(<<'.,.,', 'poparser.ry', 38)
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 61)
+module_eval(<<'.,.,', 'po_parser.ry', 61)
   def _reduce_9(val, _values, result)
         if @fuzzy and ignore_fuzzy?
       if val[1] != ""
@@ -427,7 +427,7 @@ module_eval(<<'.,.,', 'poparser.ry', 61)
           $stderr.print "msgid = '#{val[1]}\n"
         end
       else
-        on_message('', unescape(val[3]))
+        on_message("", unescape(val[3]))
       end
       @fuzzy = false
     else
@@ -440,7 +440,7 @@ module_eval(<<'.,.,', 'poparser.ry', 61)
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 82)
+module_eval(<<'.,.,', 'po_parser.ry', 82)
   def _reduce_10(val, _values, result)
         if val[0].size > 0
       result = val[0] + "\000" + val[1]
@@ -454,7 +454,7 @@ module_eval(<<'.,.,', 'poparser.ry', 82)
 
 # reduce 11 omitted
 
-module_eval(<<'.,.,', 'poparser.ry', 94)
+module_eval(<<'.,.,', 'po_parser.ry', 94)
   def _reduce_12(val, _values, result)
         result = val[2]
   
@@ -462,7 +462,7 @@ module_eval(<<'.,.,', 'poparser.ry', 94)
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 101)
+module_eval(<<'.,.,', 'po_parser.ry', 101)
   def _reduce_13(val, _values, result)
         on_comment(val[0])
   
@@ -470,7 +470,7 @@ module_eval(<<'.,.,', 'poparser.ry', 101)
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 109)
+module_eval(<<'.,.,', 'po_parser.ry', 109)
   def _reduce_14(val, _values, result)
         result = val.delete_if{|item| item == ""}.join
   
@@ -478,7 +478,7 @@ module_eval(<<'.,.,', 'poparser.ry', 109)
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 113)
+module_eval(<<'.,.,', 'po_parser.ry', 113)
   def _reduce_15(val, _values, result)
         result = val[0]
   
@@ -493,7 +493,4 @@ end
   end   # class POParser
 end   # module GetText
 
-  # for backward compatibility.
-  module GetText
-    PoParser = POParser
-  end
+

data/lib/gettext/{runtime/textdomain.rb → text_domain.rb}

@@ -1,7 +1,7 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 =begin
-  textdomain.rb - GetText::Textdomain
+  text_domain.rb - GetText::TextDomain
 
   Copyright (C) 2001-2009  Masao Mutoh
   Copyright (C) 2001-2003  Masahiro Sakai
@@ -13,12 +13,11 @@
   license terms as Ruby or LGPL.
 =end
 
-require 'gettext/core_ext/string'
-require 'gettext/runtime/mo'
-require 'gettext/runtime/locale_path'
+require 'gettext/mo'
+require 'gettext/locale_path'
 
 module GetText
-  # GetText::TextDomain class manages mo-files of a textdomain.
+  # GetText::TextDomain class manages mo-files of a text domain.
   #
   # Usually, you don't need to use this class directly.
   #
@@ -42,17 +41,8 @@ module GetText
       @@cached = val
     end
 
-    # Add default locale path. Usually you should use GetText.add_default_locale_path instead.
-    # * path: a new locale path. (e.g.) "/usr/share/locale/%{lang}/LC_MESSAGES/%{name}.mo"
-    #   ('locale' => "ja_JP", 'name' => "textdomain")
-    # * Returns: the new DEFAULT_LOCALE_PATHS
-    def self.add_default_locale_path(path)
-      warn "Deprecated. Use GetText::LocalePath.add_default_rule instead."
-      LocalePath.add_default_rule(path)
-    end
-
     # Creates a new GetText::TextDomain.
-    # * name: the textdomain name.
+    # * name: the text domain name.
     # * topdir: the locale path ("%{topdir}/%{lang}/LC_MESSAGES/%{name}.mo") or nil.
     # * output_charset: output charset.
     # * Returns: a newly created GetText::TextDomain object.

data/lib/gettext/text_domain_group.rb

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+
+=begin
+  gettext/text_domain_group - GetText::TextDomainGroup class
+
+  Copyright (C) 2009  Masao Mutoh
+
+  You may redistribute it and/or modify it under the same
+  license terms as Ruby or LGPL.
+
+=end
+
+module GetText
+
+  class TextDomainGroup
+    attr_reader :text_domains
+
+    def initialize
+      @text_domains = []
+    end
+
+    def add(text_domain)
+      @text_domains.unshift(text_domain) unless @text_domains.include? text_domain
+    end
+  end
+end

data/lib/gettext/{runtime/textdomain_manager.rb → text_domain_manager.rb}

@@ -1,7 +1,7 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 =begin
-  gettext/textdomain_manager - GetText::TextDomainManager class
+  gettext/text_domain_manager - GetText::TextDomainManager class
 
   Copyright (C) 2009  Masao Mutoh
 
@@ -10,16 +10,16 @@
 
 =end
 
-require 'gettext/runtime/class_info'
-require 'gettext/runtime/textdomain'
-require 'gettext/runtime/textdomain_group'
+require 'gettext/class_info'
+require 'gettext/text_domain'
+require 'gettext/text_domain_group'
 
 module GetText
 
   module TextDomainManager
 
-    @@textdomain_pool = {}
-    @@textdomain_group_pool = {}
+    @@text_domain_pool = {}
+    @@text_domain_group_pool = {}
 
     @@output_charset = nil
     @@gettext_classes = []
@@ -30,9 +30,9 @@ module GetText
 
     extend self
 
-    # Find textdomain by name
-    def textdomain_pool(domainname)
-      @@textdomain_pool[domainname]
+    # Find text domain by name
+    def text_domain_pool(domainname)
+      @@text_domain_pool[domainname]
     end
 
     # Set the value whether cache messages or not.
@@ -58,30 +58,30 @@ module GetText
     # Sets the output charset.The program can have a output charset.
     def output_charset=(charset)
       @@output_charset = charset
-      @@textdomain_pool.each do |key, textdomain|
-        textdomain.output_charset = charset
+      @@text_domain_pool.each do |key, text_domain|
+        text_domain.output_charset = charset
       end
     end
 
-    # bind textdomain to the class.
+    # bind text domain to the class.
     def bind_to(klass, domainname, options = {})
       warn "Bind the domain '#{domainname}' to '#{klass}'. " if $DEBUG
 
       charset = options[:output_charset] || self.output_charset
-      textdomain = create_or_find_textdomain(domainname,options[:path],charset)
+      text_domain = create_or_find_text_domain(domainname,options[:path],charset)
       target_klass = ClassInfo.normalize_class(klass)
-      create_or_find_textdomain_group(target_klass).add(textdomain)
+      create_or_find_text_domain_group(target_klass).add(text_domain)
       @@gettext_classes << target_klass unless @@gettext_classes.include? target_klass
 
-      textdomain
+      text_domain
     end
 
-    def each_textdomains(klass) #:nodoc:
+    def each_text_domains(klass) #:nodoc:
       lang = Locale.candidates[0]
       ClassInfo.related_classes(klass, @@gettext_classes).each do |target|
-        if group = @@textdomain_group_pool[target]
-          group.textdomains.each do |textdomain|
-            yield textdomain, lang
+        if group = @@text_domain_group_pool[target]
+          group.text_domains.each do |text_domain|
+            yield text_domain, lang
           end
         end
       end
@@ -100,8 +100,8 @@ module GetText
       msg = @@singular_message_cache[key]
       return msg if msg and @@cached
       # Find messages from related classes.
-      each_textdomains(klass) do |textdomain, lang|
-        msg = textdomain.translate_singular_message(lang, msgid)
+      each_text_domains(klass) do |text_domain, lang|
+        msg = text_domain.translate_singular_message(lang, msgid)
         break if msg
       end
 
@@ -161,8 +161,8 @@ module GetText
       unless (msgs and @@cached)
         # Find messages from related classes.
         msgs = nil
-        each_textdomains(klass) do |textdomain, lang|
-          msgs = textdomain.translate_plural_message(lang, msgid, msgid_plural)
+        each_text_domains(klass) do |text_domain, lang|
+          msgs = text_domain.translate_plural_message(lang, msgid, msgid_plural)
           break if msgs
         end
 
@@ -183,25 +183,25 @@ module GetText
     end
 
     # for testing.
-    def dump_all_textdomains
+    def dump_all_text_domains
       [
-        @@textdomain_pool.dup,
-        @@textdomain_group_pool.dup,
+        @@text_domain_pool.dup,
+        @@text_domain_group_pool.dup,
         @@gettext_classes.dup,
       ]
     end
 
     # for testing.
-    def restore_all_textdomains(dumped_all_textdomains)
-      @@textdomain_pool, @@textdomain_group_pool, @@gettext_classes =
-        dumped_all_textdomains
+    def restore_all_text_domains(dumped_all_text_domains)
+      @@text_domain_pool, @@text_domain_group_pool, @@gettext_classes =
+        dumped_all_text_domains
       clear_caches
     end
 
     # for testing.
-    def clear_all_textdomains
-      @@textdomain_pool = {}
-      @@textdomain_group_pool = {}
+    def clear_all_text_domains
+      @@text_domain_pool = {}
+      @@text_domain_group_pool = {}
       @@gettext_classes = []
       clear_caches
     end
@@ -212,18 +212,18 @@ module GetText
       @@plural_message_cache = {}
     end
 
-    def create_or_find_textdomain_group(klass) #:nodoc:
-      group = @@textdomain_group_pool[klass]
+    def create_or_find_text_domain_group(klass) #:nodoc:
+      group = @@text_domain_group_pool[klass]
       return group if group
 
-      @@textdomain_group_pool[klass] = TextDomainGroup.new
+      @@text_domain_group_pool[klass] = TextDomainGroup.new
     end
 
-    def create_or_find_textdomain(name, path, charset)#:nodoc:
-      textdomain = @@textdomain_pool[name]
-      return textdomain if textdomain
+    def create_or_find_text_domain(name, path, charset)#:nodoc:
+      text_domain = @@text_domain_pool[name]
+      return text_domain if text_domain
 
-      @@textdomain_pool[name] = TextDomain.new(name, path, charset)
+      @@text_domain_pool[name] = TextDomain.new(name, path, charset)
     end
   end
 end