gettext 3.1.9 → 3.2.0

data/po/zh_TW/gettext.edit.po

@@ -39,11 +39,11 @@ msgstr ""
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:356 ../lib/gettext/tools/xgettext.rb:248
+#: ../lib/gettext/tools/msgcat.rb:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:361 ../lib/gettext/tools/xgettext.rb:248
 msgid "Specific options:"
 msgstr "特殊選項:"
 
-#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:364
+#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:369
 #, fuzzy
 msgid "Write output to specified file"
 msgstr "輸出到指定檔案"
@@ -52,23 +52,23 @@ msgstr "輸出到指定檔案"
 msgid "(default: the standard output)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:369 ../lib/gettext/tools/msgmerge.rb:388 ../lib/gettext/tools/xgettext.rb:302
+#: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:374 ../lib/gettext/tools/msgmerge.rb:393 ../lib/gettext/tools/xgettext.rb:302
 msgid "Sort output by msgid"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
+#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/msgmerge.rb:388
 msgid "Sort output by location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:377
+#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:382
 msgid "It is same as --sort-by-location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:371 ../lib/gettext/tools/msgmerge.rb:378
+#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383
 msgid "Just for GNU gettext's msgcat compatibility"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:370
+#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:375
 msgid "It is same as --sort-by-msgid"
 msgstr ""
 
@@ -96,11 +96,11 @@ msgstr ""
 msgid "Remove all comments"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:312
+#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:312
 msgid "Set output page width"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:404 ../lib/gettext/tools/xgettext.rb:318
+#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:409 ../lib/gettext/tools/xgettext.rb:318
 msgid "Break long message lines, longer than the output page width, into several lines"
 msgstr ""
 
@@ -112,7 +112,7 @@ msgstr ""
 msgid "Don't report warning messages"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:421
+#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:426
 msgid "Don't output obsolete entries"
 msgstr ""
 
@@ -177,7 +177,7 @@ msgstr ""
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:425
+#: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:430
 msgid "Display this help and exit"
 msgstr ""
 
@@ -212,32 +212,32 @@ msgstr ""
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:345
+#: ../lib/gettext/tools/msgmerge.rb:350
 msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:348
+#: ../lib/gettext/tools/msgmerge.rb:353
 #, fuzzy
 msgid "Merges two Uniforum style .po files together. The definition.po file is an existing PO file with translations. The reference.pot file is the last created PO file with up-to-date source references. The reference.pot is generally created by rxgettext."
 msgstr "合併兩同樣形式的 po 檔， def.po 檔是原來有翻譯的檔案，ref.pot 檔是經過原始碼更新過的新檔，ref.pot 一般是由rgettext 建立。"
 
-#: ../lib/gettext/tools/msgmerge.rb:359
+#: ../lib/gettext/tools/msgmerge.rb:364
 msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:393 ../lib/gettext/tools/xgettext.rb:307
+#: ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:307
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:415
+#: ../lib/gettext/tools/msgmerge.rb:420
 msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:416
+#: ../lib/gettext/tools/msgmerge.rb:421
 msgid "(enable)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:431
+#: ../lib/gettext/tools/msgmerge.rb:436
 #, fuzzy
 msgid "Display version information and exit"
 msgstr "秀出版本資訊後退出"

data/test/tools/test_msgmerge.rb

@@ -285,6 +285,18 @@ msgstr "bonjour"
         assert_equal("fuzzy", merged_po["hello"].flag)
       end
 
+      def test_fuzzy_matching_included_source
+        base_msgid = "hello"
+        new_msgid = base_msgid + ("!" * 10)
+        @po[base_msgid] = "bonjour"
+        @pot[new_msgid] = ""
+        merged_po = merge
+
+        puts merged_po
+        assert_equal("bonjour", merged_po[new_msgid].msgstr)
+        assert_equal("fuzzy", merged_po[new_msgid].flag)
+      end
+
       def test_merged_entry_from_fuzzy_entry
         @po["hello"] = generate_entry(:msgid => "hello",
                                       :msgstr => "bonjuor",
@@ -411,7 +423,7 @@ msgid "Hello"
 msgstr ""
 
 #: hello.rb:3
-msgid "Hello World"
+msgid "Good-bye"
 msgstr ""
 EOP
     end
@@ -462,7 +474,7 @@ msgid "World"
 msgstr "Translated World"
 
 #: hello.rb:3
-msgid "Hello World"
+msgid "Good-bye"
 msgstr ""
 EOP
         end
@@ -493,7 +505,7 @@ msgid "World"
 msgstr "Translated World"
 
 #: hello.rb:3
-msgid "Hello World"
+msgid "Good-bye"
 msgstr ""
           PO
         end
@@ -514,7 +526,7 @@ msgid "World"
 msgstr "Translated World"
 
 #: hello.rb:3
-msgid "Hello World"
+msgid "Good-bye"
 msgstr ""
         PO
       end
@@ -525,12 +537,12 @@ msgstr ""
                       @po_file_path, @pot_file_path)
         assert_equal(<<-PO, File.read(@po_file_path))
 #{po_header(@pot_formatted_time, @po_formatted_time)}
-#: hello.rb:1
-msgid "Hello"
+#: hello.rb:3
+msgid "Good-bye"
 msgstr ""
 
-#: hello.rb:3
-msgid "Hello World"
+#: hello.rb:1
+msgid "Hello"
 msgstr ""
 
 #: hello.rb:2
@@ -554,7 +566,7 @@ msgid "World"
 msgstr "Translated World"
 
 #: hello.rb:3
-msgid "Hello World"
+msgid "Good-bye"
 msgstr ""
         PO
       end
@@ -574,7 +586,7 @@ msgid "World"
 msgstr "Translated World"
 
 #: hello.rb:3
-msgid "Hello World"
+msgid "Good-bye"
 msgstr ""
         PO
       end
@@ -585,12 +597,12 @@ msgstr ""
                       @po_file_path, @pot_file_path)
         assert_equal(<<-PO, File.read(@po_file_path))
 #{po_header(@pot_formatted_time, @po_formatted_time)}
-#: hello.rb:1
-msgid "Hello"
+#: hello.rb:3
+msgid "Good-bye"
 msgstr ""
 
-#: hello.rb:3
-msgid "Hello World"
+#: hello.rb:1
+msgid "Hello"
 msgstr ""
 
 #: hello.rb:2
@@ -616,7 +628,7 @@ msgid "World"
 msgstr "Translated World"
 
 #: hello.rb:3
-msgid "Hello World"
+msgid "Good-bye"
 msgstr ""
         PO
       end
@@ -633,7 +645,7 @@ msgstr ""
 msgid "World"
 msgstr "Translated World"
 
-msgid "Hello World"
+msgid "Good-bye"
 msgstr ""
         PO
       end
@@ -647,7 +659,7 @@ msgid "Hello very long line! This line is very long. Yes! This line is very long
 msgstr ""
 
 #: hello.rb:3
-msgid "Hello World"
+msgid "Good-bye"
 msgstr ""
         POT
       end
@@ -655,8 +667,8 @@ msgstr ""
       def po_content
         <<-PO
 #: hello.rb:3
-msgid "Hello World"
-msgstr "Translated Hello World. This translation is very long. Yes! Very long translation!!!"
+msgid "Good-bye"
+msgstr "Translated Good-bye. This translation is very long. Yes! Very long translation!!!"
         PO
       end
 
@@ -671,10 +683,10 @@ msgid ""
 msgstr ""
 
 #: hello.rb:3
-msgid "Hello World"
+msgid "Good-bye"
 msgstr ""
-"Translated Hello World. This translation is very long. Yes! Very long translat"
-"ion!!!"
+"Translated Good-bye. This translation is very long. Yes! Very long translation"
+"!!!"
         PO
       end
 
@@ -690,10 +702,10 @@ msgid ""
 msgstr ""
 
 #: hello.rb:3
-msgid "Hello World"
+msgid "Good-bye"
 msgstr ""
-"Translated Hello World. This translation is very long. Yes! Very long "
-"translation!!!"
+"Translated Good-bye. This translation is very long. Yes! Very long tra"
+"nslation!!!"
         PO
       end
 
@@ -707,8 +719,8 @@ msgid "Hello very long line! This line is very long. Yes! This line is very long
 msgstr ""
 
 #: hello.rb:3
-msgid "Hello World"
-msgstr "Translated Hello World. This translation is very long. Yes! Very long translation!!!"
+msgid "Good-bye"
+msgstr "Translated Good-bye. This translation is very long. Yes! Very long translation!!!"
         PO
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.2.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: locale
@@ -146,10 +146,10 @@ email:
 - mutomasa at gmail.com
 executables:
 - rmsginit
-- rmsgcat
 - rmsgfmt
-- rmsgmerge
+- rmsgcat
 - rxgettext
+- rmsgmerge
 extensions: []
 extra_rdoc_files: []
 files:
@@ -1677,18 +1677,18 @@ signing_key:
 specification_version: 4
 summary: Gettext is a pure Ruby libary and tools to localize messages.
 test_files:
-- test/test_po.rb
-- test/test_po_parser.rb
-- test/test_text_domain.rb
-- test/test_gettext.rb
-- test/test_string.rb
-- test/test_text_domain_toplevel.rb
-- test/test_class_info.rb
+- test/test_locale_path.rb
 - test/test_parser.rb
-- test/test_thread.rb
+- test/test_class_info.rb
+- test/test_text_domain_toplevel.rb
+- test/test_po_entry.rb
+- test/test_text_domain.rb
 - test/test_mo.rb
+- test/test_string.rb
+- test/test_po.rb
+- test/test_gettext.rb
 - test/test_text_domain_bind.rb
+- test/test_thread.rb
 - test/test_text_domain_multi.rb
-- test/test_locale_path.rb
-- test/test_po_entry.rb
+- test/test_po_parser.rb
 has_rdoc: