gettext 3.0.3 → 3.0.4

data/lib/gettext/tools/msginit.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
 #
 # License: Ruby's or LGPL
 #
@@ -178,7 +178,9 @@ module GetText
 
         pot[""] = @entry
         pot[""].translator_comment = @comment
-        pot[""].flag = pot[""].flag.gsub(/\Afuzzy\z/, "")
+        pot[""].flags = pot[""].flags.reject do |flag|
+          flag == "fuzzy"
+        end
         pot
       end
 

data/lib/gettext/tools/msgmerge.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012-2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2005-2009 Masao Mutoh
 # Copyright (C) 2005,2006 speakillof
 #
@@ -133,14 +133,14 @@ module GetText
             return merge_header(reference_entry, definition_entry)
           end
 
-          return definition_entry if definition_entry.flag == "fuzzy"
+          return definition_entry if definition_entry.fuzzy?
 
           entry = reference_entry
           entry.translator_comment = definition_entry.translator_comment
           entry.previous = nil
 
           unless definition_entry.msgid_plural == reference_entry.msgid_plural
-            entry.flag = "fuzzy"
+            entry.flags << "fuzzy"
           end
 
           entry.msgstr = definition_entry.msgstr
@@ -154,7 +154,7 @@ module GetText
             pot_creation_date = "POT-Creation-Date: #{create_date}"
             header.msgstr = header.msgstr.gsub(POT_DATE_RE, pot_creation_date)
           end
-          header.flag = nil
+          header.flags = []
           header
         end
 
@@ -170,7 +170,7 @@ module GetText
 
         def merge_fuzzy_entry(entry, fuzzy_entry)
           merged_entry = merge_entry(entry, fuzzy_entry)
-          merged_entry.flag = "fuzzy"
+          merged_entry.flags << "fuzzy"
           merged_entry
         end
 
@@ -272,7 +272,7 @@ module GetText
           @reference_po = nil
           @update = false
           @output = nil
-          @order = :references
+          @order = :reference
           @po_format_options = {
             :max_line_width => POEntry::Formatter::DEFAULT_MAX_LINE_WIDTH,
           }
@@ -329,18 +329,27 @@ module GetText
           end
 
           parser.on("--[no-]sort-output",
-                    _("Generate sorted output")) do |sort|
-            @order = sort ? :references : nil
+                    _("Sort output by msgid"),
+                    _("It is same as --sort-by-msgid"),
+                    _("Just for GNU gettext's msgcat compatibility")) do |sort|
+            @order = sort ? :msgid : nil
           end
 
-          parser.on("--[no-]sort-by-file",
-                    _("Sort output by file location")) do |sort_by_file|
-            @order = sort_by_file ? :references : :msgid
+          parser.on("--sort-by-file",
+                    _("Sort output by location"),
+                    _("It is same as --sort-by-location"),
+                    _("Just for GNU gettext's msgcat compatibility")) do
+            @order = :reference
           end
 
-          parser.on("--[no-]sort-by-msgid",
-                    _("Sort output by msgid")) do |sort_by_msgid|
-            @order = sort_by_msgid ? :msgid : :references
+          parser.on("--sort-by-location",
+                    _("Sort output by location")) do
+            @order = :reference
+          end
+
+          parser.on("--sort-by-msgid",
+                    _("Sort output by msgid")) do
+            @order = :msgid
           end
 
           parser.on("--[no-]location",

data/lib/gettext/tools/xgettext.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2003-2010  Masao Mutoh
 # Copyright (C) 2001,2002  Yasushi Shoji, Masao Mutoh
 #
@@ -212,7 +212,7 @@ Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;
         header.msgid = ""
         header.msgstr = header_content
         header.translator_comment = header_comment
-        header.flag = "fuzzy"
+        header.flags << "fuzzy"
 
         po = parse(paths)
         po.order = @po_order

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

data/po/gettext.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 3.0.3\n"
+"Project-Id-Version: gettext 3.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-15 16:24+0900\n"
-"PO-Revision-Date: 2013-12-15 16:24+0900\n"
+"POT-Creation-Date: 2014-02-02 22:41+0900\n"
+"PO-Revision-Date: 2014-02-02 22:41+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -26,6 +26,80 @@ msgstr ""
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
+#: ../lib/gettext/tools/msgcat.rb:168
+msgid "Usage: %s [OPTIONS] PO_FILE1 PO_FILE2 ..."
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:170
+msgid "Concatenates and merges PO files."
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:172 ../lib/gettext/tools/msgfmt.rb:86
+#: ../lib/gettext/tools/msginit.rb:89 ../lib/gettext/tools/msgmerge.rb:319
+#: ../lib/gettext/tools/xgettext.rb:248
+msgid "Specific options:"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:175 ../lib/gettext/tools/msgmerge.rb:327
+msgid "Write output to specified file"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:176
+msgid "(default: the standard output)"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:181 ../lib/gettext/tools/msgcat.rb:198
+#: ../lib/gettext/tools/msgmerge.rb:332 ../lib/gettext/tools/msgmerge.rb:351
+#: ../lib/gettext/tools/xgettext.rb:302
+msgid "Sort output by msgid"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:186 ../lib/gettext/tools/msgcat.rb:191
+#: ../lib/gettext/tools/msgmerge.rb:339 ../lib/gettext/tools/msgmerge.rb:346
+msgid "Sort output by location"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:192 ../lib/gettext/tools/msgmerge.rb:340
+msgid "It is same as --sort-by-location"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:193 ../lib/gettext/tools/msgcat.rb:200
+#: ../lib/gettext/tools/msgmerge.rb:334 ../lib/gettext/tools/msgmerge.rb:341
+msgid "Just for GNU gettext's msgcat compatibility"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:199 ../lib/gettext/tools/msgmerge.rb:333
+msgid "It is same as --sort-by-msgid"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:205
+msgid "Remove location information"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:210
+msgid "Remove all comments"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:215 ../lib/gettext/tools/msgmerge.rb:361
+#: ../lib/gettext/tools/xgettext.rb:312
+msgid "Set output page width"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:221 ../lib/gettext/tools/msgmerge.rb:367
+#: ../lib/gettext/tools/xgettext.rb:318
+msgid ""
+"Break long message lines, longer than the output page width, into several line"
+"s"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:232
+msgid "Ignore fuzzy entries"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:237
+msgid "Don't report warning messages"
+msgstr ""
+
 #: ../lib/gettext/tools/msgfmt.rb:65
 msgid "no input files specified."
 msgstr ""
@@ -38,11 +112,6 @@ msgstr ""
 msgid "Generate binary message catalog from textual translation description."
 msgstr ""
 
-#: ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:89
-#: ../lib/gettext/tools/msgmerge.rb:319 ../lib/gettext/tools/xgettext.rb:248
-msgid "Specific options:"
-msgstr ""
-
 #: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/xgettext.rb:251
 msgid "write output to specified file"
 msgstr ""
@@ -75,7 +144,7 @@ msgid ""
 " locale on your environment."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:374
+#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:383
 msgid "Display this help and exit"
 msgstr ""
 
@@ -101,11 +170,11 @@ msgstr ""
 msgid "file '%s' has already existed."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:200
+#: ../lib/gettext/tools/msginit.rb:202
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:229
+#: ../lib/gettext/tools/msginit.rb:231
 msgid "Please enter your email address"
 msgstr ""
 
@@ -125,45 +194,19 @@ msgstr ""
 msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:327
-msgid "Write output to specified file"
-msgstr ""
-
-#: ../lib/gettext/tools/msgmerge.rb:332 ../lib/gettext/tools/xgettext.rb:292
-msgid "Generate sorted output"
-msgstr ""
-
-#: ../lib/gettext/tools/msgmerge.rb:337 ../lib/gettext/tools/xgettext.rb:297
-msgid "Sort output by file location"
-msgstr ""
-
-#: ../lib/gettext/tools/msgmerge.rb:342 ../lib/gettext/tools/xgettext.rb:302
-msgid "Sort output by msgid"
-msgstr ""
-
-#: ../lib/gettext/tools/msgmerge.rb:347 ../lib/gettext/tools/xgettext.rb:307
+#: ../lib/gettext/tools/msgmerge.rb:356 ../lib/gettext/tools/xgettext.rb:307
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:352 ../lib/gettext/tools/xgettext.rb:312
-msgid "Set output page width"
-msgstr ""
-
-#: ../lib/gettext/tools/msgmerge.rb:358 ../lib/gettext/tools/xgettext.rb:318
-msgid ""
-"Break long message lines, longer than the output page width, into several line"
-"s"
-msgstr ""
-
-#: ../lib/gettext/tools/msgmerge.rb:369
+#: ../lib/gettext/tools/msgmerge.rb:378
 msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:370
+#: ../lib/gettext/tools/msgmerge.rb:379
 msgid "(enable)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:380
+#: ../lib/gettext/tools/msgmerge.rb:389
 msgid "Display version information and exit"
 msgstr ""
 
@@ -215,6 +258,14 @@ msgstr ""
 msgid "set encoding for output"
 msgstr ""
 
+#: ../lib/gettext/tools/xgettext.rb:292
+msgid "Generate sorted output"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:297
+msgid "Sort output by file location"
+msgstr ""
+
 #: ../lib/gettext/tools/xgettext.rb:329
 msgid "require the library before executing xgettext"
 msgstr ""
@@ -232,11 +283,11 @@ msgid ""
 msgstr ""
 
 #: ../lib/gettext/tools/xgettext.rb:336
-msgid "(default: %s)"
+msgid "no TAG"
 msgstr ""
 
 #: ../lib/gettext/tools/xgettext.rb:336
-msgid "no TAG"
+msgid "(default: %s)"
 msgstr ""
 
 #: ../lib/gettext/tools/xgettext.rb:340
@@ -258,19 +309,22 @@ msgid "This message is from hellolib."
 msgstr ""
 
 #: ../samples/hello.rb:17
-msgid "Hello World\n"
+msgid ""
+"Hello World\n"
 msgstr ""
 
 #: ../samples/hello2.rb:19
-msgid "One is %{num}\n"
+msgid ""
+"One is %{num}\n"
 msgstr ""
 
 #: ../samples/hello2.rb:20
-msgid "Hello %{world}\n"
+msgid "World"
 msgstr ""
 
 #: ../samples/hello2.rb:20
-msgid "World"
+msgid ""
+"Hello %{world}\n"
 msgstr ""
 
 #: ../samples/hello_glade2.glade:9 ../test/fixtures/gladeparser.glade:8
@@ -290,16 +344,18 @@ msgid "hello, gtk world"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World"
+msgid "Hello World2"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World2"
+msgid "Hello World"
 msgstr ""
 
 #: ../samples/hello_plural.rb:20
-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] ""
 
@@ -315,7 +371,8 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../test/fixtures/N_.rb:14 ../test/fixtures/_.rb:34
-msgid "aaa\n"
+msgid ""
+"aaa\n"
 msgstr ""
 
 #: ../test/fixtures/N_.rb:18 ../test/fixtures/_.rb:38
@@ -458,7 +515,8 @@ msgid "one line"
 msgstr ""
 
 #: ../test/fixtures/_/one_new_line.rb:28
-msgid "one new line\n"
+msgid ""
+"one new line\n"
 msgstr ""
 
 #: ../test/fixtures/backslash.rb:27
@@ -529,7 +587,8 @@ msgid "no data"
 msgstr ""
 
 #: ../test/fixtures/n_.rb:33
-msgid "bbb\n"
+msgid ""
+"bbb\n"
 msgid_plural ""
 "ccc2\n"
 "ccc2"

data/src/po_parser.ry

@@ -3,7 +3,7 @@
 #  po_parser.ry - ruby version of msgfmt
 #
 #  Copyright (C) 2002-2008 Masao Mutoh <mutomasa at gmail.com>
-#  Copyright (C) 2012-2013 Kouhei Sutou <kou@clear-code.com>
+#  Copyright (C) 2012-2014 Kouhei Sutou <kou@clear-code.com>
 #  Copyright (C) 2012-2013 Haruka Yoshihara <yoshihara@clear-code.com>
 #
 #  You may redistribute it and/or modify it under the same
@@ -162,7 +162,7 @@ require "gettext/po"
     @translator_comments = []
     @extracted_comments = []
     @references = []
-    @flag = []
+    @flags = []
     @previous = []
     @comments = []
     @data = data
@@ -237,7 +237,7 @@ require "gettext/po"
       entry = POEntry.new(type)
       entry.translator_comment = format_comment(@translator_comments)
       entry.extracted_comment = format_comment(@extracted_comments)
-      entry.flag = format_comment(@flag)
+      entry.flags = @flags
       entry.previous = format_comment(@previous)
       entry.references = @references
       entry.msgctxt = @msgctxt
@@ -257,7 +257,7 @@ require "gettext/po"
     @translator_comments = []
     @extracted_comments = []
     @references = []
-    @flag = []
+    @flags = []
     @previous = []
     @references = []
     @comments.clear
@@ -289,7 +289,7 @@ require "gettext/po"
         when POFormat::REFERENCE_COMMENT_MARK
           @references.concat(parse_references_line(content))
         when POFormat::FLAG_MARK
-          @flag << content
+          @flags.concat(parse_flags_line(content))
         when POFormat::PREVIOUS_COMMENT_MARK
           @previous << content
         else
@@ -356,5 +356,9 @@ require "gettext/po"
   def parse_references_line(line)
     line.split(/\s+/)
   end
+
+  def parse_flags_line(line)
+    line.split(/\s+/)
+  end
 ---- footer