* 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
This commit is contained in:
Don Allingham 2003-08-17 02:12:25 +00:00
parent c750b2c125
commit fe00f917f0
2 changed files with 9 additions and 14 deletions

View File

@ -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

View File

@ -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)
#-------------------------------------------------------------------------
#