* 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:
parent
c750b2c125
commit
fe00f917f0
@ -48,14 +48,6 @@ AC_PATH_PROG(ZIP, zip)
|
|||||||
|
|
||||||
AC_PROG_CC
|
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
|
dnl Check for programs
|
||||||
|
|
||||||
AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, "YES", "NO")
|
AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, "YES", "NO")
|
||||||
@ -227,7 +219,6 @@ AC_SUBST(GPREFIX)
|
|||||||
|
|
||||||
AC_SUBST(GNOMEINC)
|
AC_SUBST(GNOMEINC)
|
||||||
AC_SUBST(GNOMELIB)
|
AC_SUBST(GNOMELIB)
|
||||||
AC_SUBST(INTLLIBS)
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
Makefile
|
Makefile
|
||||||
|
@ -30,7 +30,7 @@ except ImportError:
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
import gtk.glade
|
import gtk.glade
|
||||||
import intl
|
import gettext
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
@ -42,10 +42,14 @@ if os.environ.has_key("GRAMPSI18N"):
|
|||||||
else:
|
else:
|
||||||
loc = "/usr/share/locale"
|
loc = "/usr/share/locale"
|
||||||
|
|
||||||
intl.bindtextdomain("gramps",loc)
|
locale.setlocale(locale.LC_ALL,'')
|
||||||
intl.bind_textdomain_codeset("gramps",'UTF-8')
|
gettext.bindtextdomain("gramps",loc)
|
||||||
intl.textdomain("gramps")
|
gtk.glade.bindtextdomain("gramps",loc)
|
||||||
locale.setlocale(locale.LC_NUMERIC,"C")
|
|
||||||
|
gtk.glade.textdomain("gramps")
|
||||||
|
gettext.textdomain("gramps")
|
||||||
|
|
||||||
|
gettext.install("gramps",loc,unicode=1)
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user