gettext 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a719015e637ff305554d5775941be1006078d16f
-  data.tar.gz: cb71c4d53de15937a6bdb4d04b1fbfe14a4ba2e5
+  metadata.gz: 6741821529c4c4cc55c93e1efda37d839e71d0ca
+  data.tar.gz: 6aa173269374194da509a0cde6780ec93a5f5136
 SHA512:
-  metadata.gz: 1e9d8304087408af8eb5a43cae49fb7fbd160d5d35b73f0e46f7705881077ed3bba0e2a70887c1e78dd0eadbeb956e6b03eeafa84ae7e736cdac47867b90c3fc
-  data.tar.gz: 080412c95eb2def6cf02d5fd75aef62ad74a3321c61f96d83650fd2f4ca4b7bb727e5841a7380567fa5818107bf4c98280412150e2268a55200b3280480ff37d
+  metadata.gz: 6cbcf73043b03806e72f00c8e443d799a0ad39737fc3803113a8a56f71fb86dab1420d72f3c77b30cd394bb67c7a6b9c8c1154f7e2b83c89107957bdd724868b
+  data.tar.gz: fdd63569ac73c011c194b7ecd1818a689c945466193e11e2023621833fede5fb5ada42b78c4ba31c98241a596bfe5ffdc402fb4d4f4eea8af4d286a452058853

data/doc/text/news.md

@@ -1,5 +1,16 @@
 # News
 
+## <a id="3-1-1">3.1.1</a>: 2014-02-23
+
+### Improvements
+
+  * `rmsgcat`: Added `--remove-header-field` option.
+
+### Fixes
+
+  * `rmsgcat`: Fixed a bug that fuzzy entries are remained when
+    `--no-fuzzy` option is used with `--no-all-comments`.
+
 ## <a id="3-1-0">3.1.0</a>: 2014-02-09
 
 ### Improvements

data/lib/gettext/tools/msgcat.rb

@@ -82,7 +82,9 @@ module GetText
             else
               merged_entry = entry
             end
-            @output_po[*id] = merged_entry if merged_entry
+            next unless merged_entry
+            remove_header_fields!(merged_entry) if merged_entry.header?
+            @output_po[*id] = merged_entry
           end
         end
 
@@ -108,11 +110,27 @@ module GetText
         end
 
         def merge_fuzzy_entry(base_entry, new_entry)
-          if new_entry.fuzzy?
-            base_entry
-          else
-            new_entry
+          return new_entry unless new_entry.fuzzy?
+          return nil unless @config.include_fuzzy?
+          base_entry
+        end
+
+        def remove_header_fields!(header_entry)
+          remove_header_fields = @config.remove_header_fields
+          return if remove_header_fields.empty?
+          msgstr = header_entry.msgstr
+          return if msgstr.nil?
+
+          new_msgstr = ""
+          msgstr.each_line do |line|
+            case line
+            when /\A([\w\d\-_]+):/
+              name = $1
+              next if remove_header_fields.include?(name)
+            end
+            new_msgstr << line
           end
+          header_entry.msgstr = new_msgstr
         end
       end
 
@@ -145,6 +163,10 @@ module GetText
         # (see output_obsolete_entries?)
         attr_writer :output_obsolete_entries
 
+        # @return [Array<String>] The field names to be removed from
+        #   header entry.
+        attr_reader :remove_header_fields
+
         def initialize
           @pos = []
           @output = nil
@@ -155,6 +177,7 @@ module GetText
           @include_fuzzy = true
           @report_warning = true
           @output_obsolete_entries = true
+          @remove_header_fields = []
         end
 
         # @return [Boolean] Whether includes fuzzy entries or not.
@@ -259,6 +282,12 @@ module GetText
             @output_obsolete_entries = false
           end
 
+          parser.on("--remove-header-field=FIELD",
+                    _("Remove FIELD from header"),
+                    _("Specify this option multiple times to remove multiple header fields")) do |field|
+            @remove_header_fields << field
+          end
+
           parser
         end
       end

data/lib/gettext/version.rb

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

data/po/bg/gettext.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-09 21:39+0900\n"
+"POT-Creation-Date: 2014-02-23 22:20+0900\n"
 "PO-Revision-Date: 2013-09-20 22:58+0900\n"
 "Last-Translator: Sava Chankov <sava.chankov@gmail.com>\n"
 "Language-Team: Bulgarian <ruby-on-rails-bulgaria@googlegroups.com>\n"
@@ -20,88 +20,100 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/gettext/text_domain_manager.rb:149
+#: ../lib/gettext/text_domain_manager.rb:148
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Третият параметър е грешен: value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:155
+#: ../lib/gettext/text_domain_manager.rb:154
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:172
+#: ../lib/gettext/tools/msgcat.rb:207
 msgid "Usage: %s [OPTIONS] PO_FILE1 PO_FILE2 ..."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:174
+#: ../lib/gettext/tools/msgcat.rb:209
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:176 ../lib/gettext/tools/msgfmt.rb:86
-#: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:329
+#: ../lib/gettext/tools/msgcat.rb:211 ../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:337
+#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:342
 msgid "Write output to specified file"
 msgstr "изходът беше записан в зададения файл"
 
-#: ../lib/gettext/tools/msgcat.rb:180
+#: ../lib/gettext/tools/msgcat.rb:215
 msgid "(default: the standard output)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:185 ../lib/gettext/tools/msgcat.rb:202
-#: ../lib/gettext/tools/msgmerge.rb:342 ../lib/gettext/tools/msgmerge.rb:361
+#: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237
+#: ../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/msgmerge.rb:349 ../lib/gettext/tools/msgmerge.rb:356
+#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230
+#: ../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:350
+#: ../lib/gettext/tools/msgcat.rb:231 ../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/msgmerge.rb:344 ../lib/gettext/tools/msgmerge.rb:351
+#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239
+#: ../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:343
+#: ../lib/gettext/tools/msgcat.rb:238 ../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:244
 msgid "Remove location information"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:214
+#: ../lib/gettext/tools/msgcat.rb:249
 msgid "Remove all comments"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:219 ../lib/gettext/tools/msgmerge.rb:371
+#: ../lib/gettext/tools/msgcat.rb:254 ../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:377
+#: ../lib/gettext/tools/msgcat.rb:260 ../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:271
 msgid "Ignore fuzzy entries"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:241
+#: ../lib/gettext/tools/msgcat.rb:276
 msgid "Don't report warning messages"
 msgstr ""
 
+#: ../lib/gettext/tools/msgcat.rb:281 ../lib/gettext/tools/msgmerge.rb:399
+msgid "Don't output obsolete entries"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:286
+msgid "Remove FIELD from header"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:287
+msgid "Specify this option multiple times to remove multiple header fields"
+msgstr ""
+
 #: ../lib/gettext/tools/msgfmt.rb:65
 msgid "no input files specified."
 msgstr "няма зададени файлове"
@@ -158,7 +170,7 @@ msgstr ""
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:398
+#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:403
 msgid "Display this help and exit"
 msgstr ""
 
@@ -192,11 +204,11 @@ msgstr ""
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:318
+#: ../lib/gettext/tools/msgmerge.rb:323
 msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:321
+#: ../lib/gettext/tools/msgmerge.rb:326
 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"
@@ -207,27 +219,23 @@ msgstr ""
 "eference.pot е пресен PO файл с актуални референции към кода. reference.pot об"
 "икновено е създаден от rgettext."
 
-#: ../lib/gettext/tools/msgmerge.rb:332
+#: ../lib/gettext/tools/msgmerge.rb:337
 msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:366 ../lib/gettext/tools/xgettext.rb:307
+#: ../lib/gettext/tools/msgmerge.rb:371 ../lib/gettext/tools/xgettext.rb:307
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:388
+#: ../lib/gettext/tools/msgmerge.rb:393
 msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:389
-msgid "(enable)"
-msgstr ""
-
 #: ../lib/gettext/tools/msgmerge.rb:394
-msgid "Don't output obsolete entries"
+msgid "(enable)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:404
+#: ../lib/gettext/tools/msgmerge.rb:409
 msgid "Display version information and exit"
 msgstr "показване на версията и изход"
 
@@ -368,11 +376,11 @@ msgid "hello, gtk world"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World2"
+msgid "Hello World"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World"
+msgid "Hello World2"
 msgstr ""
 
 #: ../samples/hello_plural.rb:20

data/po/bs/gettext.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-09 21:39+0900\n"
+"POT-Creation-Date: 2014-02-23 22:20+0900\n"
 "PO-Revision-Date: 2013-09-20 22:58+0900\n"
 "Last-Translator: Sanjin Sehic <saserr@gmail.com>\n"
 "Language-Team: Bosnian <saserr@gmail.com>\n"
@@ -22,88 +22,100 @@ msgstr ""
 " && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../lib/gettext/text_domain_manager.rb:149
+#: ../lib/gettext/text_domain_manager.rb:148
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr ""
 
-#: ../lib/gettext/text_domain_manager.rb:155
+#: ../lib/gettext/text_domain_manager.rb:154
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:172
+#: ../lib/gettext/tools/msgcat.rb:207
 msgid "Usage: %s [OPTIONS] PO_FILE1 PO_FILE2 ..."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:174
+#: ../lib/gettext/tools/msgcat.rb:209
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:176 ../lib/gettext/tools/msgfmt.rb:86
-#: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:329
+#: ../lib/gettext/tools/msgcat.rb:211 ../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 "Specifične opcije:"
 
-#: ../lib/gettext/tools/msgcat.rb:179 ../lib/gettext/tools/msgmerge.rb:337
+#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:342
 msgid "Write output to specified file"
 msgstr "zapiši izlaz u specifičnu datoteku"
 
-#: ../lib/gettext/tools/msgcat.rb:180
+#: ../lib/gettext/tools/msgcat.rb:215
 msgid "(default: the standard output)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:185 ../lib/gettext/tools/msgcat.rb:202
-#: ../lib/gettext/tools/msgmerge.rb:342 ../lib/gettext/tools/msgmerge.rb:361
+#: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237
+#: ../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/msgmerge.rb:349 ../lib/gettext/tools/msgmerge.rb:356
+#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230
+#: ../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:350
+#: ../lib/gettext/tools/msgcat.rb:231 ../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/msgmerge.rb:344 ../lib/gettext/tools/msgmerge.rb:351
+#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239
+#: ../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:343
+#: ../lib/gettext/tools/msgcat.rb:238 ../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:244
 msgid "Remove location information"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:214
+#: ../lib/gettext/tools/msgcat.rb:249
 msgid "Remove all comments"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:219 ../lib/gettext/tools/msgmerge.rb:371
+#: ../lib/gettext/tools/msgcat.rb:254 ../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:377
+#: ../lib/gettext/tools/msgcat.rb:260 ../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:271
 msgid "Ignore fuzzy entries"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:241
+#: ../lib/gettext/tools/msgcat.rb:276
 msgid "Don't report warning messages"
 msgstr ""
 
+#: ../lib/gettext/tools/msgcat.rb:281 ../lib/gettext/tools/msgmerge.rb:399
+msgid "Don't output obsolete entries"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:286
+msgid "Remove FIELD from header"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:287
+msgid "Specify this option multiple times to remove multiple header fields"
+msgstr ""
+
 #: ../lib/gettext/tools/msgfmt.rb:65
 msgid "no input files specified."
 msgstr "nema ulaznih datoteka"
@@ -160,7 +172,7 @@ msgstr ""
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:398
+#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:403
 msgid "Display this help and exit"
 msgstr ""
 
@@ -194,11 +206,16 @@ msgstr ""
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:318
+#: ../lib/gettext/tools/msgmerge.rb:323
 msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:321
+#: ../lib/gettext/tools/msgmerge.rb:323
+#, fuzzy
+msgid "Display version information and exit"
+msgstr "prikaži informaciju o verziji i završi"
+
+#: ../lib/gettext/tools/msgmerge.rb:326
 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"
@@ -210,29 +227,20 @@ msgstr ""
 "teka sa najnovijim referencama koda. reference.pot je najčešće napravljen sa r"
 "gettext."
 
-#: ../lib/gettext/tools/msgmerge.rb:323
-#, fuzzy
-msgid "Display version information and exit"
-msgstr "prikaži informaciju o verziji i završi"
-
-#: ../lib/gettext/tools/msgmerge.rb:332
+#: ../lib/gettext/tools/msgmerge.rb:337
 msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:366 ../lib/gettext/tools/xgettext.rb:307
+#: ../lib/gettext/tools/msgmerge.rb:371 ../lib/gettext/tools/xgettext.rb:307
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:388
+#: ../lib/gettext/tools/msgmerge.rb:393
 msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:389
-msgid "(enable)"
-msgstr ""
-
 #: ../lib/gettext/tools/msgmerge.rb:394
-msgid "Don't output obsolete entries"
+msgid "(enable)"
 msgstr ""
 
 #: ../lib/gettext/tools/parser/glade.rb:32
@@ -374,11 +382,11 @@ msgid "hello, gtk world"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World2"
+msgid "Hello World"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World"
+msgid "Hello World2"
 msgstr ""
 
 #: ../samples/hello_plural.rb:20