]> git.ipfire.org Git - thirdparty/gettext.git/commit
xgettext: Avoid error 'present charset "CHARSET" is not a portable encoding name...
authorBruno Haible <bruno@clisp.org>
Sat, 16 Sep 2023 22:18:47 +0000 (00:18 +0200)
committerBruno Haible <bruno@clisp.org>
Sat, 16 Sep 2023 22:19:13 +0000 (00:19 +0200)
commit0b0047d6318cb5dde02a8d5e2e2ad208c9a5c694
tree7bdb3fc7429bff11dd753ac5756d5c961541dbde
parenta5dc9745ce9559b2280887e9e1487a98a1a0414f
xgettext: Avoid error 'present charset "CHARSET" is not a portable encoding name' when possible.

Reported by Arsen Arsenović <arsen@aarsen.me>
at <https://savannah.gnu.org/bugs/?64490>.

This changes the behaviour back to the one from gettext 0.21.1, where this
xgettext invocation produced just a warning.

* gettext-tools/src/msgl-iconv.c (iconv_message_list_internal): Don't give an
error when a PO file has a header entry with charset=CHARSET and is entirely
ASCII.
* gettext-tools/src/msgl-cat.c (catenate_msgdomain_list): Likewise.
* gettext-tools/tests/xgettext-combine-1: New file.
* gettext-tools/tests/xgettext-combine-2: New file.
* gettext-tools/tests/xgettext-combine-3: New file.
* gettext-tools/tests/Makefile.am (TESTS): Add them.
gettext-tools/src/msgl-cat.c
gettext-tools/src/msgl-iconv.c
gettext-tools/tests/Makefile.am
gettext-tools/tests/xgettext-combine-1 [new file with mode: 0755]
gettext-tools/tests/xgettext-combine-2 [new file with mode: 0755]
gettext-tools/tests/xgettext-combine-3 [new file with mode: 0755]