gettext 2.3.9 → 3.0.0

data/lib/gettext/tools/xgettext.rb

@@ -66,8 +66,14 @@ module GetText
         end
       end
 
+      # @return [Hash<Symbol, Object>] Options for parsing. Options
+      #   are depend on each parser.
+      # @see RubyParser#parse
+      # @see ErbParser#parse
+      attr_reader :parse_options
+
       def initialize #:nodoc:
-        @parsers = @@default_parsers
+        @parsers = @@default_parsers.dup
 
         @input_files = nil
         @output = nil
@@ -77,6 +83,8 @@ module GetText
         @msgid_bugs_address = nil
         @copyright_holder = nil
         @output_encoding = nil
+
+        @parse_options = {}
       end
 
       # The parser object requires to have target?(path) and
@@ -88,7 +96,7 @@ module GetText
       #     def target?(path)
       #       File.extname(path) == ".foo"  # *.foo file only.
       #     end
-      #     def parse(path)
+      #     def parse(path, options={})
       #       po = []
       #       # Simple entry
       #       entry = POEntry.new(:normal)
@@ -119,7 +127,7 @@ module GetText
       #     end
       #   end
       #
-      #   GetText::XGetText.add_parser(FooParser.new)
+      #   GetText::Tools::XGetText.add_parser(FooParser.new)
       #
       # @param [#target?, #parse] parser
       #   It parses target file and extracts translate target entries from the
@@ -244,6 +252,13 @@ EOH
           require out
         end
 
+        parser.on("-c", "--add-comments[=TAG]",
+                  _("If TAG is specified, place comment blocks starting with TAG and precedding keyword lines in output file"),
+                  _("If TAG is not specified, place all comment blocks preceing keyword lines in output file"),
+                  _("(default: %s)") % _("no TAG")) do |tag|
+          @parse_options[:comment_tag] = tag
+        end
+
         parser.on("-d", "--debug", _("run in debugging mode")) do
           $DEBUG = true
         end
@@ -290,7 +305,12 @@ EOH
         @parsers.each do |parser|
           next unless parser.target?(path)
 
-          extracted_po = parser.parse(path)
+          # For backward compatibility
+          if parser.method(:parse).arity == 1 or @parse_options.empty?
+            extracted_po = parser.parse(path)
+          else
+            extracted_po = parser.parse(path, @parse_options)
+          end
           extracted_po.each do |po_entry|
             if po_entry.kind_of?(Array)
               po_entry = POEntry.new_from_ary(po_entry)
@@ -346,31 +366,8 @@ EOH
       end
 
       def encode(string)
-        if string.respond_to?(:encode)
-          string.encode(@output_encoding)
-        else
-          string # don't support
-        end
-      end
-    end
-  end
-end
-
-# This is the module for backward compatibility,
-# but GetText::Tools::XGetText.run should be used.
-module GetText
-  module RGetText
-    def run(paths=nil, out=STDOUT)
-      warn("Warning: This method is obsolete. " +
-             "Please use GetText::Tools::XGetText.run.")
-      if paths.nil?
-        GetText::Tools::XGetText.run(*ARGV)
-      elsif out == STDOUT
-        GetText::Tools::XGetText.run(paths)
-      else
-        GetText::Tools::XGetText.run("-o", out, paths)
+        string.encode(@output_encoding)
       end
     end
-    module_function :run
   end
 end

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "2.3.9"
+  VERSION = "3.0.0"
 end

data/po/gettext.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.9\n"
+"Project-Id-Version: gettext 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-21 09:37+0900\n"
-"PO-Revision-Date: 2013-04-21 09:37+0900\n"
+"POT-Creation-Date: 2013-08-31 20:20+0900\n"
+"PO-Revision-Date: 2013-08-31 20:20+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -18,6 +18,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: ../lib/gettext/text_domain_manager.rb:148
+msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
+msgstr ""
+
+#: ../lib/gettext/text_domain_manager.rb:154
+msgid "ngettext: 3rd parameter should be a number, not nil."
+msgstr ""
+
 #: ../lib/gettext/tools/msgfmt.rb:65
 msgid "no input files specified."
 msgstr ""
@@ -31,41 +39,41 @@ msgid "Generate binary message catalog from textual translation description."
 msgstr ""
 
 #: ../lib/gettext/tools/msgfmt.rb:86
-#: ../lib/gettext/tools/msgmerge.rb:490
+#: ../lib/gettext/tools/msgmerge.rb:271
 #: ../lib/gettext/tools/msginit.rb:88
-#: ../lib/gettext/tools/xgettext.rb:210
+#: ../lib/gettext/tools/xgettext.rb:218
 msgid "Specific options:"
 msgstr ""
 
 #: ../lib/gettext/tools/msgfmt.rb:89
-#: ../lib/gettext/tools/msgmerge.rb:495
-#: ../lib/gettext/tools/xgettext.rb:213
+#: ../lib/gettext/tools/msgmerge.rb:276
+#: ../lib/gettext/tools/xgettext.rb:221
 msgid "write output to specified file"
 msgstr ""
 
 #: ../lib/gettext/tools/msgfmt.rb:93
-#: ../lib/gettext/tools/msgmerge.rb:506
-#: ../lib/gettext/tools/xgettext.rb:256
+#: ../lib/gettext/tools/msgmerge.rb:287
+#: ../lib/gettext/tools/xgettext.rb:271
 msgid "display version information and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:469
+#: ../lib/gettext/tools/msgmerge.rb:250
 msgid "definition po is not given."
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:471
+#: ../lib/gettext/tools/msgmerge.rb:252
 msgid "reference pot is not given."
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:479
+#: ../lib/gettext/tools/msgmerge.rb:260
 msgid "Usage: %s def.po ref.pot [-o output.pot]"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:482
+#: ../lib/gettext/tools/msgmerge.rb:263
 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 ""
 
-#: ../lib/gettext/tools/msgmerge.rb:501
+#: ../lib/gettext/tools/msgmerge.rb:282
 #: ../lib/gettext/tools/msginit.rb:111
 msgid "Display this help and exit"
 msgstr ""
@@ -118,91 +126,83 @@ msgstr ""
 msgid "'%{klass}' is ignored."
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:175
+#: ../lib/gettext/tools/xgettext.rb:183
 msgid "Error parsing %{path}"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:186
+#: ../lib/gettext/tools/xgettext.rb:194
 msgid "no input files"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:204
+#: ../lib/gettext/tools/xgettext.rb:212
 msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:207
+#: ../lib/gettext/tools/xgettext.rb:215
 msgid "Extract translatable strings from given input files."
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:218
+#: ../lib/gettext/tools/xgettext.rb:226
 msgid "set package name in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:223
+#: ../lib/gettext/tools/xgettext.rb:231
 msgid "set package version in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:228
+#: ../lib/gettext/tools/xgettext.rb:236
 msgid "set report address for msgid bugs"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:233
+#: ../lib/gettext/tools/xgettext.rb:241
 msgid "set copyright holder in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:238
+#: ../lib/gettext/tools/xgettext.rb:246
 msgid "set encoding for output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:243
-msgid "require the library before executing xgettext"
-msgstr ""
-
-#: ../lib/gettext/tools/xgettext.rb:247
-msgid "run in debugging mode"
-msgstr ""
-
 #: ../lib/gettext/tools/xgettext.rb:251
-msgid "display this help and exit"
+msgid "require the library before executing xgettext"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:300
-msgid "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't returns empty string but the header entry in po file."
+#: ../lib/gettext/tools/xgettext.rb:256
+msgid "If TAG is specified, place comment blocks starting with TAG and precedding keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/parser/glade.rb:76
-msgid "`%{file}' is not glade-2.0 format."
+#: ../lib/gettext/tools/xgettext.rb:257
+msgid "If TAG is not specified, place all comment blocks preceing keyword lines in output file"
 msgstr ""
 
-#: ../lib/gettext/runtime/textdomain_manager.rb:148
-msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
+#: ../lib/gettext/tools/xgettext.rb:258
+msgid "(default: %s)"
 msgstr ""
 
-#: ../lib/gettext/runtime/textdomain_manager.rb:154
-msgid "ngettext: 3rd parameter should be a number, not nil."
+#: ../lib/gettext/tools/xgettext.rb:258
+msgid "no TAG"
 msgstr ""
 
-#: ../lib/gettext/tools.rb:81
-msgid "Failed to merge with %{defpo}"
+#: ../lib/gettext/tools/xgettext.rb:262
+msgid "run in debugging mode"
 msgstr ""
 
-#: ../lib/gettext/tools.rb:82
-msgid "New .pot was copied to %{failed_filename}"
+#: ../lib/gettext/tools/xgettext.rb:266
+msgid "display this help and exit"
 msgstr ""
 
-#: ../lib/gettext/tools.rb:83
-msgid "Check these po/pot-files. It may have syntax errors or something wrong."
+#: ../lib/gettext/tools/xgettext.rb:320
+msgid "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't returns empty string but the header entry in po file."
 msgstr ""
 
-#: ../lib/gettext/tools.rb:188
-msgid "`%{cmd}' cannot be found. \\nInstall GNU Gettext then set PATH or MSGMERGE_PATH correctly."
+#: ../lib/gettext/tools/parser/glade.rb:32
+msgid "`%{file}' is not glade-2.0 format."
 msgstr ""
 
-#: ../samples/hello_gtk2.rb:22
+#: ../samples/hello_gtk2.rb:25
 msgid "hello, gtk world"
 msgstr ""
 
-#: ../samples/hello_tk.rb:15
+#: ../samples/hello_tk.rb:16
 msgid "hello, tk world"
 msgstr ""
 
@@ -218,14 +218,17 @@ msgstr ""
 msgid "Hello World2"
 msgstr ""
 
-#: ../samples/hello_plural.rb:19
-msgid "There is an apple.\\n"
-msgid_plural "There are %{num} apples.\\n"
+#: ../samples/hello_plural.rb:20
+msgid ""
+"There is an apple.\n"
+msgid_plural ""
+"There are %{num} apples.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../samples/hello.rb:16
-msgid "Hello World\\n"
+#: ../samples/hello.rb:17
+msgid ""
+"Hello World\n"
 msgstr ""
 
 #: ../samples/hello_glade2.glade:9 ../test/fixtures/gladeparser.glade:8
@@ -240,22 +243,24 @@ msgstr ""
 msgid "<Hello world>"
 msgstr ""
 
-#: ../samples/hello2.rb:18
-msgid "One is %{num}\\n"
+#: ../samples/hello2.rb:19
+msgid ""
+"One is %{num}\n"
 msgstr ""
 
-#: ../samples/hello2.rb:19
-msgid "Hello %{world}\\n"
+#: ../samples/hello2.rb:20
+msgid ""
+"Hello %{world}\n"
 msgstr ""
 
-#: ../samples/hello2.rb:19
+#: ../samples/hello2.rb:20
 msgid "World"
 msgstr ""
 
-#: ../test/test_textdomain_toplevel.rb:9
-#: ../test/test_textdomain_toplevel.rb:15
-#: ../test/test_textdomain_toplevel.rb:18
-#: ../test/test_textdomain_toplevel.rb:23 ../test/test_gettext.rb:64
+#: ../test/test_text_domain_toplevel.rb:9
+#: ../test/test_text_domain_toplevel.rb:15
+#: ../test/test_text_domain_toplevel.rb:18
+#: ../test/test_text_domain_toplevel.rb:23 ../test/test_gettext.rb:64
 #: ../test/test_gettext.rb:297 ../test/test_gettext.rb:299
 #: ../test/test_gettext.rb:302 ../test/test_gettext.rb:306
 #: ../test/test_gettext.rb:309 ../test/test_gettext.rb:322
@@ -263,16 +268,16 @@ msgstr ""
 #: ../test/test_gettext.rb:336 ../test/test_gettext.rb:339
 #: ../test/test_gettext.rb:351 ../test/test_gettext.rb:358
 #: ../test/test_thread.rb:23 ../test/fixtures/simple.rb:10
-#: ../test/fixtures/multi_textdomain.rb:11
-#: ../test/fixtures/multi_textdomain.rb:24
-#: ../test/fixtures/multi_textdomain.rb:43
-#: ../test/fixtures/multi_textdomain.rb:50
-#: ../test/fixtures/multi_textdomain.rb:62
-#: ../test/fixtures/multi_textdomain.rb:75
-#: ../test/fixtures/multi_textdomain.rb:91
-#: ../test/fixtures/multi_textdomain.rb:104
-#: ../test/fixtures/multi_textdomain.rb:108
-#: ../test/fixtures/multi_textdomain.rb:128
+#: ../test/fixtures/multi_text_domain.rb:11
+#: ../test/fixtures/multi_text_domain.rb:24
+#: ../test/fixtures/multi_text_domain.rb:43
+#: ../test/fixtures/multi_text_domain.rb:50
+#: ../test/fixtures/multi_text_domain.rb:62
+#: ../test/fixtures/multi_text_domain.rb:75
+#: ../test/fixtures/multi_text_domain.rb:91
+#: ../test/fixtures/multi_text_domain.rb:104
+#: ../test/fixtures/multi_text_domain.rb:108
+#: ../test/fixtures/multi_text_domain.rb:128
 msgid "language"
 msgstr ""
 
@@ -280,12 +285,12 @@ msgstr ""
 msgid "a translation"
 msgstr ""
 
-#: ../test/test_gettext.rb:53 ../test/fixtures/multi_textdomain.rb:14
-#: ../test/fixtures/multi_textdomain.rb:27
-#: ../test/fixtures/multi_textdomain.rb:54
-#: ../test/fixtures/multi_textdomain.rb:65
-#: ../test/fixtures/multi_textdomain.rb:78
-#: ../test/fixtures/multi_textdomain.rb:116
+#: ../test/test_gettext.rb:53 ../test/fixtures/multi_text_domain.rb:14
+#: ../test/fixtures/multi_text_domain.rb:27
+#: ../test/fixtures/multi_text_domain.rb:54
+#: ../test/fixtures/multi_text_domain.rb:65
+#: ../test/fixtures/multi_text_domain.rb:78
+#: ../test/fixtures/multi_text_domain.rb:116
 msgid "LANGUAGE"
 msgstr ""
 
@@ -368,26 +373,41 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../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] ""
 
@@ -449,7 +469,7 @@ msgid_plural "rrr"
 msgstr[0] ""
 msgstr[1] ""
 
-#. please provide translations for all
+#. TRANSLATORS:please provide translations for all
 #. the plural forms!
 #: ../test/fixtures/n_.rb:97
 msgid "comment"
@@ -457,10 +477,54 @@ msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../test/fixtures/_/double_quote_in_double_quote.rb:28
+msgid "double \"quote\" in double quote"
+msgstr ""
+
+#: ../test/fixtures/_/multiple_same_messages.rb:28
+#: ../test/fixtures/_/multiple_same_messages.rb:32
+msgid "multiple same messages"
+msgstr ""
+
+#: ../test/fixtures/_/double_quote_in_single_quote.rb:28
+msgid "double \"quote\" in single quote"
+msgstr ""
+
+#: ../test/fixtures/_/multiple_messages_in_same_line.rb:28
+msgid "multiple"
+msgstr ""
+
+#: ../test/fixtures/_/multiple_messages_in_same_line.rb:28
+msgid "in same line"
+msgstr ""
+
+#: ../test/fixtures/_/multiple_lines_literal.rb:28
+msgid ""
+"multiple\n"
+"lines\n"
+"literal\n"
+msgstr ""
+
+#:
+#: ../test/fixtures/_/literal_concatenation_with_continuation_line.rb:28
+msgid "literal concatenation with continuation line"
+msgstr ""
+
+#: ../test/fixtures/_/middle_new_line.rb:28
+msgid ""
+"middle\n"
+"new line"
+msgstr ""
+
 #: ../test/fixtures/_/one_line.rb:28
 msgid "one line"
 msgstr ""
 
+#: ../test/fixtures/_/one_new_line.rb:28
+msgid ""
+"one new line\n"
+msgstr ""
+
 #: ../test/fixtures/backslash.rb:27
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
@@ -545,15 +609,21 @@ msgid "untranslated"
 msgstr ""
 
 #: ../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
-msgid "bbb\\nccc"
+msgid ""
+"bbb\n"
+"ccc"
 msgstr ""
 
 #: ../test/fixtures/N_.rb:22 ../test/fixtures/_.rb:42
-msgid "bbb\\nccc\\nddd\\n"
+msgid ""
+"bbb\n"
+"ccc\n"
+"ddd\n"
 msgstr ""
 
 #: ../test/fixtures/N_.rb:29 ../test/fixtures/N_.rb:33
@@ -574,7 +644,9 @@ msgid "lllmmm"
 msgstr ""
 
 #: ../test/fixtures/N_.rb:64 ../test/fixtures/_.rb:84
-msgid "nnn\\nooo"
+msgid ""
+"nnn\n"
+"ooo"
 msgstr ""
 
 #: ../test/fixtures/gladeparser.glade:29
@@ -611,10 +683,12 @@ msgid "\\taaa"
 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
+#. TRANSLATORS: This is a proper name.  See the gettext
 #. manual, section Names.  Note this is actually a non-ASCII
 #. name: The first name is (with Unicode escapes)
 #. "Fran\u00e7ois" or (with HTML entities) "Fran&ccedil;ois".
@@ -636,7 +710,7 @@ msgstr ""
 msgid "This is a # including string."
 msgstr ""
 
-#: ../test/fixtures/multi_textdomain.rb:120
+#: ../test/fixtures/multi_text_domain.rb:120
 msgid "no data"
 msgstr ""
 
@@ -664,7 +738,7 @@ msgstr ""
 msgid "BBB"
 msgstr ""
 
-#. please translate 'name' in the context of 'program'.
+#. TRANSLATORS:please translate 'name' in the context of 'program'.
 #. Hint: the translation should NOT contain the translation of 'program'.
 #: ../test/fixtures/p_.rb:55
 msgctxt "program"