summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2018-09-11 08:27:57 +0200
committerIñigo Martínez <inigomartinez@gmail.com>2018-09-11 08:57:45 +0200
commita5c49b6bc12a3b3ae39eaf3b86ea34c1b2cb8da2 (patch)
treec5533d9411238774e7c50359dc4db6d50d3ff569
parent9d5132c4beae5a90a145592ccebb2aadaa58acc9 (diff)
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] ab9933da454bd4b0baf2e34cb2f1b8ef85669c55 [1] https://www.gnu.org/software/autoconf/manual/gettext.html#configure_002eac
-rw-r--r--meson.build1
-rw-r--r--src/main.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index 1a6c285..77b6a3f 100644
--- a/meson.build
+++ b/meson.build
@@ -53,7 +53,6 @@ config_h.set('_DEFAULT_SOURCE', true)
config_h.set('_GNU_SOURCE', true)
# i18n
-config_h.set_quoted('PACKAGE', act_gettext)
config_h.set_quoted('GETTEXT_PACKAGE', act_gettext)
# headers
diff --git a/src/main.c b/src/main.c
index efdfe08..9caec7f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -155,7 +155,7 @@ main (int argc, char *argv[])
};
setlocale (LC_ALL, "");
- bind_textdomain_codeset (PACKAGE, "UTF-8");
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#if !GLIB_CHECK_VERSION (2, 35, 3)
g_type_init ();
@@ -167,7 +167,7 @@ main (int argc, char *argv[])
}
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_add_main_entries (context, entries, NULL);
if (!g_option_context_parse (context, &argc, &argv, &error)) {