Description: Fix broken i18n support
 Upstream's migration to meson, prior to the repository being archived, broke
 i18n support, such that starting connman-gtk with any supported LC_LANG
 would fail to load the relevant translation.
Author: Nick Morrott <nickm@debian.org>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=992589
Forwarded: not-needed
Last-Update: 2022-02-11
---
--- a/meson.build
+++ b/meson.build
@@ -28,6 +28,8 @@
 gtk = dependency('gtk+-3.0', version: '>=3.22')
 glib = dependency('glib-2.0', version: '>=2.50')
 
+i18n = import('i18n')
+
 conf_data = configuration_data()
 openconnect = disabler()
 cc = meson.get_compiler('c')
@@ -48,7 +50,7 @@
 conf_data.set('USE_OPENCONNECT', openconnect.found())
 conf_data.set('USE_STATUS_ICON', get_option('use_status_icon'))
 conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-conf_data.set_quoted('CONNMAN_GTK_LOCALEDIR', get_option('localedir'))
+conf_data.set_quoted('CONNMAN_GTK_LOCALEDIR', get_option('prefix') + '/' + get_option('localedir') + '/')
 
 conf_data.set('version', meson.project_version())
 configure_file(input : 'config.h.in',
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,10 @@
-connman-gtk.desktop.in
-lib/openconnect_helper.c
+data/connman-gtk.desktop.in
 src/agent.c
-src/config.c
+src/configurator.c
 src/connection.c
 src/dialog.c
 src/main.c
+src/openconnect_helper.c
 src/service.c
 src/settings.c
 src/settings_content.c
@@ -13,4 +13,3 @@
 src/util.c
 src/vpn.c
 src/wireless.c
-
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,25 +1 @@
-i18n = import('i18n')
-
-i18n.gettext(meson.project_name(), args : [
-    '--from-code=UTF-8',
-    '--add-comments',
-    '--package-name=' + meson.project_name(),
-    '--package-version=' + meson.project_version(),
-    '--keyword=_',
-    '--keyword=N_',
-    '--keyword=C_:1c,2',
-    '--keyword=NC_:1c,2',
-    '--keyword=g_dcgettext:2',
-    '--keyword=g_dngettext:2,3',
-    '--keyword=g_dpgettext2:2c,3',
-
-    '--flag=N_:1:pass-c-format',
-    '--flag=C_:2:pass-c-format',
-    '--flag=NC_:2:pass-c-format',
-    '--flag=g_dngettext:2:pass-c-format',
-    '--flag=g_strdup_printf:1:c-format',
-    '--flag=g_string_printf:2:c-format',
-    '--flag=g_string_append_printf:2:c-format',
-    '--flag=g_error_new:3:c-format',
-    '--flag=g_set_error:4:c-format',
-])
+i18n.gettext(meson.project_name(), preset: 'glib')
