gettext 3.0.2 → 3.0.3

data/lib/gettext/tools/task.rb

@@ -103,7 +103,18 @@ module GetText
       #
       # @return [String] Text domain
       attr_accessor :domain
+
+      # It is useful when you have multiple domains. You can define tasks
+      # for each domains by using different namespace prefix.
+      #
+      # It is `nil` by default. It means that tasks are defined at top
+      # level.
+      #
+      # TODO: example
+      #
+      # @return [String] Namespace prefix for tasks defined by this class.
       attr_accessor :namespace_prefix
+
       # @return [Array<String>] Command line options for extracting messages
       #   from sources.
       # @see GetText::Tools::XGetText

data/lib/gettext/tools/xgettext.rb

@@ -24,6 +24,7 @@ require "pathname"
 require "optparse"
 require "locale"
 require "gettext"
+require "gettext/po"
 
 module GetText
   module Tools
@@ -78,11 +79,12 @@ module GetText
         @input_files = nil
         @output = nil
 
-        @package_name = nil
-        @package_version = nil
-        @msgid_bugs_address = nil
-        @copyright_holder = nil
-        @output_encoding = nil
+        @package_name = "PACKAGE"
+        @package_version = "VERSION"
+        @msgid_bugs_address = ""
+        @copyright_holder = "THE PACKAGE'S COPYRIGHT HOLDER"
+        @copyright_year = "YEAR"
+        @output_encoding = "UTF-8"
 
         @parse_options = {}
 
@@ -146,7 +148,6 @@ module GetText
       def run(*options)  # :nodoc:
         check_command_line_options(*options)
 
-        @output_encoding ||= "UTF-8"
         pot = generate_pot(@input_files)
 
         if @output.is_a?(String)
@@ -181,9 +182,9 @@ module GetText
       def header_comment
         <<-COMMENT
 SOME DESCRIPTIVE TITLE.
-Copyright (C) YEAR #{@copyright_holder}
+Copyright (C) #{@copyright_year} #{@copyright_holder}
 This file is distributed under the same license as the #{@package_name} package.
-FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+FIRST AUTHOR <EMAIL@ADDRESS>, #{@copyright_year}.
 
        COMMENT
       end
@@ -232,11 +233,6 @@ Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;
 
         @input_files = input_files
         @output = output
-
-        @package_name ||= "PACKAGE"
-        @package_version ||= "VERSION"
-        @msgid_bugs_address ||= ""
-        @copyright_holder ||= "THE PACKAGE'S COPYRIGHT HOLDER"
       end
 
       def parse_arguments(*options) #:nodoc:
@@ -256,28 +252,39 @@ Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;
           output = out
         end
 
-        parser.on("--package-name=PACKAGE",
-                  _("set package name in output")) do |out|
-          @package_name = out
+        parser.on("--package-name=NAME",
+                  _("set package name in output"),
+                  "(#{@package_name})") do |name|
+          @package_name = name
         end
 
         parser.on("--package-version=VERSION",
-                  _("set package version in output")) do |out|
-          @package_version = out
+                  _("set package version in output"),
+                  "(#{@package_version})") do |version|
+          @package_version = version
         end
 
         parser.on("--msgid-bugs-address=EMAIL",
-                  _("set report address for msgid bugs")) do |out|
-          @msgid_bugs_address = out
+                  _("set report e-mail address for msgid bugs"),
+                  "(#{@msgid_bugs_address})") do |address|
+          @msgid_bugs_address = address
+        end
+
+        parser.on("--copyright-holder=HOLDER",
+                  _("set copyright holder in output"),
+                  "(#{@copyright_holder})") do |holder|
+          @copyright_holder = holder
         end
 
-        parser.on("--copyright-holder=STRING",
-                  _("set copyright holder in output")) do |out|
-          @copyright_holder = out
+        parser.on("--copyright-year=YEAR",
+                  _("set copyright year in output"),
+                  "(#{@copyright_year})") do |year|
+          @copyright_year = year
         end
 
         parser.on("--output-encoding=ENCODING",
-                  _("set encoding for output")) do |encoding|
+                  _("set encoding for output"),
+                  "(#{@output_encoding})") do |encoding|
           @output_encoding = encoding
         end
 

data/lib/gettext/version.rb

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

data/po/gettext.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 3.0.2\n"
+"Project-Id-Version: gettext 3.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-29 12:01+0900\n"
-"PO-Revision-Date: 2013-09-29 12:01+0900\n"
+"POT-Creation-Date: 2013-12-15 16:24+0900\n"
+"PO-Revision-Date: 2013-12-15 16:24+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -39,15 +39,15 @@ 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:266 ../lib/gettext/tools/xgettext.rb:252
+#: ../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:255
+#: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/xgettext.rb:251
 msgid "write output to specified file"
 msgstr ""
 
-#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:342
+#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:349
 msgid "display version information and exit"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgid ""
 " locale on your environment."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:317
+#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:374
 msgid "Display this help and exit"
 msgstr ""
 
@@ -109,11 +109,11 @@ msgstr ""
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:255
+#: ../lib/gettext/tools/msgmerge.rb:308
 msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:258
+#: ../lib/gettext/tools/msgmerge.rb:311
 msgid ""
 "Merges two Uniforum style .po files together. The definition.po file is an exi"
 "sting PO file with translations. The reference.pot file is the last created PO"
@@ -121,41 +121,49 @@ msgid ""
 "d by rxgettext."
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:269
+#: ../lib/gettext/tools/msgmerge.rb:322
 msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:274
+#: ../lib/gettext/tools/msgmerge.rb:327
 msgid "Write output to specified file"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:279 ../lib/gettext/tools/xgettext.rb:285
+#: ../lib/gettext/tools/msgmerge.rb:332 ../lib/gettext/tools/xgettext.rb:292
 msgid "Generate sorted output"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:284 ../lib/gettext/tools/xgettext.rb:290
+#: ../lib/gettext/tools/msgmerge.rb:337 ../lib/gettext/tools/xgettext.rb:297
 msgid "Sort output by file location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:289 ../lib/gettext/tools/xgettext.rb:295
+#: ../lib/gettext/tools/msgmerge.rb:342 ../lib/gettext/tools/xgettext.rb:302
 msgid "Sort output by msgid"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:294 ../lib/gettext/tools/xgettext.rb:300
+#: ../lib/gettext/tools/msgmerge.rb:347 ../lib/gettext/tools/xgettext.rb:307
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:299 ../lib/gettext/tools/xgettext.rb:305
+#: ../lib/gettext/tools/msgmerge.rb:352 ../lib/gettext/tools/xgettext.rb:312
 msgid "Set output page width"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:305 ../lib/gettext/tools/xgettext.rb:311
+#: ../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:323
+#: ../lib/gettext/tools/msgmerge.rb:369
+msgid "Disable fuzzy matching"
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:370
+msgid "(enable)"
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:380
 msgid "Display version information and exit"
 msgstr ""
 
@@ -163,79 +171,83 @@ msgstr ""
 msgid "`%{file}' is not glade-2.0 format."
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:64
+#: ../lib/gettext/tools/xgettext.rb:65
 msgid "'%{klass}' is ignored."
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:169
+#: ../lib/gettext/tools/xgettext.rb:170
 msgid "Error parsing %{path}"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:228
+#: ../lib/gettext/tools/xgettext.rb:229
 msgid "no input files"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:246
+#: ../lib/gettext/tools/xgettext.rb:242
 msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:249
+#: ../lib/gettext/tools/xgettext.rb:245
 msgid "Extract translatable strings from given input files."
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:260
+#: ../lib/gettext/tools/xgettext.rb:256
 msgid "set package name in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:265
+#: ../lib/gettext/tools/xgettext.rb:262
 msgid "set package version in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:270
-msgid "set report address for msgid bugs"
+#: ../lib/gettext/tools/xgettext.rb:268
+msgid "set report e-mail address for msgid bugs"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:275
+#: ../lib/gettext/tools/xgettext.rb:274
 msgid "set copyright holder in output"
 msgstr ""
 
 #: ../lib/gettext/tools/xgettext.rb:280
+msgid "set copyright year in output"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:286
 msgid "set encoding for output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:322
+#: ../lib/gettext/tools/xgettext.rb:329
 msgid "require the library before executing xgettext"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:327
+#: ../lib/gettext/tools/xgettext.rb:334
 msgid ""
 "If TAG is specified, place comment blocks starting with TAG and precedding key"
 "word lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:328
+#: ../lib/gettext/tools/xgettext.rb:335
 msgid ""
 "If TAG is not specified, place all comment blocks preceing keyword lines in ou"
 "tput file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:329
-msgid "no TAG"
+#: ../lib/gettext/tools/xgettext.rb:336
+msgid "(default: %s)"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:329
-msgid "(default: %s)"
+#: ../lib/gettext/tools/xgettext.rb:336
+msgid "no TAG"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:333
+#: ../lib/gettext/tools/xgettext.rb:340
 msgid "run in debugging mode"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:337
+#: ../lib/gettext/tools/xgettext.rb:344
 msgid "display this help and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:368
+#: ../lib/gettext/tools/xgettext.rb:375
 msgid ""
 "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't ret"
 "urns empty string but the header entry in po file."

data/test/test_locale_path.rb

@@ -25,7 +25,6 @@ require 'fixtures/simple'
 class TestLocalePath < Test::Unit::TestCase
   def setup
     GetText.locale = "ja_JP.eucJP"
-    GetText::LocalePath.clear
   end
 
   def teardown
@@ -78,12 +77,10 @@ class TestLocalePath < Test::Unit::TestCase
     path1 = File.join(topdir, "locale")
     path2 = File.join(topdir, "cgi", "locale")
 
-    GetText::LocalePath.memoize_clear
     ENV["GETTEXT_PATH"] = path1
     default_path_rules = GetText::LocalePath.default_path_rules
     assert_match(Regexp.compile(path1), default_path_rules[0])
 
-    GetText::LocalePath.memoize_clear
     ENV["GETTEXT_PATH"] = "#{path1},#{path2}"
     default_path_rules = GetText::LocalePath.default_path_rules
     assert_match(Regexp.compile(path1), default_path_rules[0])
@@ -92,7 +89,6 @@ class TestLocalePath < Test::Unit::TestCase
 
   class TestDefaultPathRules < self
     def test_load_path_untached
-      GetText::LocalePath.memoize_clear
       $LOAD_PATH.unshift("./lib")
       GetText::LocalePath.default_path_rules
       assert_equal($LOAD_PATH[0], "./lib")

data/test/test_po_entry.rb

@@ -274,23 +274,42 @@ EOE
       end
     end
 
-    def test_obsolete_comment
-      entry = GetText::POEntry.new(:normal)
-      entry.msgid = :last
-      obsolete_comment = <<-EOC
-# test.rb:10
-msgid "hello"
-msgstr "Salut"
-EOC
-      entry.comment = obsolete_comment
+    class TestObsoleteComment < self
+      def test_obsolete_comment
+        comment = <<-COMMENT.chomp
+#~ msgid "he"
+#~ msgstr "il"
+        COMMENT
 
-      expected_obsolete_comment = <<-EOC
-# test.rb:10
-#~ msgid "hello"
-#~ msgstr "Salut"
-EOC
+        assert_equal(<<-COMMENT, obsolete_entry(comment))
+#~ msgid "he"
+#~ msgstr "il"
+        COMMENT
+      end
+
+      def test_new_line_only
+        assert_equal("\n", obsolete_entry("\n"))
+      end
 
-      assert_equal(expected_obsolete_comment, entry.to_s)
+      def test_no_comment_mark
+        comment = <<-COMMENT.chomp
+msgid "he"
+msgstr "il"
+        COMMENT
+
+        assert_equal(<<-COMMENT, obsolete_entry(comment))
+#~ msgid "he"
+#~ msgstr "il"
+        COMMENT
+      end
+
+      private
+      def obsolete_entry(comment)
+        entry = GetText::POEntry.new(:normal)
+        entry.msgid = :last
+        entry.comment = comment
+        entry.to_s
+      end
     end
 
     def test_translator_comment
@@ -398,6 +417,64 @@ msgstr ""
     end
   end
 
+  class TestPredicate < self
+    class TestHeader < self
+      def test_empty_msgid
+        entry = GetText::POEntry.new(:normal)
+        entry.msgid = ""
+        assert_true(entry.header?)
+      end
+
+      def test_not_empty_msgid
+        entry = GetText::POEntry.new(:normal)
+        entry.msgid = "hello"
+        assert_false(entry.header?)
+      end
+
+      def test_msgctxt
+        entry = GetText::POEntry.new(:msgctxt)
+        entry.msgid = ""
+        entry.msgctxt = "context"
+        assert_false(entry.header?)
+      end
+
+      def test_plural
+        entry = GetText::POEntry.new(:plural)
+        entry.msgid = ""
+        entry.msgid_plural = ""
+        assert_false(entry.header?)
+      end
+    end
+
+    class TestObsolete < self
+      def test_last_msgid
+        entry = GetText::POEntry.new(:normal)
+        entry.msgid = :last
+        assert_true(entry.obsolete?)
+      end
+
+      def test_not_lasty_msgid
+        entry = GetText::POEntry.new(:normal)
+        entry.msgid = "hello"
+        assert_false(entry.obsolete?)
+      end
+
+      def test_msgctxt
+        entry = GetText::POEntry.new(:msgctxt)
+        entry.msgid = :last
+        entry.msgctxt = "context"
+        assert_false(entry.obsolete?)
+      end
+
+      def test_plural
+        entry = GetText::POEntry.new(:plural)
+        entry.msgid = :last
+        entry.msgid_plural = ""
+        assert_false(entry.obsolete?)
+      end
+    end
+  end
+
   class TestFormatter < self
     class TestEscape < self
       def test_backslash
@@ -458,6 +535,15 @@ msgstr ""
         MESSAGE
       end
 
+      def test_multilines_disable_wrap
+        message = "long\nline\n"
+        assert_equal(<<-MESSAGE, format_message(message, :max_line_width => 0))
+""
+"long\\n"
+"line\\n"
+        MESSAGE
+      end
+
       private
       def format_message(message, options={})
         formatter = GetText::POEntry::Formatter.new(@entry, options)