From 325dd585fb81b642dfc335bea7ec7ae5d81161b1 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Wed, 18 May 2022 11:34:40 +0200 Subject: [PATCH] po: Stop using 'glib' preset for i18n.gettext() Due to a bug in meson versions earlier than 0.60, the --add-comments that's part of the 'glib' preset and the --add-comments=TRANSLATORS: that we add ourselves might be passed to xgettext in the wrong order, resulting in a bunch of comments that we don't care about being added to the potfile. Most of the options included in the 'glib' preset are not applicable to libvirt anyway, so just stop using the preset and pass a few extra options explicitly instead. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- po/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/meson.build b/po/meson.build index f4d95f97fe..d13466bc06 100644 --- a/po/meson.build +++ b/po/meson.build @@ -14,6 +14,9 @@ potfiles = configure_file( i18n.gettext( meson.project_name(), args: [ + '--from-code=UTF-8', + '--keyword=_', + '--keyword=N_', '--add-comments=TRANSLATORS:', '--directory=@0@'.format(meson.source_root()), '--directory=@0@'.format(meson.build_root()), @@ -22,7 +25,6 @@ i18n.gettext( '--package-version=@0@'.format(meson.project_version()), '--sort-output', ], - preset: 'glib', ) potfiles_dep = [ -- 2.47.2