summaryrefslogtreecommitdiff
path: root/cogl
diff options
context:
space:
mode:
authorNeil Roberts <neil@linux.intel.com>2011-09-10 09:51:42 +0100
committerNeil Roberts <neil@linux.intel.com>2011-09-19 12:53:58 +0100
commitc7969a33af44f043fadc418ca4ede1d3c1b1444f (patch)
tree83b6d10d8e3690d78f3487c93853776ec68196a4 /cogl
parent85ef60b62d37335c6d777862d913fb5bd6bd2bd1 (diff)
downloadcogl-c7969a33af44f043fadc418ca4ede1d3c1b1444f.tar.gz
cogl: Bind the locale dir for the Cogl domain
dgettext (which Cogl is using) doesn't work unless you first tell gettext where the locale dir is for the library's domain. This just adds the necessary calls into _cogl_init. https://bugzilla.gnome.org/show_bug.cgi?id=658700 Reviewed-by: Robert Bragg <robert@linux.intel.com>
Diffstat (limited to 'cogl')
-rw-r--r--cogl/Makefile.am1
-rw-r--r--cogl/cogl.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 7deca1be..b5d91ae0 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -31,6 +31,7 @@ AM_CPPFLAGS = \
-DCOGL_GL_LIBNAME=\"$(COGL_GL_LIBNAME)\" \
-DCOGL_GLES1_LIBNAME=\"$(COGL_GLES1_LIBNAME)\" \
-DCOGL_GLES2_LIBNAME=\"$(COGL_GLES2_LIBNAME)\" \
+ -DCOGL_LOCALEDIR=\""$(localedir)"\" \
$(NULL)
AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
diff --git a/cogl/cogl.c b/cogl/cogl.c
index 67231f47..09efc8ac 100644
--- a/cogl/cogl.c
+++ b/cogl/cogl.c
@@ -30,6 +30,7 @@
#include <string.h>
#include <math.h>
#include <stdlib.h>
+#include <glib/gi18n-lib.h>
#include "cogl-debug.h"
#include "cogl-internal.h"
@@ -1121,6 +1122,9 @@ _cogl_init (void)
if (g_once_init_enter (&init_status))
{
+ bindtextdomain (GETTEXT_PACKAGE, COGL_LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
g_type_init ();
_cogl_config_read ();