glibc/catgets/xopen-msg.awk
Aurelien Jarno 56456a2aad intl/tst-gettext: fix failure with newest msgfmt
Since upstream gettext commit d13f165b83 (msgfmt: Remove
POT-Creation-Date field from the header in the output.), msgfmt does not
copy the POT-Creation-Date field in the header entry from the po file to
the mo file anymore. This breaks the assumption that we can test gettext
by comparing each message in the po files with the corresponding string
return by gettext. This makes the intl/tst-gettext to fail.

While it would have been possible to modify the po2test.awk script to
also strip the line POT-Creation-Date field when creating the msgs.h
file, it would not work with both the old and new msgfmt.

Instead create a tst-gettext-de.po file from de.po by removing the
POT-Creation-Date line. Another alternative would be to use a static
tst-gettext-de.po file, but I guess the reason for using de.po is to
also catch issues caused by newly added strings.

As tst-catgets also uses msg.h, it should also be updated. Instead of
using the new tst-gettext-de.po file, the patch modifies xopen-msg.awk
to avoid creating a second catgets->intl dependency.

Changelog:
	[BZ #21508]
	* catgets/xopen-msg.awk: Ignore POT-Creation-Date line.
	* intl/Makefile ($(objpfx)tst-gettext-de.po): Generate
	intl/tst-gettext-de.po from po/de.po by removing the
	POT-Creation-Date line.
	($(objpfx)msgs.h): Depend on $(objpfx)tst-gettext-de.po instead of
	../po/de.po.
	* intl/tst-gettext.sh: Use ${objpfx}tst-gettext-de.po instead of
	../po/de.po.
2018-02-18 18:16:05 +01:00

78 lines
2.3 KiB
Awk

# xopen-msg.awk - Convert Uniforum style .po file to X/Open style .msg file
# Copyright (C) 2012-2018 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
#
# The first directive in the .msg should be the definition of the
# message set number. We use always set number 1.
#
BEGIN {
print "$set 1 # Automatically created by xopen-msg.awk"
num = 0
}
#
# The .msg file contains, other then the .po file, only the translations
# but each given a unique ID. Starting from 1 and incrementing by 1 for
# each message we assign them to the messages.
# It is important that the .po file used to generate the ../intl/msg.h file
# (with po2test.awk) is the same as the one used here. (At least the order
# of declarations must not be changed.)
#
function output_message() {
# Ignore messages containing <PRI.*> which would have to be replaced
# by the correct format depending on the word size
if (msg && msg !~ /<PRI.*>/) {
if (msgtype == "msgid") {
# We copy the original message as a comment into the .msg file.
gsub(/\n/, "\n$ ", msg)
printf "$ Original Message: %s\n", msg
} else {
gsub(/\n/, "\\\n", msg)
printf "%d %s\n", ++num, msg
}
}
msg = 0
}
$1 ~ "msg(id|str)" {
# Output collected message
output_message()
# Collect next message
msgtype = $1
sub(/^msg(id|str)[ \t]*"/, "", $0)
sub(/"$/, "", $0)
msg = $0
next
}
/^"POT-Creation-Date: [0-9-]+ [0-9:+-]+\\n"/ {
# Ignore POT-Creation-Date to match what is done in intl/Makefile.
next
}
/^".*"/ {
# Append to current message
sub(/^"/, "", $0)
sub(/"$/, "", $0)
msg = msg "\n" $0
next
}
END {
# Output last collected message
output_message()
}