mirror of
https://https.git.savannah.gnu.org/git/gettext.git
synced 2026-01-26 15:39:11 +00:00
msgmerge, msginit: Reject POT files with non-ASCII character, except in UTF-8, part 2.
* gettext-tools/src/msgl-charset.c (check_pot_charset): Tweak the new code.
This commit is contained in:
parent
bd94293cc8
commit
04d97e3918
@ -90,11 +90,10 @@ check_pot_charset (const msgdomain_list_ty *mdlp, const char *filename)
|
||||
_("%s: The present charset \"%s\" is not a portable encoding name."),
|
||||
filename, charset);
|
||||
if (!is_ascii_message_list (mlp)
|
||||
&& !(canon_charset == po_charset_ascii
|
||||
|| canon_charset == po_charset_utf8))
|
||||
&& canon_charset != po_charset_utf8)
|
||||
error (EXIT_FAILURE, 0,
|
||||
_("%s: The file contains non-ASCII characters but the present charset \"%s\" is not %s or %s."),
|
||||
filename, charset, "ASCII", "UTF-8");
|
||||
_("%s: The file contains non-ASCII characters but the present charset \"%s\" is not %s."),
|
||||
filename, charset, "UTF-8");
|
||||
|
||||
freea (charset);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user