diff options
| author | Michael Catanzaro <mcatanzaro@igalia.com> | 2015-06-29 14:46:12 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@igalia.com> | 2015-06-30 10:38:23 -0500 |
| commit | c205fbe91a1e725be4648688da4e35b8b352d1e6 (patch) | |
| tree | 6a03078ce218250961e1d4c90ac8c36c336097ed /src/ephy-search-provider-main.c | |
| parent | e3c3269b6bfb4f177b5b4ba3cd94d3348e5f64da (diff) | |
| download | epiphany-c205fbe91a1e725be4648688da4e35b8b352d1e6.tar.gz | |
Make gettext mandatory and stop using glib-gettext
It's fighting with intltool and intltool is winning, so no point in
keeping it around and making things more complicated. In the future, it
would be good to replace intltool with upstream gettext (not
glib-gettext), but we still need intltool to translate the appdata file.
In the meantime, we'll no longer have two competing applications that
both want to create po/Makefile.in.in.
The AM_GLIB_GNU_GETTEXT macro was defining ENABLE_NLS if gettext is
available, to make i18n optional. But most GNOME programs require
gettext nowadays, and it's installed pretty much everywhere, so there is
no reason for it to be optional anymore. Note, the only reason we were
using glib-gettext before, as far as I see, was to define ENABLE_NLS.
Diffstat (limited to 'src/ephy-search-provider-main.c')
| -rw-r--r-- | src/ephy-search-provider-main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/ephy-search-provider-main.c b/src/ephy-search-provider-main.c index 7ac746b17..6b3ba64d0 100644 --- a/src/ephy-search-provider-main.c +++ b/src/ephy-search-provider-main.c @@ -32,12 +32,10 @@ gint main (gint argc, gchar** argv) int status; GError *error = NULL; -#ifdef ENABLE_NLS /* Initialize the i18n stuff */ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); -#endif if (!ephy_file_helpers_init (NULL, 0, &error)) { g_printerr ("%s\n", error->message); |