From fe00f917f0877caf7329f533204f09f14369b9c4 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sun, 17 Aug 2003 02:12:25 +0000 Subject: [PATCH] * configure.in: removal of intl.c/intl22.so * src/gramps.py: handling of i18n without the use of intl * src/*.py: switch from intl to gettext svn: r2016 --- gramps2/configure.in | 9 --------- gramps2/src/gramps.py | 14 +++++++++----- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/gramps2/configure.in b/gramps2/configure.in index 700fd797d..a1a26374f 100644 --- a/gramps2/configure.in +++ b/gramps2/configure.in @@ -48,14 +48,6 @@ AC_PATH_PROG(ZIP, zip) AC_PROG_CC -AC_CHECK_HEADER(libintl.h) - -AC_CHECK_LIB(c,textdomain,LIBS="", - [ AC_CHECK_LIB(intl,textdomain, - LIBS="-lintl", - AC_MSG_ERROR("Could not find internationalization libraries")) - ]) - dnl Check for programs AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, "YES", "NO") @@ -227,7 +219,6 @@ AC_SUBST(GPREFIX) AC_SUBST(GNOMEINC) AC_SUBST(GNOMELIB) -AC_SUBST(INTLLIBS) AC_CONFIG_FILES([ Makefile diff --git a/gramps2/src/gramps.py b/gramps2/src/gramps.py index 3456a1bea..4d05438e6 100755 --- a/gramps2/src/gramps.py +++ b/gramps2/src/gramps.py @@ -30,7 +30,7 @@ except ImportError: pass import gtk.glade -import intl +import gettext #------------------------------------------------------------------------- # @@ -42,10 +42,14 @@ if os.environ.has_key("GRAMPSI18N"): else: loc = "/usr/share/locale" -intl.bindtextdomain("gramps",loc) -intl.bind_textdomain_codeset("gramps",'UTF-8') -intl.textdomain("gramps") -locale.setlocale(locale.LC_NUMERIC,"C") +locale.setlocale(locale.LC_ALL,'') +gettext.bindtextdomain("gramps",loc) +gtk.glade.bindtextdomain("gramps",loc) + +gtk.glade.textdomain("gramps") +gettext.textdomain("gramps") + +gettext.install("gramps",loc,unicode=1) #------------------------------------------------------------------------- #