ruby-gettext/gettext@a911b43 [master] msgcat: add --update-po-revision-date option

[Kouhei Sutou]

Author

Kouhei Sutou <k...@clear-code.com>

Date

2018-03-05 15:10:34 +0900 (Mon, 05 Mar 2018)

New Revision

a911b431184d365cd7dcfa7cc53ff8c93e7c2909

Message

msgcat: add --update-po-revision-date option

Modified files

• lib/gettext/tools/msgcat.rb
• test/tools/test_msgcat.rb

Modified: lib/gettext/tools/msgcat.rb (+41 -1) ===================================================================
... 83 84 85 86         87 88 89 ... 115 116 117                                             118 119 120 ... 163 164 165       166 167 168 ... 178 179 180   181 182 183 ... 195 196 197             198 199 200 ... 302 303 304           305 306 307	... 83 84 85   86 87 88 89 90 91 92 ... 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 ... 188 189 190 191 192 193 194 195 196 ... 206 207 208 209 210 211 212 ... 224 225 226 227 228 229 230 231 232 233 234 235 ... 337 338 339 340 341 342 343 344 345 346 347	@@ -83,7 +83,10 @@ module GetText merged_entry = entry end next unless merged_entry - remove_header_fields!(merged_entry) if merged_entry.header? + if merged_entry.header? + update_po_revision_date!(merged_entry) + remove_header_fields!(merged_entry) + end @output_po[*id] = merged_entry end end @@ -115,6 +118,28 @@ module GetText base_entry end + def update_po_revision_date!(header_entry) + return unless @config.update_po_revision_date? + + now = Time.now.strftime("%Y-%m-%d %H:%M%z") + po_revision_date_value = "PO-Revision-Date: #{now}\\n\n" + have_po_revision_date = false + new_msgstr = String.new + header_entry.msgstr.each_line do |line| + case line + when /\APO-Revision-Date:/ + new_msgstr << po_revision_date_value + have_po_revision_date = true + else + new_msgstr << line + end + end + unless have_po_revision_date + new_msgstr << po_revision_date_value + end + header_entry.msgstr = new_msgstr + end + def remove_header_fields!(header_entry) remove_header_fields = @config.remove_header_fields return if remove_header_fields.empty? @@ -163,6 +188,9 @@ module GetText # (see output_obsolete_entries?) attr_writer :output_obsolete_entries + # @see #update_po_revision_date? + attr_writer :update_po_revision_date + # @return [Array<String>] The field names to be removed from # header entry. attr_reader :remove_header_fields @@ -178,6 +206,7 @@ module GetText @report_warning = true @output_obsolete_entries = true @remove_header_fields = [] + @update_po_revision_date = false end # @return [Boolean] Whether includes fuzzy entries or not. @@ -195,6 +224,12 @@ module GetText @output_obsolete_entries end + # @return [Boolean] Whether updates PO-Revision-Date header + # field or not. + def update_po_revision_date? + @update_po_revision_date + end + def parse(command_line) parser = create_option_parser @pos = parser.parse(command_line) @@ -302,6 +337,11 @@ module GetText @output_obsolete_entries = false end + parser.on("--[no-]update-po-revision-date", + _("Update PO-Revision-Date header field")) do |update| + @update_po_revision_date = update + end + parser.on("--remove-header-field=FIELD", _("Remove FIELD from header"), _("Specify this option multiple times to remove multiple header fields")) do |field|

Modified: test/tools/test_msgcat.rb (+49 -1) ===================================================================
... 1   2 3 4 ... 527 528 529                                                                                                 530 531 532	...   1 2 3 4 ... 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580	@@ -1,4 +1,4 @@ -# Copyright (C) 2014 Kouhei Sutou <k...@clear-code.com> +# Copyright (C) 2014-2018 Kouhei Sutou <k...@clear-code.com> # # License: Ruby's or LGPL # @@ -527,6 +527,54 @@ msgstr "Bonjour" end end + class TestUpdatePORevisionDate < self + def setup + @po_revision_date = "2018-03-05 14:55+0900" + @po_source = <<-PO +msgid "" +msgstr "" +"Language: ja\\n" +"PO-Revision-Date: #{@po_revision_date}\\n" +"MIME-Version: 1.0\\n" + PO + end + + def test_default + po = run_msgcat([@po_source]) + assert_equal(<<-PO, normalize_result(po)) +msgid "" +msgstr "" +"Language: ja\\n" +"PO-Revision-Date: ORIGINAL-PO-REVISION-DATE\\n" +"MIME-Version: 1.0\\n" + PO + end + + def test_update_po_revision_date + po = run_msgcat([@po_source], "--update-po-revision-date") + assert_equal(<<-PO, normalize_result(po)) +msgid "" +msgstr "" +"Language: ja\\n" +"PO-Revision-Date: UPDATED-PO-REVISION-DATE\\n" +"MIME-Version: 1.0\\n" + PO + end + + private + def normalize_result(result) + result.gsub(/"PO-Revision-Date: (.+?)\\n"/) do + po_revision_date = $1 + if po_revision_date == @po_revision_date + new_po_revision_date = "ORIGINAL-PO-REVISION-DATE" + else + new_po_revision_date = "UPDATED-PO-REVISION-DATE" + end + "\"PO-Revision-Date: #{new_po_revision_date}\\n\"" + end + end + end + class TestRemoveHeaderField < self def setup @po_header = <<-PO