Commit a5c49b6b authored by Inigo Martínez's avatar Inigo Martínez

i18n: Use `GETTEXT_PACKAGE` instead of `PACKAGE`

Recently accountsservice has been migrated from Intltool to
Gettext[0]. Due to this migration, and internal workings of
Gettext[1], instead of using `GETTEXT_PACKAGE`, the `PACKAGE`
definition was used. However, with meson, this is not necessary
anymore and only the `GETTEXT_PACKAGE` definition can be used.

[0] ab9933da
[1] https://www.gnu.org/software/autoconf/manual/gettext.html#configure_002eac
parent 9d5132c4
Pipeline #4300 failed with stage
in 1 minute and 44 seconds
...@@ -53,7 +53,6 @@ config_h.set('_DEFAULT_SOURCE', true) ...@@ -53,7 +53,6 @@ config_h.set('_DEFAULT_SOURCE', true)
config_h.set('_GNU_SOURCE', true) config_h.set('_GNU_SOURCE', true)
# i18n # i18n
config_h.set_quoted('PACKAGE', act_gettext)
config_h.set_quoted('GETTEXT_PACKAGE', act_gettext) config_h.set_quoted('GETTEXT_PACKAGE', act_gettext)
# headers # headers
......
...@@ -155,7 +155,7 @@ main (int argc, char *argv[]) ...@@ -155,7 +155,7 @@ main (int argc, char *argv[])
}; };
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
bind_textdomain_codeset (PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#if !GLIB_CHECK_VERSION (2, 35, 3) #if !GLIB_CHECK_VERSION (2, 35, 3)
g_type_init (); g_type_init ();
...@@ -167,7 +167,7 @@ main (int argc, char *argv[]) ...@@ -167,7 +167,7 @@ main (int argc, char *argv[])
} }
context = g_option_context_new (""); context = g_option_context_new ("");
g_option_context_set_translation_domain (context, PACKAGE); g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
g_option_context_set_summary (context, _("Provides D-Bus interfaces for querying and manipulating\nuser account information.")); g_option_context_set_summary (context, _("Provides D-Bus interfaces for querying and manipulating\nuser account information."));
g_option_context_add_main_entries (context, entries, NULL); g_option_context_add_main_entries (context, entries, NULL);
if (!g_option_context_parse (context, &argc, &argv, &error)) { if (!g_option_context_parse (context, &argc, &argv, &error)) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment