[Viking-devel] SF.net SVN: viking: [548] trunk

[<gu...@us...>]

Revision: 548
          http://viking.svn.sourceforge.net/viking/?rev=548&view=rev
Author:   guyou
Date:     2007-11-25 23:33:34 -0800 (Sun, 25 Nov 2007)

Log Message:
-----------
I18N: Adding minimal stuff

Viking is now ready to be translated.

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/autogen.sh
    trunk/configure.ac
    trunk/src/main.c

Added Paths:
-----------
    trunk/po/
    trunk/po/LINGUAS
    trunk/po/POTFILES.in

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2007-11-26 07:06:41 UTC (rev 547)
+++ trunk/Makefile.am	2007-11-26 07:33:34 UTC (rev 548)
@@ -1,5 +1,10 @@
-SUBDIRS = src test doc
+SUBDIRS = src test doc po
 
+INTLTOOL = \
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in
+
 full:
 	./autogen.sh
 	if [ -x config.status ] ; then ./config.status --recheck ; else ./configure ; fi
@@ -9,9 +14,13 @@
 
 EXTRA_DIST = \
 	     viking-remote \
-	     viking.spec
+	     viking.spec \
+	     $(INTLTOOL)
 
 dist-hook: viking.spec
 	cp $(top_builddir)/viking.spec $(distdir)
 
-ACLOCAL_AMFLAGS = -I m4
+DISTCLEANFILES = \
+	intltool-extract \
+	intltool-merge \
+	intltool-update

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2007-11-26 07:06:41 UTC (rev 547)
+++ trunk/autogen.sh	2007-11-26 07:33:34 UTC (rev 548)
@@ -19,6 +19,8 @@
 FILE=src/main.c
 CONFIGURE=configure.ac
 
+ACLOCAL_FLAGS="-I m4"
+
 DIE=0
 
 ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || {

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-11-26 07:06:41 UTC (rev 547)
+++ trunk/configure.ac	2007-11-26 07:33:34 UTC (rev 548)
@@ -11,6 +11,23 @@
 AC_PROG_CC
 AC_PROG_MAKE_SET
 
+# I18N
+GETTEXT_PACKAGE=viking
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
+
+AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
+
+AM_GLIB_GNU_GETTEXT
+AC_PROG_INTLTOOL([0.35.0])
+
+AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
+
+dnl This will cause the automake generated makefiles to pass the
+dnl correct flags to aclocal.
+ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+AC_SUBST(ACLOCAL_AMFLAGS)
+
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([malloc.h netdb.h netinet/in.h stdlib.h string.h sys/param.h sys/socket.h unistd.h math.h])
@@ -178,10 +195,16 @@
 AC_DEFINE_UNQUOTED(VIK_CONFIG_MAPCACHE_SIZE, ${VIK_CONFIG_MAPCACHE_SIZE},
                    [Size of the map cache])
 
+dnl This will cause the automake generated makefiles to pass the
+dnl correct flags to aclocal.
+ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+AC_SUBST(ACLOCAL_AMFLAGS)
+
 # Configuration
 AC_CONFIG_FILES([Makefile
                  src/Makefile
                  src/icons/Makefile
+		 po/Makefile.in
                  test/Makefile
                  doc/Makefile
                  doc/dev/Makefile])

Added: trunk/po/LINGUAS
===================================================================
--- trunk/po/LINGUAS	                        (rev 0)
+++ trunk/po/LINGUAS	2007-11-26 07:33:34 UTC (rev 548)
@@ -0,0 +1 @@
+# Supported languages

Added: trunk/po/POTFILES.in
===================================================================

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2007-11-26 07:06:41 UTC (rev 547)
+++ trunk/src/main.c	2007-11-26 07:33:34 UTC (rev 548)
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG
+#include "config.h"
+#endif /* HAVE_CONFIG */
+
 #include "viking.h"
 #include "icons/viking_icon.png_h"
 #include "mapcache.h"
@@ -30,6 +34,7 @@
 #include <string.h>
 
 #include <glib/gprintf.h>
+#include <glib/gi18n.h>
 
 #include "modules.h"
 
@@ -100,6 +105,10 @@
   int i = 0;
   GError *error = NULL;
   gboolean gui_initialized;
+	
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);  
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
 
   g_thread_init ( NULL );
   gdk_threads_init ();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.