gettext 2.3.3 → 2.3.4

data/test/tools/test_xgettext.rb

@@ -44,7 +44,7 @@ class TestToolsXGetText < Test::Unit::TestCase
     FileUtils.mkdir_p(File.dirname(@rhtml_file_path))
   end
 
-  def test_relative_source
+  def test_relative_reference
     File.open(@rb_file_path, "w") do |rb_file|
       rb_file.puts(<<-EOR)
 _("Hello")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: locale
@@ -28,6 +28,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: levenshtein
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -188,14 +204,6 @@ files:
 - bin/rxgettext
 - bin/rmsgfmt
 - bin/rmsgmerge
-- data/locale/de/LC_MESSAGES/gettext.mo
-- data/locale/de/LC_MESSAGES/rgettext.mo
-- data/locale/el/LC_MESSAGES/gettext.mo
-- data/locale/el/LC_MESSAGES/rgettext.mo
-- data/locale/uk/LC_MESSAGES/gettext.mo
-- data/locale/uk/LC_MESSAGES/rgettext.mo
-- data/locale/sr/LC_MESSAGES/gettext.mo
-- data/locale/sr/LC_MESSAGES/rgettext.mo
 - doc/text/news.md
 - lib/gettext.rb
 - lib/gettext/utils.rb
@@ -204,11 +212,12 @@ files:
 - lib/gettext/tools/msginit.rb
 - lib/gettext/tools/msgmerge.rb
 - lib/gettext/tools/xgettext.rb
+- lib/gettext/tools/po.rb
 - lib/gettext/tools/parser/ruby.rb
 - lib/gettext/tools/parser/glade.rb
 - lib/gettext/tools/parser/erb.rb
-- lib/gettext/tools/pomessage.rb
 - lib/gettext/tools/poparser.rb
+- lib/gettext/tools/po_entry.rb
 - lib/gettext/parser/ruby.rb
 - lib/gettext/parser/glade.rb
 - lib/gettext/parser/erb.rb
@@ -221,6 +230,7 @@ files:
 - lib/gettext/runtime/textdomain.rb
 - lib/gettext/runtime/mofile.rb
 - lib/gettext/runtime/textdomain_manager.rb
+- lib/gettext/runtime/mo.rb
 - lib/gettext/core_ext/iconv.rb
 - lib/gettext/core_ext/string.rb
 - po/gettext.pot
@@ -649,7 +659,6 @@ files:
 - samples/cgi/Rakefile
 - samples/locale/de/LC_MESSAGES/hello_noop.mo
 - samples/locale/de/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/de/LC_MESSAGES/hello_gtk.mo
 - samples/locale/de/LC_MESSAGES/hello_glade2.mo
 - samples/locale/de/LC_MESSAGES/hello2.mo
 - samples/locale/de/LC_MESSAGES/hello.mo
@@ -657,7 +666,6 @@ files:
 - samples/locale/de/LC_MESSAGES/hello_plural.mo
 - samples/locale/el/LC_MESSAGES/hello_noop.mo
 - samples/locale/el/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/el/LC_MESSAGES/hello_gtk.mo
 - samples/locale/el/LC_MESSAGES/hello_glade2.mo
 - samples/locale/el/LC_MESSAGES/hello2.mo
 - samples/locale/el/LC_MESSAGES/hello.mo
@@ -665,7 +673,6 @@ files:
 - samples/locale/el/LC_MESSAGES/hello_plural.mo
 - samples/locale/uk/LC_MESSAGES/hello_noop.mo
 - samples/locale/uk/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/uk/LC_MESSAGES/hello_gtk.mo
 - samples/locale/uk/LC_MESSAGES/hello_glade2.mo
 - samples/locale/uk/LC_MESSAGES/hello2.mo
 - samples/locale/uk/LC_MESSAGES/hello.mo
@@ -673,7 +680,6 @@ files:
 - samples/locale/uk/LC_MESSAGES/hello_plural.mo
 - samples/locale/sr/LC_MESSAGES/hello_noop.mo
 - samples/locale/sr/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/sr/LC_MESSAGES/hello_gtk.mo
 - samples/locale/sr/LC_MESSAGES/hello_glade2.mo
 - samples/locale/sr/LC_MESSAGES/hello2.mo
 - samples/locale/sr/LC_MESSAGES/hello.mo
@@ -681,7 +687,6 @@ files:
 - samples/locale/sr/LC_MESSAGES/hello_plural.mo
 - samples/locale/zh/LC_MESSAGES/hello_noop.mo
 - samples/locale/zh/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/zh/LC_MESSAGES/hello_gtk.mo
 - samples/locale/zh/LC_MESSAGES/hello_glade2.mo
 - samples/locale/zh/LC_MESSAGES/hello2.mo
 - samples/locale/zh/LC_MESSAGES/hello.mo
@@ -689,7 +694,6 @@ files:
 - samples/locale/zh/LC_MESSAGES/hello_plural.mo
 - samples/locale/fr/LC_MESSAGES/hello_noop.mo
 - samples/locale/fr/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/fr/LC_MESSAGES/hello_gtk.mo
 - samples/locale/fr/LC_MESSAGES/hello_glade2.mo
 - samples/locale/fr/LC_MESSAGES/hello2.mo
 - samples/locale/fr/LC_MESSAGES/hello.mo
@@ -697,7 +701,6 @@ files:
 - samples/locale/fr/LC_MESSAGES/hello_plural.mo
 - samples/locale/sv/LC_MESSAGES/hello_noop.mo
 - samples/locale/sv/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/sv/LC_MESSAGES/hello_gtk.mo
 - samples/locale/sv/LC_MESSAGES/hello_glade2.mo
 - samples/locale/sv/LC_MESSAGES/hello2.mo
 - samples/locale/sv/LC_MESSAGES/hello.mo
@@ -705,7 +708,6 @@ files:
 - samples/locale/sv/LC_MESSAGES/hello_plural.mo
 - samples/locale/hr/LC_MESSAGES/hello_noop.mo
 - samples/locale/hr/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/hr/LC_MESSAGES/hello_gtk.mo
 - samples/locale/hr/LC_MESSAGES/hello_glade2.mo
 - samples/locale/hr/LC_MESSAGES/hello2.mo
 - samples/locale/hr/LC_MESSAGES/hello.mo
@@ -713,7 +715,6 @@ files:
 - samples/locale/hr/LC_MESSAGES/hello_plural.mo
 - samples/locale/it/LC_MESSAGES/hello_noop.mo
 - samples/locale/it/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/it/LC_MESSAGES/hello_gtk.mo
 - samples/locale/it/LC_MESSAGES/hello_glade2.mo
 - samples/locale/it/LC_MESSAGES/hello2.mo
 - samples/locale/it/LC_MESSAGES/hello.mo
@@ -721,7 +722,6 @@ files:
 - samples/locale/it/LC_MESSAGES/hello_plural.mo
 - samples/locale/lv/LC_MESSAGES/hello_noop.mo
 - samples/locale/lv/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/lv/LC_MESSAGES/hello_gtk.mo
 - samples/locale/lv/LC_MESSAGES/hello_glade2.mo
 - samples/locale/lv/LC_MESSAGES/hello2.mo
 - samples/locale/lv/LC_MESSAGES/hello.mo
@@ -729,7 +729,6 @@ files:
 - samples/locale/lv/LC_MESSAGES/hello_plural.mo
 - samples/locale/ja/LC_MESSAGES/hello_noop.mo
 - samples/locale/ja/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/ja/LC_MESSAGES/hello_gtk.mo
 - samples/locale/ja/LC_MESSAGES/hello_glade2.mo
 - samples/locale/ja/LC_MESSAGES/hello2.mo
 - samples/locale/ja/LC_MESSAGES/hello.mo
@@ -737,7 +736,6 @@ files:
 - samples/locale/ja/LC_MESSAGES/hello_plural.mo
 - samples/locale/bs/LC_MESSAGES/hello_noop.mo
 - samples/locale/bs/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/bs/LC_MESSAGES/hello_gtk.mo
 - samples/locale/bs/LC_MESSAGES/hello_glade2.mo
 - samples/locale/bs/LC_MESSAGES/hello2.mo
 - samples/locale/bs/LC_MESSAGES/hello.mo
@@ -745,7 +743,6 @@ files:
 - samples/locale/bs/LC_MESSAGES/hello_plural.mo
 - samples/locale/ca/LC_MESSAGES/hello_noop.mo
 - samples/locale/ca/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/ca/LC_MESSAGES/hello_gtk.mo
 - samples/locale/ca/LC_MESSAGES/hello_glade2.mo
 - samples/locale/ca/LC_MESSAGES/hello2.mo
 - samples/locale/ca/LC_MESSAGES/hello.mo
@@ -753,7 +750,6 @@ files:
 - samples/locale/ca/LC_MESSAGES/hello_plural.mo
 - samples/locale/bg/LC_MESSAGES/hello_noop.mo
 - samples/locale/bg/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/bg/LC_MESSAGES/hello_gtk.mo
 - samples/locale/bg/LC_MESSAGES/hello_glade2.mo
 - samples/locale/bg/LC_MESSAGES/hello2.mo
 - samples/locale/bg/LC_MESSAGES/hello.mo
@@ -761,7 +757,6 @@ files:
 - samples/locale/bg/LC_MESSAGES/hello_plural.mo
 - samples/locale/ru/LC_MESSAGES/hello_noop.mo
 - samples/locale/ru/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/ru/LC_MESSAGES/hello_gtk.mo
 - samples/locale/ru/LC_MESSAGES/hello_glade2.mo
 - samples/locale/ru/LC_MESSAGES/hello2.mo
 - samples/locale/ru/LC_MESSAGES/hello.mo
@@ -769,7 +764,6 @@ files:
 - samples/locale/ru/LC_MESSAGES/hello_plural.mo
 - samples/locale/nl/LC_MESSAGES/hello_noop.mo
 - samples/locale/nl/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/nl/LC_MESSAGES/hello_gtk.mo
 - samples/locale/nl/LC_MESSAGES/hello_glade2.mo
 - samples/locale/nl/LC_MESSAGES/hello2.mo
 - samples/locale/nl/LC_MESSAGES/hello.mo
@@ -777,7 +771,6 @@ files:
 - samples/locale/nl/LC_MESSAGES/hello_plural.mo
 - samples/locale/eo/LC_MESSAGES/hello_noop.mo
 - samples/locale/eo/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/eo/LC_MESSAGES/hello_gtk.mo
 - samples/locale/eo/LC_MESSAGES/hello_glade2.mo
 - samples/locale/eo/LC_MESSAGES/hello2.mo
 - samples/locale/eo/LC_MESSAGES/hello.mo
@@ -785,7 +778,6 @@ files:
 - samples/locale/eo/LC_MESSAGES/hello_plural.mo
 - samples/locale/nb/LC_MESSAGES/hello_noop.mo
 - samples/locale/nb/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/nb/LC_MESSAGES/hello_gtk.mo
 - samples/locale/nb/LC_MESSAGES/hello_glade2.mo
 - samples/locale/nb/LC_MESSAGES/hello2.mo
 - samples/locale/nb/LC_MESSAGES/hello.mo
@@ -793,7 +785,6 @@ files:
 - samples/locale/nb/LC_MESSAGES/hello_plural.mo
 - samples/locale/vi/LC_MESSAGES/hello_noop.mo
 - samples/locale/vi/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/vi/LC_MESSAGES/hello_gtk.mo
 - samples/locale/vi/LC_MESSAGES/hello_glade2.mo
 - samples/locale/vi/LC_MESSAGES/hello2.mo
 - samples/locale/vi/LC_MESSAGES/hello.mo
@@ -801,7 +792,6 @@ files:
 - samples/locale/vi/LC_MESSAGES/hello_plural.mo
 - samples/locale/hu/LC_MESSAGES/hello_noop.mo
 - samples/locale/hu/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/hu/LC_MESSAGES/hello_gtk.mo
 - samples/locale/hu/LC_MESSAGES/hello_glade2.mo
 - samples/locale/hu/LC_MESSAGES/hello2.mo
 - samples/locale/hu/LC_MESSAGES/hello.mo
@@ -809,7 +799,6 @@ files:
 - samples/locale/hu/LC_MESSAGES/hello_plural.mo
 - samples/locale/pt_BR/LC_MESSAGES/hello_noop.mo
 - samples/locale/pt_BR/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/pt_BR/LC_MESSAGES/hello_gtk.mo
 - samples/locale/pt_BR/LC_MESSAGES/hello_glade2.mo
 - samples/locale/pt_BR/LC_MESSAGES/hello2.mo
 - samples/locale/pt_BR/LC_MESSAGES/hello.mo
@@ -817,7 +806,6 @@ files:
 - samples/locale/pt_BR/LC_MESSAGES/hello_plural.mo
 - samples/locale/cs/LC_MESSAGES/hello_noop.mo
 - samples/locale/cs/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/cs/LC_MESSAGES/hello_gtk.mo
 - samples/locale/cs/LC_MESSAGES/hello_glade2.mo
 - samples/locale/cs/LC_MESSAGES/hello2.mo
 - samples/locale/cs/LC_MESSAGES/hello.mo
@@ -825,7 +813,6 @@ files:
 - samples/locale/cs/LC_MESSAGES/hello_plural.mo
 - samples/locale/zh_TW/LC_MESSAGES/hello_noop.mo
 - samples/locale/zh_TW/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/zh_TW/LC_MESSAGES/hello_gtk.mo
 - samples/locale/zh_TW/LC_MESSAGES/hello_glade2.mo
 - samples/locale/zh_TW/LC_MESSAGES/hello2.mo
 - samples/locale/zh_TW/LC_MESSAGES/hello.mo
@@ -833,7 +820,6 @@ files:
 - samples/locale/zh_TW/LC_MESSAGES/hello_plural.mo
 - samples/locale/es/LC_MESSAGES/hello_noop.mo
 - samples/locale/es/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/es/LC_MESSAGES/hello_gtk.mo
 - samples/locale/es/LC_MESSAGES/hello_glade2.mo
 - samples/locale/es/LC_MESSAGES/hello2.mo
 - samples/locale/es/LC_MESSAGES/hello.mo
@@ -841,7 +827,6 @@ files:
 - samples/locale/es/LC_MESSAGES/hello_plural.mo
 - samples/locale/ko/LC_MESSAGES/hello_noop.mo
 - samples/locale/ko/LC_MESSAGES/hello_gtk2.mo
-- samples/locale/ko/LC_MESSAGES/hello_gtk.mo
 - samples/locale/ko/LC_MESSAGES/hello_glade2.mo
 - samples/locale/ko/LC_MESSAGES/hello2.mo
 - samples/locale/ko/LC_MESSAGES/hello.mo
@@ -851,10 +836,12 @@ files:
 - src/poparser.ry
 - test/run-test.rb
 - test/test_locale_path.rb
+- test/test_mo.rb
 - test/test_class_info.rb
 - test/tools/test_msginit.rb
 - test/tools/test_xgettext.rb
 - test/tools/test_msgmerge.rb
+- test/tools/test_po.rb
 - test/tools/test.pot
 - test/tools/files/de/app.po
 - test/tools/files/simple_translation.rb
@@ -865,9 +852,7 @@ files:
 - test/tools/files/app.pot
 - test/tools/files/simple_1.po
 - test/tools/test_tools.rb
-- test/test_mofile.rb
 - test/parser/test_ruby.rb
-- test/po/not_existed_msgid.pot
 - test/po/sl/plural.po
 - test/po/ir/plural.po
 - test/po/np_.pot
@@ -896,11 +881,9 @@ files:
 - test/po/_.pot
 - test/po/untranslated.pot
 - test/po/p_.pot
-- test/po/ascii.pot
 - test/po/da/plural.po
 - test/po/da/plural_error.po
 - test/po/po/plural.po
-- test/po/no_exist_msgid.pot
 - test/po/cr/plural.po
 - test/po/la/plural.po
 - test/po/la/plural_error.po
@@ -925,10 +908,10 @@ files:
 - test/fixtures/ns_.rb
 - test/fixtures/p_.rb
 - test/fixtures/simple.rb
+- test/test_po_entry.rb
 - test/gettext-test-utils.rb
 - test/test_thread.rb
 - test/test_po_parser.rb
-- test/test_po_message.rb
 - test/test_parser.rb
 - test/test_textdomain_bind.rb
 - test/test_textdomain_toplevel.rb
@@ -983,7 +966,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -250750965956086741
+      hash: -3820019722187872966
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -992,7 +975,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -250750965956086741
+      hash: -3820019722187872966
 requirements: []
 rubyforge_project: gettext
 rubygems_version: 1.8.23
@@ -1001,11 +984,11 @@ specification_version: 3
 summary: Gettext is a pure Ruby libary and tools to localize messages.
 test_files:
 - test/test_locale_path.rb
+- test/test_mo.rb
 - test/test_class_info.rb
-- test/test_mofile.rb
+- test/test_po_entry.rb
 - test/test_thread.rb
 - test/test_po_parser.rb
-- test/test_po_message.rb
 - test/test_parser.rb
 - test/test_textdomain_bind.rb
 - test/test_textdomain_toplevel.rb

data/lib/gettext/tools/pomessage.rb

@@ -1,232 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
-# Copyright (C) 2010  masone (Christian Felder) <ema@rh-productions.ch>
-# Copyright (C) 2009  Masao Mutoh
-#
-# License: Ruby's or LGPL
-#
-# This library is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# 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/>.
-
-module GetText
-  class ParseError < StandardError
-  end
-
-  # Contains data related to the expression or sentence that
-  # is to be translated.
-  class PoMessage
-    PARAMS = {
-      :normal => [:msgid, :separator],
-      :plural => [:msgid, :msgid_plural, :separator],
-      :msgctxt => [:msgctxt, :msgid],
-      :msgctxt_plural => [:msgctxt, :msgid, :msgid_plural]
-    }
-
-    class << self
-      def escape(string)
-        string.gsub(/([\\"\n])/) do
-          special_character = $1
-          if special_character == "\n"
-            "\\n"
-          else
-            "\\#{special_character}"
-          end
-        end
-      end
-    end
-
-    @@max_line_length = 70
-
-    # Sets the max line length.
-    def self.max_line_length=(len)
-      @@max_line_length = len
-    end
-
-    # Gets the max line length.
-    def self.max_line_length
-      @@max_line_length
-    end
-
-    # Required
-    attr_accessor :type          # :normal, :plural, :msgctxt, :msgctxt_plural
-    attr_accessor :msgid
-    # Options
-    attr_accessor :msgid_plural
-    attr_accessor :separator
-    attr_accessor :msgctxt
-    attr_accessor :sources    # ["file1:line1", "file2:line2", ...]
-    attr_accessor :comment
-
-    # Create the object. +type+ should be :normal, :plural, :msgctxt or :msgctxt_plural.
-    def initialize(type)
-      @type = type
-      @sources = []
-      @param_type = PARAMS[@type]
-    end
-
-    # Support for extracted comments. Explanation s.
-    # http://www.gnu.org/software/gettext/manual/gettext.html#Names
-    def add_comment(new_comment)
-      if (new_comment and ! new_comment.empty?)
-        @comment ||= ""
-        @comment += new_comment
-      end
-      to_s
-    end
-
-    # Returns a parameter representation suitable for po-files
-    # and other purposes.
-    def escaped(param_name)
-      orig = self.send param_name
-      self.class.escape(orig.gsub(/\r/, ""))
-    end
-
-    # Checks if the other translation target is mergeable with
-    # the current one. Relevant are msgid and translation context (msgctxt).
-    def ==(other)
-      other && other.msgid == self.msgid && other.msgctxt == self.msgctxt
-    end
-
-    # Merges two translation targets with the same msgid and returns the merged
-    # result. If one is declared as plural and the other not, then the one
-    # with the plural wins.
-    def merge(other)
-      return self unless other
-      raise ParseError, "Translation targets do not match: \n" \
-      "  self: #{self.inspect}\n  other: '#{other.inspect}'" unless self == other
-      if other.msgid_plural && !self.msgid_plural
-        res = other
-        unless (res.sources.include? self.sources[0])
-          res.sources += self.sources
-          res.add_comment(self.comment)
-        end
-      else
-        res = self
-        unless (res.sources.include? other.sources[0])
-          res.sources += other.sources
-          res.add_comment(other.comment)
-        end
-      end
-      res
-    end
-
-    # Output the po message for the po-file.
-    def to_po_str
-      raise "msgid is nil." unless @msgid
-      raise "sources is nil." unless @sources
-
-      str = ""
-      # extracted comments
-      if comment
-        comment.split("\n").each do |comment_line|
-          str << "\n#. #{comment_line.strip}"
-        end
-      end
-
-      # references
-      curr_pos = @@max_line_length
-      sources.each do |e|
-        if curr_pos + e.size > @@max_line_length
-          str << "\n#:"
-          curr_pos = 3
-        else
-          curr_pos += (e.size + 1)
-        end
-        str << " " << e
-      end
-
-      # msgctxt, msgid, msgstr
-      str << "\nmsgctxt \"" << msgctxt << "\"" if msgctxt?
-      str << "\nmsgid \"" << escaped(:msgid) << "\"\n"
-      if plural?
-        str << "msgid_plural \"" << escaped(:msgid_plural) << "\"\n"
-        str << "msgstr[0] \"\"\n"
-        str << "msgstr[1] \"\"\n"
-      else
-        str << "msgstr \"\"\n"
-      end
-      str
-    end
-
-    # Returns true if the type is kind of msgctxt.
-    # And if this is a kind of msgctxt and msgctxt property
-    # is nil, then raise an RuntimeException.
-    def msgctxt?
-      if [:msgctxt, :msgctxt_plural].include? @type
-        raise "This PoMessage is a kind of msgctxt but the msgctxt property is nil. msgid: #{msgid}" unless @msgctxt
-        true
-      end
-    end
-
-    # Returns true if the type is kind of plural.
-    # And if this is a kind of plural and msgid_plural property
-    # is nil, then raise an RuntimeException.
-    def plural?
-      if [:plural, :msgctxt_plural].include? @type
-        raise "This PoMessage is a kind of plural but the msgid_plural property is nil. msgid: #{msgid}" unless @msgid_plural
-        true
-      end
-    end
-
-    private
-
-    # sets or extends the value of a translation target params like msgid,
-    # msgctxt etc.
-    #   param is symbol with the name of param
-    #   value - new value
-    def set_value(param, value)
-      send "#{param}=", (send(param) || '') + value.gsub(/\n/, '\n')
-    end
-
-    public
-    # For backward comatibility. This doesn't support "comment".
-    # ary = [msgid1, "file1:line1", "file2:line"]
-    def self.new_from_ary(ary)
-      ary = ary.dup
-      msgid = ary.shift
-      sources = ary
-      type = :normal
-      msgctxt = nil
-      msgid_plural = nil
-
-      if msgid.include? "\004"
-        msgctxt, msgid = msgid.split(/\004/)
-        type = :msgctxt
-      end
-      if msgid.include? "\000"
-        ids = msgid.split(/\000/)
-        msgid = ids[0]
-        msgid_plural = ids[1]
-        if type == :msgctxt
-          type = :msgctxt_plural
-        else
-          type = :plural
-        end
-      end
-      ret = self.new(type)
-      ret.msgid = msgid
-      ret.sources = sources
-      ret.msgctxt = msgctxt
-      ret.msgid_plural = msgid_plural
-      ret
-    end
-
-    def [](number)
-      param = @param_type[number]
-      raise ParseError, 'no more string parameters expected' unless param
-      send param
-    end
-  end
-
-end