gettext 3.0.9 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b781a60677e7d0b803b8d28dc33a6f1b5e65a11
-  data.tar.gz: 86c661948b0dc4eaa89490d9af1360a792b50f5e
+  metadata.gz: a719015e637ff305554d5775941be1006078d16f
+  data.tar.gz: cb71c4d53de15937a6bdb4d04b1fbfe14a4ba2e5
 SHA512:
-  metadata.gz: af7c1f0755860c2d0a7923b987dd7a76a98e2872aad9eec36f545d0294fa5415c2f841f1c1b065f989c8171e75e8b9264290125fbdbf62b1b99b4965d7ba39f4
-  data.tar.gz: 410f8f7813b41da1bd30e44eb6d98f2e7c07c770bfa3e1602dd679b08391379711f4ea06d01a172a9765bc074313c7d0281f270fb6537a56e040222bd8d7f07a
+  metadata.gz: 1e9d8304087408af8eb5a43cae49fb7fbd160d5d35b73f0e46f7705881077ed3bba0e2a70887c1e78dd0eadbeb956e6b03eeafa84ae7e736cdac47867b90c3fc
+  data.tar.gz: 080412c95eb2def6cf02d5fd75aef62ad74a3321c61f96d83650fd2f4ca4b7bb727e5841a7380567fa5818107bf4c98280412150e2268a55200b3280480ff37d

data/doc/text/news.md

@@ -1,10 +1,16 @@
 # News
 
+## <a id="3-1-0">3.1.0</a>: 2014-02-09
+
+### Improvements
+
+  * `rmsgcat`: Added `--no-obsolete-entries` option.
+
 ## <a id="3-0-9">3.0.9</a>: 2014-02-09
 
 ### Improvements
 
-  * `rmsgimerge`: Improves fuzzy matching speed.
+  * `rmsgmerge`: Improves fuzzy matching speed.
 
 ## <a id="3-0-8">3.0.8</a>: 2014-02-09
 

data/lib/gettext/tools/msgcat.rb

@@ -73,6 +73,9 @@ module GetText
 
         def merge(po)
           po.each do |entry|
+            if entry.msgid == :last
+              next unless @config.output_obsolete_entries?
+            end
             id = [entry.msgctxt, entry.msgid]
             if @output_po.has_key?(*id)
               merged_entry = merge_entry(@output_po[*id], entry)
@@ -139,6 +142,9 @@ module GetText
         # (see report_warning?)
         attr_writer :report_warning
 
+        # (see output_obsolete_entries?)
+        attr_writer :output_obsolete_entries
+
         def initialize
           @pos = []
           @output = nil
@@ -148,6 +154,7 @@ module GetText
           }
           @include_fuzzy = true
           @report_warning = true
+          @output_obsolete_entries = true
         end
 
         # @return [Boolean] Whether includes fuzzy entries or not.
@@ -160,6 +167,11 @@ module GetText
           @report_warning
         end
 
+        # @return [Boolean] Whether outputs obsolete entries or not.
+        def output_obsolete_entries?
+          @output_obsolete_entries
+        end
+
         def parse(command_line)
           parser = create_option_parser
           @pos = parser.parse(command_line)
@@ -242,6 +254,11 @@ module GetText
             @report_warning = report_warning
           end
 
+          parser.on("--no-obsolete-entries",
+                    _("Don't output obsolete entries")) do
+            @output_obsolete_entries = false
+          end
+
           parser
         end
       end

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "3.0.9"
+  VERSION = "3.1.0"
 end

data/po/gettext.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 3.0.9\n"
+"Project-Id-Version: gettext 3.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-09 22:50+0900\n"
-"PO-Revision-Date: 2014-02-09 22:50+0900\n"
+"POT-Creation-Date: 2014-02-09 23:09+0900\n"
+"PO-Revision-Date: 2014-02-09 23:09+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -26,80 +26,84 @@ msgstr ""
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:172
+#: ../lib/gettext/tools/msgcat.rb:184
 msgid "Usage: %s [OPTIONS] PO_FILE1 PO_FILE2 ..."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:174
+#: ../lib/gettext/tools/msgcat.rb:186
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:176 ../lib/gettext/tools/msgfmt.rb:86
+#: ../lib/gettext/tools/msgcat.rb:188 ../lib/gettext/tools/msgfmt.rb:86
 #: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:334
 #: ../lib/gettext/tools/xgettext.rb:248
 msgid "Specific options:"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:179 ../lib/gettext/tools/msgmerge.rb:342
+#: ../lib/gettext/tools/msgcat.rb:191 ../lib/gettext/tools/msgmerge.rb:342
 msgid "Write output to specified file"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:180
+#: ../lib/gettext/tools/msgcat.rb:192
 msgid "(default: the standard output)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:185 ../lib/gettext/tools/msgcat.rb:202
+#: ../lib/gettext/tools/msgcat.rb:197 ../lib/gettext/tools/msgcat.rb:214
 #: ../lib/gettext/tools/msgmerge.rb:347 ../lib/gettext/tools/msgmerge.rb:366
 #: ../lib/gettext/tools/xgettext.rb:302
 msgid "Sort output by msgid"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:190 ../lib/gettext/tools/msgcat.rb:195
+#: ../lib/gettext/tools/msgcat.rb:202 ../lib/gettext/tools/msgcat.rb:207
 #: ../lib/gettext/tools/msgmerge.rb:354 ../lib/gettext/tools/msgmerge.rb:361
 msgid "Sort output by location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:196 ../lib/gettext/tools/msgmerge.rb:355
+#: ../lib/gettext/tools/msgcat.rb:208 ../lib/gettext/tools/msgmerge.rb:355
 msgid "It is same as --sort-by-location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:197 ../lib/gettext/tools/msgcat.rb:204
+#: ../lib/gettext/tools/msgcat.rb:209 ../lib/gettext/tools/msgcat.rb:216
 #: ../lib/gettext/tools/msgmerge.rb:349 ../lib/gettext/tools/msgmerge.rb:356
 msgid "Just for GNU gettext's msgcat compatibility"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:203 ../lib/gettext/tools/msgmerge.rb:348
+#: ../lib/gettext/tools/msgcat.rb:215 ../lib/gettext/tools/msgmerge.rb:348
 msgid "It is same as --sort-by-msgid"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:209
+#: ../lib/gettext/tools/msgcat.rb:221
 msgid "Remove location information"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:214
+#: ../lib/gettext/tools/msgcat.rb:226
 msgid "Remove all comments"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:219 ../lib/gettext/tools/msgmerge.rb:376
+#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:376
 #: ../lib/gettext/tools/xgettext.rb:312
 msgid "Set output page width"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgmerge.rb:382
+#: ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:382
 #: ../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:236
+#: ../lib/gettext/tools/msgcat.rb:248
 msgid "Ignore fuzzy entries"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:241
+#: ../lib/gettext/tools/msgcat.rb:253
 msgid "Don't report warning messages"
 msgstr ""
 
+#: ../lib/gettext/tools/msgcat.rb:258 ../lib/gettext/tools/msgmerge.rb:399
+msgid "Don't output obsolete entries"
+msgstr ""
+
 #: ../lib/gettext/tools/msgfmt.rb:65
 msgid "no input files specified."
 msgstr ""
@@ -218,10 +222,6 @@ msgstr ""
 msgid "(enable)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:399
-msgid "Don't output obsolete entries"
-msgstr ""
-
 #: ../lib/gettext/tools/msgmerge.rb:409
 msgid "Display version information and exit"
 msgstr ""

data/test/tools/test_msgcat.rb

@@ -401,4 +401,24 @@ msgstr "Bonjour"
       assert_empty(@stderr)
     end
   end
+
+  class TestObsoleteEntries < self
+    def setup
+      @po_fuzzy = <<-PO
+#~ msgid "Hello World"
+#~ msgstr "Bonjour"
+      PO
+    end
+
+    def test_default
+      assert_equal(<<-PO, run_msgcat([@po_fuzzy]))
+#~ msgid "Hello World"
+#~ msgstr "Bonjour"
+      PO
+    end
+
+    def test_no_obsolete_entries
+      assert_equal("", run_msgcat([@po_fuzzy], "--no-obsolete-entries"))
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.1.0
 platform: ruby
 authors:
 - Kouhei Sutou