From: Andrea Bolognani <abologna@redhat.com>
Date: Wed, 18 May 2022 09:34:40 +0000 (+0200)
Subject: po: Stop using 'glib' preset for i18n.gettext()
X-Git-Tag: v8.4.0-rc1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=325dd585fb81b642dfc335bea7ec7ae5d81161b1;p=thirdparty%2Flibvirt.git

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 <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

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 = [