ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Sebastien Bacher (seb128)
  Ted Gould (ted)
Related merge proposals:
  https://code.launchpad.net/~ted/indicator-messages/i18n/+merge/11828
  proposed by: Ted Gould (ted)
  review: Approve - Neil J. Patel (njpatel)
------------------------------------------------------------
revno: 139 [merge]
committer: Ted Gould <ted@xxxxxxxxxxxxx>
branch nick: trunk
timestamp: Wed 2009-09-16 09:07:14 -0500
message:
  Merging in i18n branch to add i18n.
added:
  po/
  po/POTFILES.in
modified:
  Makefile.am
  configure.ac
  src/messages-service.c


--
lp:indicator-messages
https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk

Your team ayatana-commits is subscribed to branch lp:indicator-messages.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk/+edit-subscription.

=== modified file 'Makefile.am'
--- Makefile.am	2009-09-09 14:18:53 +0000
+++ Makefile.am	2009-09-15 21:06:55 +0000
@@ -1,7 +1,8 @@
 
 SUBDIRS = \
 	src \
-	data
+	data \
+	po
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 

=== modified file 'configure.ac'
--- configure.ac	2009-09-10 14:03:02 +0000
+++ configure.ac	2009-09-15 21:32:42 +0000
@@ -8,6 +8,8 @@
 
 AM_MAINTAINER_MODE
 
+IT_PROG_INTLTOOL([0.35.0])
+
 AC_ISC_POSIX
 AC_PROG_CC
 AM_PROG_CC_C_O
@@ -67,6 +69,33 @@
 fi
 AC_SUBST(DBUSSERVICEDIR)
 
+##############################
+# Custom Junk
+##############################
+
+AC_DEFUN([AC_DEFINE_PATH], [
+	test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+	test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+	ac_define_path=`eval echo [$]$2`
+	ac_define_path=`eval echo [$]ac_define_path`
+	$1="$ac_define_path"
+	AC_SUBST($1)
+	ifelse($3, ,
+		AC_DEFINE_UNQUOTED($1, "$ac_define_path"),
+		AC_DEFINE_UNQUOTED($1, "$ac_define_path", $3))
+])
+
+###########################
+# Internationalization
+###########################
+
+GETTEXT_PACKAGE=indicator-messages
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default get text domain])
+AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory])
+
+AM_GLIB_GNU_GETTEXT
+
 ###########################
 # Files
 ###########################
@@ -88,6 +117,7 @@
 data/icons/48x48/status/Makefile
 data/icons/scalable/Makefile
 data/icons/scalable/status/Makefile
+po/Makefile.in
 ])
 
 ###########################

=== added directory 'po'
=== added file 'po/POTFILES.in'
--- po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ po/POTFILES.in	2009-09-15 21:13:51 +0000
@@ -0,0 +1,7 @@
+[encoding: UTF-8]
+src/messages-service-dbus.c
+src/indicator-messages.c
+src/messages-service.c
+src/launcher-menu-item.c
+src/im-menu-item.c
+src/app-menu-item.c

=== modified file 'src/messages-service.c'
--- src/messages-service.c	2009-09-09 19:51:19 +0000
+++ src/messages-service.c	2009-09-15 21:17:44 +0000
@@ -21,6 +21,9 @@
 */
 
 #include <string.h>
+#include <locale.h>
+#include <libintl.h>
+#include <config.h>
 #include <pango/pango-utils.h>
 #include <dbus/dbus-glib-bindings.h>
 #include <libindicate/listener.h>
@@ -1219,6 +1222,12 @@
 		return 1;
 	}
 
+	/* Setting up i18n and gettext.  Apparently, we need
+	   all of these. */
+	setlocale (LC_ALL, "");
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
+
 	dbus_interface = message_service_dbus_new();
 
 	listener = indicate_listener_ref_default();