gettext 2.3.6 → 2.3.7

data/doc/text/news.md

@@ -1,4 +1,19 @@
 # News
+
+## <a id="2-3-7">2.3.7</a>: 2013-01-11
+
+This is a msgmerge improved release.
+
+### Improvements
+
+  * [msgmerge] Speeded up fuzzy matching.
+
+### Fixes
+
+  * [msgmerge] Fix the bug that msgmerge adds needless fuzzy flag from
+    not fuzzy entries in merged PO.
+  * [POEntry] Pretty formated all messages except msgstr.
+
 ## <a id="2-3-6">2.3.6</a>: 2012-12-19
 
 This is a bug fix release.
@@ -57,7 +72,6 @@ This is a many changes and new implements release.
   * Raised no error when POEntry doesn't have references.
     It is useful for no references in .PO file.
 
-# News
 ## <a id="2-3-3">2.3.3</a>: 2012-10-18
 
 It's a package fix and msginit improvement release.

data/lib/gettext/tools/msgmerge.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+# Copyright (C) 2012-2013  Haruka Yoshihara <yoshihara@clear-code.com>
 # Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2005-2009 Masao Mutoh
 # Copyright (C) 2005,2006 speakillof
@@ -229,15 +230,15 @@ module GetText
             mark = $1
             content = $2
             case mark
-            when POParser::TRANSLATOR_COMMENT_MARK
+            when POEntry::TRANSLATOR_COMMENT_MARK
               entry.translator_comment << "#{content}\n"
-            when POParser::EXTRACTED_COMMENT_MARK
+            when POEntry::EXTRACTED_COMMENT_MARK
               entry.extracted_comment << "#{content}\n"
-            when POParser::REFERENCE_COMMENT_MARK
+            when POEntry::REFERENCE_COMMENT_MARK
               entry.references << content
-            when POParser::FLAG_MARK
+            when POEntry::FLAG_MARK
               entry.flag << "#{content}\n"
-            when POParser::PREVIOUS_MSGID_COMMENT_MARK
+            when POEntry::PREVIOUS_COMMENT_MARK
               entry.previous << "#{content}\n"
             else
               entry.comment << line
@@ -259,6 +260,10 @@ module GetText
         def merge(definition, reference)
           result = GetText::PO.new
 
+          translated_entries = definition.reject do |entry|
+            entry.msgstr.nil?
+          end
+
           reference.each do |entry|
             msgid = entry.msgid
             msgctxt = entry.msgctxt
@@ -270,14 +275,14 @@ module GetText
             end
 
             if msgctxt.nil?
-              same_msgid_entry = find_by_msgid(definition, msgid)
+              same_msgid_entry = find_by_msgid(translated_entries, msgid)
               if not same_msgid_entry.nil? and not same_msgid_entry.msgctxt.nil?
                 result[nil, msgid] = merge_fuzzy_entry(same_msgid_entry, entry)
                 next
               end
             end
 
-            fuzzy_entry = find_fuzzy_entry(definition, msgid, msgctxt)
+            fuzzy_entry = find_fuzzy_entry(translated_entries, msgid, msgctxt)
             unless fuzzy_entry.nil?
               result[*id] = merge_fuzzy_entry(fuzzy_entry, entry)
               next
@@ -286,7 +291,7 @@ module GetText
             result[*id] = entry
           end
 
-          add_obsolete_entry(result, definition)
+          add_obsolete_entry(result, translated_entries)
           result
         end
 

data/lib/gettext/tools/po.rb

@@ -55,8 +55,8 @@ module GetText
     #     @return [POEntry]
     #   @!macro po.[].argument
     # @overload [](msgctxt, msgid)
+    #   @param [String] msgctxt msgctxt contained returning {POEntry}.
     #   @!macro po.[].argument
-    #   @param [String] msgid msgid contained returning {POEntry}.
     def [](msgctxt, msgid=nil)
       if msgid.nil?
         msgid = msgctxt

data/lib/gettext/tools/po_entry.rb

@@ -45,6 +45,12 @@ module GetText
       :msgctxt_plural => [:msgctxt, :msgid, :msgid_plural, :msgstr]
     }
 
+   TRANSLATOR_COMMENT_MARK = "# "
+   EXTRACTED_COMMENT_MARK = "#."
+   FLAG_MARK = "#,"
+   PREVIOUS_COMMENT_MARK = "#|"
+   REFERENCE_COMMENT_MARK = "#:"
+
     class << self
       def escape(string)
         string.gsub(/([\\"\n])/) do
@@ -193,10 +199,10 @@ module GetText
                                  "msgid: #{msgid}"
           raise(NoMsgctxtError, no_msgctxt_message)
         end
-        str << "msgctxt \"" << msgctxt << "\"\n"
+        str << "msgctxt " << format_message(msgctxt)
       end
 
-      str << "msgid \"" << escaped(:msgid) << "\"\n"
+      str << "msgid " << format_message(msgid)
       if plural?
         if @msgid_plural.nil?
           no_plural_message = "This POEntry is a kind of plural " +
@@ -205,7 +211,7 @@ module GetText
           raise(NoMsgidPluralError, no_plural_message)
         end
 
-        str << "msgid_plural \"" << escaped(:msgid_plural) << "\"\n"
+        str << "msgid_plural " << format_message(msgid_plural)
 
         if msgstr.nil?
           str << "msgstr[0] \"\"\n"
@@ -213,7 +219,7 @@ module GetText
         else
           msgstrs = msgstr.split("\000", -1)
           msgstrs.each_with_index do |msgstr, index|
-            str << "msgstr[#{index}] \"#{escape(msgstr)}\"\n"
+            str << "msgstr[#{index}] " << format_message(msgstr)
           end
         end
       else
@@ -228,19 +234,19 @@ module GetText
     end
 
     def format_extracted_comment
-      format_comment("#.", extracted_comment)
+      format_comment(EXTRACTED_COMMENT_MARK, extracted_comment)
     end
 
     def format_reference_comment
       max_line_length = 70
       formatted_reference = ""
       if not references.nil? and not references.empty?
-        formatted_reference << "#:"
+        formatted_reference << REFERENCE_COMMENT_MARK
         line_size = 2
         references.each do |reference|
           if line_size + reference.size > max_line_length
             formatted_reference << "\n"
-            formatted_reference <<  "#: #{reference}"
+            formatted_reference <<  "#{REFERENCE_COMMENT_MARK} #{reference}"
             line_size = 3 + reference.size
           else
             formatted_reference << " #{reference}"
@@ -254,11 +260,11 @@ module GetText
     end
 
     def format_flag_comment
-      format_comment("#,", flag)
+      format_comment(FLAG_MARK, flag)
     end
 
     def format_previous_comment
-      format_comment("#|", previous)
+      format_comment(PREVIOUS_COMMENT_MARK, previous)
     end
 
     def format_comment(mark, comment)

data/lib/gettext/tools/poparser.rb

@@ -17,11 +17,20 @@
 require 'racc/parser.rb'
 
 require "gettext/tools/po"
-require "gettext/tools/msgmerge"
+
+# 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', 123)
+module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 132)
   if GetText.respond_to?(:bindtextdomain)
     include GetText
     GetText.bindtextdomain("gettext")
@@ -184,11 +193,6 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 123)
     comment
   end
 
-  TRANSLATOR_COMMENT_MARK = "# "
-  EXTRACTED_COMMENT_MARK = "#."
-  FLAG_MARK = "#,"
-  PREVIOUS_MSGID_COMMENT_MARK = "#|"
-  REFERENCE_COMMENT_MARK = "#:"
   def on_comment(comment)
     @fuzzy = true if (/fuzzy/ =~ comment)
     if @data.instance_of?(PO) or
@@ -199,15 +203,15 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 123)
         mark = $1
         content = $2
         case mark
-        when TRANSLATOR_COMMENT_MARK
+        when POEntry::TRANSLATOR_COMMENT_MARK
           @translator_comments << content
-        when EXTRACTED_COMMENT_MARK
+        when POEntry::EXTRACTED_COMMENT_MARK
           @extracted_comments << content
-        when REFERENCE_COMMENT_MARK
+        when POEntry::REFERENCE_COMMENT_MARK
           @references << content
-        when FLAG_MARK
+        when POEntry::FLAG_MARK
           @flag << content
-        when PREVIOUS_MSGID_COMMENT_MARK
+        when POEntry::PREVIOUS_COMMENT_MARK
           @previous << content
         else
           @comments << comment

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "2.3.6"
+  VERSION = "2.3.7"
 end

data/po/ja/gettext.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-19 15:16+0900\n"
+"POT-Creation-Date: 2013-01-11 15:10+0900\n"
 "PO-Revision-Date: 2012-10-16 16:20+0900\n"
 "Last-Translator: Haruka Yoshihara <yoshihara@clear-code.com>\n"
 "Language-Team: Japanese\n"
@@ -38,7 +38,9 @@ msgid "Check these po/pot-files. It may have syntax errors or something wrong."
 msgstr "po/potファイルをチェックしてください。文法エラーもしくはその他のエラーがあるかもしれません。"
 
 #: ../lib/gettext/tools.rb:188
-msgid "`%{cmd}' can not be found. \nInstall GNU Gettext then set PATH or MSGMERGE_PATH correctly."
+msgid ""
+"`%{cmd}' can not be found. \n"
+"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
 msgstr ""
 "`%{cmd}'は見つかりませんでした。\n"
 "GNU Gettextをインストールし、環境変数PATHかMSGMERGE_PATHを正しく設定してください。"
@@ -56,19 +58,19 @@ msgid "Generate binary message catalog from textual translation description."
 msgstr "poファイルからバイナリのメッセージカタログファイル（moファイル）を生成します。"
 
 #: ../lib/gettext/tools/msgfmt.rb:89
-#: ../lib/gettext/tools/msgmerge.rb:483
+#: ../lib/gettext/tools/msgmerge.rb:488
 #: ../lib/gettext/tools/xgettext.rb:213
 msgid "write output to specified file"
 msgstr "出力ファイルを指定します"
 
 #: ../lib/gettext/tools/msgfmt.rb:93
-#: ../lib/gettext/tools/msgmerge.rb:494
+#: ../lib/gettext/tools/msgmerge.rb:499
 #: ../lib/gettext/tools/xgettext.rb:256
 msgid "display version information and exit"
 msgstr "バージョンを表示します"
 
 #: ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:88
-#: ../lib/gettext/tools/msgmerge.rb:478
+#: ../lib/gettext/tools/msgmerge.rb:483
 #: ../lib/gettext/tools/xgettext.rb:210
 msgid "Specific options:"
 msgstr "オプション："
@@ -90,7 +92,7 @@ msgid "Use LOCALE as target locale. If LOCALE is not specified, LOCALE is the cu
 msgstr "LOCALEとして指定された値をターゲットのロケールとして扱います。ロケールが指定されていない場合は、ユーザの現在のロケールを使用します。"
 
 #: ../lib/gettext/tools/msginit.rb:111
-#: ../lib/gettext/tools/msgmerge.rb:489
+#: ../lib/gettext/tools/msgmerge.rb:494
 msgid "Display this help and exit"
 msgstr "このヘルプを表示します"
 
@@ -122,19 +124,19 @@ msgstr "あなたのフルネームを入力してください"
 msgid "Please enter your email address"
 msgstr "あなたのメールアドレスを入力してください"
 
-#: ../lib/gettext/tools/msgmerge.rb:457
+#: ../lib/gettext/tools/msgmerge.rb:462
 msgid "definition po is not given."
 msgstr "poファイルが指定されていません。"
 
-#: ../lib/gettext/tools/msgmerge.rb:459
+#: ../lib/gettext/tools/msgmerge.rb:464
 msgid "reference pot is not given."
 msgstr "potファイルが指定されていません。"
 
-#: ../lib/gettext/tools/msgmerge.rb:467
+#: ../lib/gettext/tools/msgmerge.rb:472
 msgid "Usage: %s def.po ref.pot [-o output.pot]"
 msgstr "使用法: %s def.po ref.pot [-o output.pot]"
 
-#: ../lib/gettext/tools/msgmerge.rb:470
+#: ../lib/gettext/tools/msgmerge.rb:475
 msgid "Merges two Uniforum style .po files together. The def.po file is an existing PO file with translations. The ref.pot file is the last created PO file with up-to-date source references. ref.pot is generally created by rgettext."
 msgstr "2つの.poファイルをマージします。def.poファイルはすでにある翻訳済みのPOファイルです。ref.potは最新のPOファイルです。ref.potは通常xgettextから新たに生成されたものです。"
 
@@ -203,15 +205,18 @@ msgid "This message is from hellolib."
 msgstr ""
 
 #: ../samples/hello.rb:16
-msgid "Hello World\n"
+msgid ""
+"Hello World\n"
 msgstr ""
 
 #: ../samples/hello2.rb:18
-msgid "One is %{num}\n"
+msgid ""
+"One is %{num}\n"
 msgstr ""
 
 #: ../samples/hello2.rb:19
-msgid "Hello %{world}\n"
+msgid ""
+"Hello %{world}\n"
 msgstr ""
 
 #: ../samples/hello2.rb:19
@@ -219,7 +224,10 @@ msgid "World"
 msgstr ""
 
 #: ../samples/hello_glade2.glade:30
-msgid "first line\nsecond line\nthird line"
+msgid ""
+"first line\n"
+"second line\n"
+"third line"
 msgstr ""
 
 #: ../samples/hello_glade2.glade:54
@@ -243,8 +251,10 @@ msgid "Hello World"
 msgstr ""
 
 #: ../samples/hello_plural.rb:19
-msgid "There is an apple.\n"
-msgid_plural "There are %{num} apples.\n"
+msgid ""
+"There is an apple.\n"
+msgid_plural ""
+"There are %{num} apples.\n"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -291,7 +301,9 @@ msgid "	aaa"
 msgstr ""
 
 #: ../test/fixtures/_.rb:100
-msgid "Here document1\nHere document2\n"
+msgid ""
+"Here document1\n"
+"Here document2\n"
 msgstr ""
 
 #. This is a proper name.  See the gettext
@@ -317,15 +329,21 @@ msgid "This is a # including string."
 msgstr ""
 
 #: ../test/fixtures/_.rb:34 ../test/fixtures/N_.rb:14
-msgid "aaa\n"
+msgid ""
+"aaa\n"
 msgstr ""
 
 #: ../test/fixtures/_.rb:38 ../test/fixtures/N_.rb:18
-msgid "bbb\nccc"
+msgid ""
+"bbb\n"
+"ccc"
 msgstr ""
 
 #: ../test/fixtures/_.rb:42 ../test/fixtures/N_.rb:22
-msgid "bbb\nccc\nddd\n"
+msgid ""
+"bbb\n"
+"ccc\n"
+"ddd\n"
 msgstr ""
 
 #: ../test/fixtures/_.rb:53 ../test/fixtures/N_.rb:33
@@ -348,7 +366,9 @@ msgid "lllmmm"
 msgstr ""
 
 #: ../test/fixtures/_.rb:84 ../test/fixtures/N_.rb:64
-msgid "nnn\nooo"
+msgid ""
+"nnn\n"
+"ooo"
 msgstr ""
 
 #: ../test/fixtures/_.rb:88 ../test/fixtures/_.rb:92
@@ -368,7 +388,10 @@ msgid "normal text"
 msgstr ""
 
 #: ../test/fixtures/gladeparser.glade:50
-msgid "1st line\n2nd line\n3rd line"
+msgid ""
+"1st line\n"
+"2nd line\n"
+"3rd line"
 msgstr ""
 
 #: ../test/fixtures/gladeparser.glade:73
@@ -376,7 +399,9 @@ msgid "<span color=\"red\" weight=\"bold\" size=\"large\">markup </span>"
 msgstr ""
 
 #: ../test/fixtures/gladeparser.glade:94
-msgid "<span color=\"red\">1st line markup </span>\n<span color=\"blue\">2nd line markup</span>"
+msgid ""
+"<span color=\"red\">1st line markup </span>\n"
+"<span color=\"blue\">2nd line markup</span>"
 msgstr ""
 
 #: ../test/fixtures/gladeparser.glade:116
@@ -426,26 +451,41 @@ msgid "no data"
 msgstr ""
 
 #: ../test/fixtures/n_.rb:33
-msgid "bbb\n"
-msgid_plural "ccc2\nccc2"
+msgid ""
+"bbb\n"
+msgid_plural ""
+"ccc2\n"
+"ccc2"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../test/fixtures/n_.rb:37
-msgid "ddd\nddd"
-msgid_plural "ddd2\nddd2"
+msgid ""
+"ddd\n"
+"ddd"
+msgid_plural ""
+"ddd2\n"
+"ddd2"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../test/fixtures/n_.rb:42
-msgid "eee\neee\n"
-msgid_plural "eee2\neee2\n"
+msgid ""
+"eee\n"
+"eee\n"
+msgid_plural ""
+"eee2\n"
+"eee2\n"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../test/fixtures/n_.rb:48
-msgid "ddd\neee\n"
-msgid_plural "ddd\neee2"
+msgid ""
+"ddd\n"
+"eee\n"
+msgid_plural ""
+"ddd\n"
+"eee2"
 msgstr[0] ""
 msgstr[1] ""
 

data/src/poparser.ry

@@ -4,7 +4,7 @@
 #
 #  Copyright (C) 2002-2008 Masao Mutoh <mutomasa at gmail.com>
 #  Copyright (C) 2012 Kouhei Sutou <kou@clear-code.com>
-#  Copyright (C) 2012 Haruka Yoshihara <yoshihara@clear-code.com>
+#  Copyright (C) 2012-2013 Haruka Yoshihara <yoshihara@clear-code.com>
 #
 #  You may redistribute it and/or modify it under the same
 #  license terms as Ruby or LGPL.
@@ -118,7 +118,16 @@ end
 
 ---- header
 require "gettext/tools/po"
-require "gettext/tools/msgmerge"
+
+# For suppressing warning. PoData is deprecated and will be removed.
+module GetText
+  module Tools
+    class MsgMerge
+      class PoData
+      end
+    end
+  end
+end
 ---- inner
   if GetText.respond_to?(:bindtextdomain)
     include GetText
@@ -282,11 +291,6 @@ require "gettext/tools/msgmerge"
     comment
   end
 
-  TRANSLATOR_COMMENT_MARK = "# "
-  EXTRACTED_COMMENT_MARK = "#."
-  FLAG_MARK = "#,"
-  PREVIOUS_MSGID_COMMENT_MARK = "#|"
-  REFERENCE_COMMENT_MARK = "#:"
   def on_comment(comment)
     @fuzzy = true if (/fuzzy/ =~ comment)
     if @data.instance_of?(PO) or
@@ -297,15 +301,15 @@ require "gettext/tools/msgmerge"
         mark = $1
         content = $2
         case mark
-        when TRANSLATOR_COMMENT_MARK
+        when POEntry::TRANSLATOR_COMMENT_MARK
           @translator_comments << content
-        when EXTRACTED_COMMENT_MARK
+        when POEntry::EXTRACTED_COMMENT_MARK
           @extracted_comments << content
-        when REFERENCE_COMMENT_MARK
+        when POEntry::REFERENCE_COMMENT_MARK
           @references << content
-        when FLAG_MARK
+        when POEntry::FLAG_MARK
           @flag << content
-        when PREVIOUS_MSGID_COMMENT_MARK
+        when POEntry::PREVIOUS_COMMENT_MARK
           @previous << content
         else
           @comments << comment

data/test/tools/test_msgmerge.rb

@@ -332,45 +332,6 @@ EOE
       assert_equal("salut", merged_po["hello"].msgstr)
     end
 
-    def test_similar_msgstr_for_fuzzy
-      @po["helol"] = "bonjour"
-      @pot["hello"] = ""
-      merged_po = @merger.merge(@po, @pot)
-
-      assert_false(merged_po.has_key?("helol"))
-      assert_true(merged_po.has_key?("hello"))
-      assert_equal("bonjour", merged_po["hello"].msgstr)
-      assert_equal("fuzzy", merged_po["hello"].flag)
-    end
-
-    def test_nonexistent_msgctxt
-      @po["normal", "hello"] = generate_entry(:msgctxt => "normal",
-                                              :msgid => "hello",
-                                              :msgstr => "salut")
-      @pot["hello"] = generate_entry(:msgid => "hello",
-                                     :msgstr => "")
-      merged_po = @merger.merge(@po, @pot)
-
-      assert_false(merged_po.has_key?("normal", "hello"))
-      assert_true(merged_po.has_key?("hello"))
-      assert_equal("salut", merged_po["hello"].msgstr)
-      assert_equal("fuzzy", merged_po["hello"].flag)
-    end
-
-    def test_msgid_plural
-      @po["he"] = generate_entry(:msgid => "he",
-                                 :msgid_plural => "thye",
-                                 :msgstr => "il\000ils")
-      @pot["he"] = generate_entry(:msgid => "he",
-                                  :msgid_plural => "they",
-                                  :msgstr => "")
-      merged_po = @merger.merge(@po, @pot)
-
-      assert_equal("il\000ils", merged_po["he"].msgstr)
-      assert_equal("they", merged_po["he"].msgid_plural)
-      assert_equal("fuzzy", merged_po["he"].flag)
-    end
-
     def test_translator_comment
       @po["hello"] = generate_entry(:msgid => "hello",
                                     :msgstr => "bonjour",
@@ -429,19 +390,6 @@ EOE
       assert_equal("no-c-format", merged_po["hello"].flag)
     end
 
-    def test_fuzzy_flag
-      @po["hello"] = generate_entry(:msgid => "hello",
-                                    :msgstr => "bonjuor",
-                                    :flag => "fuzzy")
-
-      @pot["hello"] = generate_entry(:msgid => "hello",
-                                     :msgstr => "")
-
-      merged_po = @merger.merge(@po, @pot)
-      assert_equal("bonjuor", merged_po["hello"].msgstr)
-      assert_equal("fuzzy", merged_po["hello"].flag)
-    end
-
     def test_previous
       @po["hello"] = generate_entry(:msgid => "hello",
                                     :msgstr => "bonjour",
@@ -455,37 +403,103 @@ EOE
       assert_equal(nil, merged_po["hello"].previous)
     end
 
-    def test_fuzzy_header
-      @po[""] = generate_entry(:msgid => "",
-                               :msgstr => "header\nentry",
-                               :translator_comment => "header comment")
+    class TestAddNoFuzzy < self
+      def test_add_to_nontranslated_entry
+        @po["helol"] = generate_entry(:msgid => "helol",
+                                      :msgstr => nil)
+        @pot["hello"] = generate_entry(:msgid => "hello",
+                                       :msgstr => nil)
+        merged_po = @merger.merge(@po, @pot)
+        assert_true(merged_po.has_key?("hello"))
+        assert_nil(merged_po["hello"].flag)
+      end
 
-      @pot[""] = generate_entry(:msgid => "",
-                                :msgstr => "uninitialized\ncomment",
-                                :translator_comment => "uninitialized comment",
-                                :flag => "fuzzy")
+      def test_fuzzy_header
+        @po[""] = generate_entry(:msgid => "",
+                                 :msgstr => "header\nentry",
+                                 :translator_comment => "header comment")
 
-      merged_po = @merger.merge(@po, @pot)
-      assert_equal("header\nentry", merged_po[""].msgstr)
-      assert_equal("header comment", merged_po[""].translator_comment)
-      assert_equal(nil, merged_po[""].flag)
+        @pot[""] = generate_entry(:msgid => "",
+                                  :msgstr => "uninitialized\ncomment",
+                                  :translator_comment => "uninitialized comment",
+                                  :flag => "fuzzy")
+
+        merged_po = @merger.merge(@po, @pot)
+        assert_equal("header\nentry", merged_po[""].msgstr)
+        assert_equal("header comment", merged_po[""].translator_comment)
+        assert_equal(nil, merged_po[""].flag)
+      end
+
+      def test_fuzzy_header_including_pot_creation_date
+        creation_date_mark = "POT-Creation-Date: "
+        po_creation_date = "#{creation_date_mark}2012-11-15 08:15+0900"
+        pot_creation_date = "#{creation_date_mark}2012-11-20 14:15+0900"
+        @po[""] = generate_entry(:msgid => "",
+                                 :msgstr => po_creation_date,
+                                 :translator_comment => "header comment")
+
+        @pot[""] = generate_entry(:msgid => "",
+                                  :msgstr => pot_creation_date,
+                                  :translator_comment => "header comment",
+                                  :flag => "fuzzy")
+
+        merged_po = @merger.merge(@po, @pot)
+        assert_equal(pot_creation_date, merged_po[""].msgstr)
+      end
     end
 
-    def test_fuzzy_header_including_pot_creation_date
-      creation_date_mark = "POT-Creation-Date: "
-      po_creation_date = "#{creation_date_mark}2012-11-15 08:15+0900"
-      pot_creation_date = "#{creation_date_mark}2012-11-20 14:15+0900"
-      @po[""] = generate_entry(:msgid => "",
-                               :msgstr => po_creation_date,
-                               :translator_comment => "header comment")
+    class TestAddFuzzy < self
+      def test_nonexistent_msgctxt
+        @po["normal", "hello"] = generate_entry(:msgctxt => "normal",
+                                                :msgid => "hello",
+                                                :msgstr => "salut")
+        @pot["hello"] = generate_entry(:msgid => "hello",
+                                       :msgstr => "")
+        merged_po = @merger.merge(@po, @pot)
+
+        assert_false(merged_po.has_key?("normal", "hello"))
+        assert_true(merged_po.has_key?("hello"))
+        assert_equal("salut", merged_po["hello"].msgstr)
+        assert_equal("fuzzy", merged_po["hello"].flag)
+      end
 
-      @pot[""] = generate_entry(:msgid => "",
-                                :msgstr => pot_creation_date,
-                                :translator_comment => "header comment",
-                                :flag => "fuzzy")
+      def test_msgid_plural
+        @po["he"] = generate_entry(:msgid => "he",
+                                   :msgid_plural => "thye",
+                                   :msgstr => "il\000ils")
+        @pot["he"] = generate_entry(:msgid => "he",
+                                    :msgid_plural => "they",
+                                    :msgstr => "")
+        merged_po = @merger.merge(@po, @pot)
+
+        assert_equal("il\000ils", merged_po["he"].msgstr)
+        assert_equal("they", merged_po["he"].msgid_plural)
+        assert_equal("fuzzy", merged_po["he"].flag)
+      end
 
-      merged_po = @merger.merge(@po, @pot)
-      assert_equal(pot_creation_date, merged_po[""].msgstr)
+      def test_fuzzy_matching_entry
+        @po["helol"] = "bonjour"
+        @pot["hello"] = ""
+        merged_po = @merger.merge(@po, @pot)
+
+        assert_false(merged_po.has_key?("helol"))
+        assert_true(merged_po.has_key?("hello"))
+        assert_equal("bonjour", merged_po["hello"].msgstr)
+        assert_equal("fuzzy", merged_po["hello"].flag)
+      end
+
+      def test_merged_entry_from_fuzzy_entry
+        @po["hello"] = generate_entry(:msgid => "hello",
+                                      :msgstr => "bonjuor",
+                                      :flag => "fuzzy")
+
+        @pot["hello"] = generate_entry(:msgid => "hello",
+                                       :msgstr => "")
+
+        merged_po = @merger.merge(@po, @pot)
+        assert_equal("bonjuor", merged_po["hello"].msgstr)
+        assert_equal("fuzzy", merged_po["hello"].flag)
+      end
     end
 
     def test_obsolete_entry

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: locale
@@ -966,7 +966,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2516078036789009577
+      hash: 756291154754834137
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -975,7 +975,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2516078036789009577
+      hash: 756291154754834137
 requirements: []
 rubyforge_project: gettext
 rubygems_version: 1.8.23