diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 3e0fbc29d..5182725c2 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,8 @@ +2003-08-16 Don Allingham + * 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 + 2003-08-15 Don Allingham * src/gramps.glade: New tool icon * src/gramps_main.py: handle back/fwd buttons, disabling when diff --git a/gramps2/Makefile.in b/gramps2/Makefile.in index d8f7ac903..c341e28e0 100644 --- a/gramps2/Makefile.in +++ b/gramps2/Makefile.in @@ -76,7 +76,6 @@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ diff --git a/gramps2/configure b/gramps2/configure index a41eda84d..e9ecf1af3 100755 --- a/gramps2/configure +++ b/gramps2/configure @@ -273,44 +273,7 @@ PACKAGE_STRING='gramps 0.9.3' PACKAGE_BUGREPORT='gramps-bugs@lists.sourceforge.net' ac_unique_file="src/gramps.py" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#if HAVE_SYS_TYPES_H -# include -#endif -#if HAVE_SYS_STAT_H -# include -#endif -#if STDC_HEADERS -# include -# include -#else -# if HAVE_STDLIB_H -# include -# endif -#endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include -# endif -# include -#endif -#if HAVE_STRINGS_H -# include -#endif -#if HAVE_INTTYPES_H -# include -#else -# if HAVE_STDINT_H -# include -# endif -#endif -#if HAVE_UNISTD_H -# include -#endif" - -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE RELEASE VERSIONSTRING MSGFMT LANGUAGES POFILES MOFILES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BINSH SWIG ZIP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP HAVE_PKG_CONFIG PYTHON_CPPFLAGS SK_CONFIG SCROLLKEEPER_BUILD_REQUIRED GNOMEHELP GPREFIX GNOMEINC GNOMELIB INTLLIBS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE RELEASE VERSIONSTRING MSGFMT LANGUAGES POFILES MOFILES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BINSH SWIG ZIP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE HAVE_PKG_CONFIG PYTHON_CPPFLAGS SK_CONFIG SCROLLKEEPER_BUILD_REQUIRED GNOMEHELP GPREFIX GNOMEINC GNOMELIB LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -767,10 +730,6 @@ ac_env_CPPFLAGS_set=${CPPFLAGS+set} ac_env_CPPFLAGS_value=$CPPFLAGS ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP # # Report the --help message. @@ -858,7 +817,6 @@ Some influential environment variables: nonstandard directory CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory - CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -3033,735 +2991,6 @@ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep - - -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_stdc=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -if test "${ac_cv_header_libintl_h+set}" = set; then - echo "$as_me:$LINENO: checking for libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 -if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking libintl.h usability" >&5 -echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking libintl.h presence" >&5 -echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 -if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_libintl_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 - -fi - - - -echo "$as_me:$LINENO: checking for textdomain in -lc" >&5 -echo $ECHO_N "checking for textdomain in -lc... $ECHO_C" >&6 -if test "${ac_cv_lib_c_textdomain+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char textdomain (); -int -main () -{ -textdomain (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_c_textdomain=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_c_textdomain=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_c_textdomain" >&5 -echo "${ECHO_T}$ac_cv_lib_c_textdomain" >&6 -if test $ac_cv_lib_c_textdomain = yes; then - LIBS="" -else - echo "$as_me:$LINENO: checking for textdomain in -lintl" >&5 -echo $ECHO_N "checking for textdomain in -lintl... $ECHO_C" >&6 -if test "${ac_cv_lib_intl_textdomain+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char textdomain (); -int -main () -{ -textdomain (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_intl_textdomain=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_intl_textdomain=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_intl_textdomain" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_textdomain" >&6 -if test $ac_cv_lib_intl_textdomain = yes; then - LIBS="-lintl" -else - { { echo "$as_me:$LINENO: error: \"Could not find internationalization libraries\"" >&5 -echo "$as_me: error: \"Could not find internationalization libraries\"" >&2;} - { (exit 1); exit 1; }; } -fi - - -fi - - - # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -4026,7 +3255,6 @@ SCROLLKEEPER_BUILD_REQUIRED=0.3.5 - ac_config_files="$ac_config_files Makefile src/Makefile src/const.py src/docgen/Makefile src/filters/Makefile src/plugins/Makefile src/calendars/Makefile src/data/Makefile src/data/templates/Makefile src/po/Makefile doc/Makefile doc/gramps-manual/Makefile doc/gramps-manual/C/Makefile example/Makefile example/gramps/Makefile gramps.spec gramps.sh" cat >confcache <<\_ACEOF @@ -4747,8 +3975,6 @@ s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@CPP@,$CPP,;t t -s,@EGREP@,$EGREP,;t t s,@HAVE_PKG_CONFIG@,$HAVE_PKG_CONFIG,;t t s,@PYTHON_CPPFLAGS@,$PYTHON_CPPFLAGS,;t t s,@SK_CONFIG@,$SK_CONFIG,;t t @@ -4757,7 +3983,6 @@ s,@GNOMEHELP@,$GNOMEHELP,;t t s,@GPREFIX@,$GPREFIX,;t t s,@GNOMEINC@,$GNOMEINC,;t t s,@GNOMELIB@,$GNOMELIB,;t t -s,@INTLLIBS@,$INTLLIBS,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/gramps2/doc/Makefile.in b/gramps2/doc/Makefile.in index 46fcfaf71..843e9c2a2 100644 --- a/gramps2/doc/Makefile.in +++ b/gramps2/doc/Makefile.in @@ -76,7 +76,6 @@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ diff --git a/gramps2/doc/gramps-manual/C/Makefile.in b/gramps2/doc/gramps-manual/C/Makefile.in index 1c7ecb28f..83a697702 100644 --- a/gramps2/doc/gramps-manual/C/Makefile.in +++ b/gramps2/doc/gramps-manual/C/Makefile.in @@ -136,7 +136,6 @@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ diff --git a/gramps2/doc/gramps-manual/Makefile.in b/gramps2/doc/gramps-manual/Makefile.in index 1f699ce7f..2a5c1fa9a 100644 --- a/gramps2/doc/gramps-manual/Makefile.in +++ b/gramps2/doc/gramps-manual/Makefile.in @@ -76,7 +76,6 @@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ diff --git a/gramps2/example/Makefile.in b/gramps2/example/Makefile.in index 65ebb2b4a..0a874fd43 100644 --- a/gramps2/example/Makefile.in +++ b/gramps2/example/Makefile.in @@ -74,7 +74,6 @@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ diff --git a/gramps2/example/gramps/Makefile.in b/gramps2/example/gramps/Makefile.in index baddb7eef..22ac4c186 100644 --- a/gramps2/example/gramps/Makefile.in +++ b/gramps2/example/gramps/Makefile.in @@ -75,7 +75,6 @@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ diff --git a/gramps2/gramps.spec b/gramps2/gramps.spec index 16cb419ba..191e1e166 100644 --- a/gramps2/gramps.spec +++ b/gramps2/gramps.spec @@ -1,5 +1,5 @@ %define ver 0.9.3 -%define rel 0.CVS20030815 +%define rel 0.CVS20030816 %define prefix /usr %define localstatedir /var/lib # Ensure that internal RPM macros for configure & makeinstall diff --git a/gramps2/src/AddMedia.py b/gramps2/src/AddMedia.py index f5a4ec78d..144a04b25 100644 --- a/gramps2/src/AddMedia.py +++ b/gramps2/src/AddMedia.py @@ -35,7 +35,7 @@ import os # #------------------------------------------------------------------------- -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -74,7 +74,7 @@ class AddMediaObject: update - a function to call to update the display """ self.db = db - self.glade = gtk.glade.XML(const.imageselFile,"imageSelect") + self.glade = gtk.glade.XML(const.imageselFile,"imageSelect","gramps") self.window = self.glade.get_widget("imageSelect") self.description = self.glade.get_widget("photoDescription") self.image = self.glade.get_widget("image") diff --git a/gramps2/src/AddSpouse.py b/gramps2/src/AddSpouse.py index 545f41d0f..a7de52e36 100644 --- a/gramps2/src/AddSpouse.py +++ b/gramps2/src/AddSpouse.py @@ -30,7 +30,7 @@ __version__ = "$Revision$" # internationalization # #------------------------------------------------------------------------- -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -76,7 +76,7 @@ class AddSpouse: self.addperson = addperson self.active_family = family - self.glade = gtk.glade.XML(const.gladeFile, "spouseDialog") + self.glade = gtk.glade.XML(const.gladeFile, "spouseDialog","gramps") self.rel_combo = self.glade.get_widget("rel_combo") self.relation_type = self.glade.get_widget("rel_type") diff --git a/gramps2/src/AddrEdit.py b/gramps2/src/AddrEdit.py index d9d7d3d86..7a216b9fe 100644 --- a/gramps2/src/AddrEdit.py +++ b/gramps2/src/AddrEdit.py @@ -41,7 +41,7 @@ import RelLib import Sources from DateEdit import DateEdit -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -60,7 +60,7 @@ class AddressEditor: addr - The address that is to be edited """ # Get the important widgets from the glade description - self.top = gtk.glade.XML(const.dialogFile, "addr_edit") + self.top = gtk.glade.XML(const.dialogFile, "addr_edit","gramps") self.window = self.top.get_widget("addr_edit") self.addr_start = self.top.get_widget("address_start") self.street = self.top.get_widget("street") diff --git a/gramps2/src/AttrEdit.py b/gramps2/src/AttrEdit.py index 44d6821c0..38c91db3e 100644 --- a/gramps2/src/AttrEdit.py +++ b/gramps2/src/AttrEdit.py @@ -43,7 +43,7 @@ import Sources import AutoComp import RelLib -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -66,7 +66,7 @@ class AttributeEditor: self.parent = parent self.attrib = attrib - self.top = gtk.glade.XML(const.dialogFile, "attr_edit") + self.top = gtk.glade.XML(const.dialogFile, "attr_edit","gramps") self.type_field = self.top.get_widget("attr_type") self.slist = self.top.get_widget("slist") self.value_field = self.top.get_widget("attr_value") diff --git a/gramps2/src/Bookmarks.py b/gramps2/src/Bookmarks.py index d4f3dfed5..0312089d3 100644 --- a/gramps2/src/Bookmarks.py +++ b/gramps2/src/Bookmarks.py @@ -36,7 +36,7 @@ import gtk # #------------------------------------------------------------------------- import Utils -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/Calendar.py b/gramps2/src/Calendar.py index a096c1a96..99a3d0032 100644 --- a/gramps2/src/Calendar.py +++ b/gramps2/src/Calendar.py @@ -28,7 +28,7 @@ web site at http://www.scottlee.com __author__ = "Donald N. Allingham" __version__ = "$Revision$" -from intl import gettext as _ +from gettext import gettext as _ import re import Errors diff --git a/gramps2/src/ChooseParents.py b/gramps2/src/ChooseParents.py index 3dd66ca34..5cc58f278 100644 --- a/gramps2/src/ChooseParents.py +++ b/gramps2/src/ChooseParents.py @@ -31,7 +31,7 @@ __version__ = "$Revision$" # internationalization # #------------------------------------------------------------------------- -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -90,7 +90,7 @@ class ChooseParents: self.mother = None self.father = None - self.glade = gtk.glade.XML(const.gladeFile,"familyDialog") + self.glade = gtk.glade.XML(const.gladeFile,"familyDialog","gramps") self.top = self.glade.get_widget("familyDialog") text = _("Choose the Parents of %s") % GrampsCfg.nameof(self.person) @@ -482,7 +482,7 @@ class ModifyParents: self.father = self.family.getFather() self.mother = self.family.getMother() - self.glade = gtk.glade.XML(const.gladeFile,"modparents") + self.glade = gtk.glade.XML(const.gladeFile,"modparents","gramps") self.top = self.glade.get_widget("modparents") self.title = self.glade.get_widget("title") diff --git a/gramps2/src/Date.py b/gramps2/src/Date.py index 978367d06..4f726ef21 100644 --- a/gramps2/src/Date.py +++ b/gramps2/src/Date.py @@ -44,7 +44,7 @@ import Hebrew import FrenchRepublic import Errors -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/DbPrompter.py b/gramps2/src/DbPrompter.py index 30f3324ab..8babba901 100644 --- a/gramps2/src/DbPrompter.py +++ b/gramps2/src/DbPrompter.py @@ -35,7 +35,7 @@ import Utils import const import GrampsCfg import VersionControl -from intl import gettext as _ +from gettext import gettext as _ try: import ZODB @@ -57,7 +57,7 @@ class DbPrompter: self.show() def show(self): - opendb = gtk.glade.XML(const.gladeFile, "opendb") + opendb = gtk.glade.XML(const.gladeFile, "opendb","gramps") top = opendb.get_widget('opendb') title = opendb.get_widget('title') @@ -88,7 +88,7 @@ class DbPrompter: Utils.destroy_passed_object(obj) def save_as_activate(self): - wFs = gtk.glade.XML (const.gladeFile, "fileselection") + wFs = gtk.glade.XML (const.gladeFile, "fileselection","gramps") wFs.signal_autoconnect({ "on_ok_button1_clicked": self.save_ok_button_clicked, "destroy_passed_object": self.cancel_button_clicked, @@ -105,7 +105,7 @@ class DbPrompter: self.db.save_file(filename,_("No Comment Provided")) def open_activate(self): - wFs = gtk.glade.XML(const.revisionFile, "dbopen") + wFs = gtk.glade.XML(const.revisionFile, "dbopen","gramps") wFs.signal_autoconnect({ "on_ok_button1_clicked": self.ok_button_clicked, "destroy_passed_object": self.cancel_button_clicked, diff --git a/gramps2/src/DisplayTrace.py b/gramps2/src/DisplayTrace.py index ab7b06180..31a27210a 100644 --- a/gramps2/src/DisplayTrace.py +++ b/gramps2/src/DisplayTrace.py @@ -42,7 +42,7 @@ import gtk.glade # #------------------------------------------------------------------------- import const -from intl import gettext as _ +from gettext import gettext as _ _release_files = [ "/etc/mandrake-release", @@ -91,7 +91,7 @@ class DisplayTrace: traceback.print_exception(data[0],data[1],data[2],None,msg) - self.glade = gtk.glade.XML(const.pluginsFile,"plugstat") + self.glade = gtk.glade.XML(const.pluginsFile,"plugstat","gramps") self.top = self.glade.get_widget("plugstat") window = self.glade.get_widget("text") self.top.set_title("%s - GRAMPS" % _('Internal Error')) diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py index 1441f0584..24906ad41 100644 --- a/gramps2/src/EditPerson.py +++ b/gramps2/src/EditPerson.py @@ -54,7 +54,7 @@ import RelLib from DateEdit import DateEdit from QuestionDialog import QuestionDialog, WarningDialog, ErrorDialog, SaveDialog -from intl import gettext as _ +from gettext import gettext as _ _temple_names = const.lds_temple_codes.keys() _temple_names.sort() @@ -95,7 +95,7 @@ class EditPerson: self.pdmap[p[0]] = key self.load_obj = None - self.top = gtk.glade.XML(const.editPersonFile, "editPerson") + self.top = gtk.glade.XML(const.editPersonFile, "editPerson","gramps") self.icon_list = self.top.get_widget("iconlist") self.gallery = ImageSelect.Gallery(person, self.path, self.icon_list,self.db,self) diff --git a/gramps2/src/EditPlace.py b/gramps2/src/EditPlace.py index 74e77a4ca..d1f1d7b55 100644 --- a/gramps2/src/EditPlace.py +++ b/gramps2/src/EditPlace.py @@ -45,7 +45,7 @@ import GrampsCfg import Sources import ImageSelect -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -75,7 +75,7 @@ class EditPlace: else: self.srcreflist = [] - self.top_window = gtk.glade.XML(const.placesFile,"placeEditor") + self.top_window = gtk.glade.XML(const.placesFile,"placeEditor","gramps") self.top = self.top_window.get_widget("placeEditor") self.iconlist = self.top_window.get_widget('iconlist') title_label = self.top_window.get_widget('title') diff --git a/gramps2/src/EditSource.py b/gramps2/src/EditSource.py index 5cfe40e52..6d47ea364 100644 --- a/gramps2/src/EditSource.py +++ b/gramps2/src/EditSource.py @@ -36,7 +36,7 @@ import GrampsCfg import ImageSelect import ListModel -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -54,7 +54,7 @@ class EditSource: self.not_loaded = 1 self.ref_not_loaded = 1 - self.top_window = gtk.glade.XML(const.gladeFile,"sourceEditor") + self.top_window = gtk.glade.XML(const.gladeFile,"sourceEditor","gramps") self.top = self.top_window.get_widget("sourceEditor") Utils.set_titles(self.top,self.top_window.get_widget('title'), diff --git a/gramps2/src/EventEdit.py b/gramps2/src/EventEdit.py index d141fc5cb..4a6dfb8c8 100644 --- a/gramps2/src/EventEdit.py +++ b/gramps2/src/EventEdit.py @@ -44,7 +44,7 @@ import RelLib import Date from DateEdit import DateEdit -from intl import gettext as _ +from gettext import gettext as _ from QuestionDialog import WarningDialog #------------------------------------------------------------------------- @@ -78,7 +78,7 @@ class EventEditor: self.witnesslist = [] self.date = Date.Date(None) - self.top = gtk.glade.XML(const.dialogFile, "event_edit") + self.top = gtk.glade.XML(const.dialogFile, "event_edit","gramps") self.window = self.top.get_widget("event_edit") title_label = self.top.get_widget('title') diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py index f94bb8842..97a5b1bd1 100644 --- a/gramps2/src/FamilyView.py +++ b/gramps2/src/FamilyView.py @@ -46,7 +46,7 @@ import ChooseParents import RelLib import EditPerson -from intl import gettext as _ +from gettext import gettext as _ from QuestionDialog import QuestionDialog,WarningDialog _BORN = _('b.') diff --git a/gramps2/src/Filter.py b/gramps2/src/Filter.py index 16823e4a4..7547f5bc2 100644 --- a/gramps2/src/Filter.py +++ b/gramps2/src/Filter.py @@ -29,7 +29,7 @@ import sys import gtk -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/Find.py b/gramps2/src/Find.py index dc59faae6..050fc9bec 100644 --- a/gramps2/src/Find.py +++ b/gramps2/src/Find.py @@ -45,7 +45,7 @@ import gtk.glade #------------------------------------------------------------------------- import const import Utils -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -63,7 +63,7 @@ class FindBase: self.t = type(u' ') self.db = db self.task = task - self.glade = gtk.glade.XML(const.gladeFile,"find") + self.glade = gtk.glade.XML(const.gladeFile,"find","gramps") self.glade.signal_autoconnect({ 'on_next_clicked' : self.on_next_clicked, 'on_back_clicked' : self.on_prev_clicked, diff --git a/gramps2/src/FrenchRepublic.py b/gramps2/src/FrenchRepublic.py index f8747d5cf..d88bb24c1 100644 --- a/gramps2/src/FrenchRepublic.py +++ b/gramps2/src/FrenchRepublic.py @@ -35,7 +35,7 @@ __version__ = "$Revision$" # #------------------------------------------------------------------------- import Calendar -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/GenericFilter.py b/gramps2/src/GenericFilter.py index ea06a62d4..3da60ee44 100644 --- a/gramps2/src/GenericFilter.py +++ b/gramps2/src/GenericFilter.py @@ -52,7 +52,7 @@ import RelLib import Date import Calendar import Errors -from intl import gettext as _ +from gettext import gettext as _ from Utils import for_each_ancestor #------------------------------------------------------------------------- diff --git a/gramps2/src/GrampsCfg.py b/gramps2/src/GrampsCfg.py index b68e6eeef..83bc3c723 100644 --- a/gramps2/src/GrampsCfg.py +++ b/gramps2/src/GrampsCfg.py @@ -52,7 +52,7 @@ import RelLib import const import Utils -from intl import gettext as _ +from gettext import gettext as _ client = gconf.client_get_default() client.add_dir("/apps/gramps",gconf.CLIENT_PRELOAD_NONE) @@ -502,7 +502,7 @@ def add_checkbox(category,panel,frame,config_tag,label,default): class GrampsPreferences: def __init__(self,db): self.db = db - self.top = gtk.glade.XML(const.prefsFile,"preferences") + self.top = gtk.glade.XML(const.prefsFile,"preferences","gramps") self.top.signal_autoconnect({ "on_close_clicked" : self.on_close_clicked, "on_ok_clicked" : self.on_ok_clicked, diff --git a/gramps2/src/Gregorian.py b/gramps2/src/Gregorian.py index 507784c26..418688b88 100644 --- a/gramps2/src/Gregorian.py +++ b/gramps2/src/Gregorian.py @@ -34,7 +34,7 @@ __version__ = "$Revision$" # #------------------------------------------------------------------------- import Calendar -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/Hebrew.py b/gramps2/src/Hebrew.py index 3431a0bfa..b9422ae2a 100644 --- a/gramps2/src/Hebrew.py +++ b/gramps2/src/Hebrew.py @@ -34,7 +34,7 @@ __version__ = "$Revision$" # #------------------------------------------------------------------------- import Calendar -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py index 2e691681b..cff193060 100644 --- a/gramps2/src/ImageSelect.py +++ b/gramps2/src/ImageSelect.py @@ -51,7 +51,7 @@ import ListModel import grampslib from QuestionDialog import ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ _IMAGEX = 140 _IMAGEY = 150 @@ -92,7 +92,7 @@ class ImageSelect: if self.path == '': return - self.glade = gtk.glade.XML(const.imageselFile,"imageSelect") + self.glade = gtk.glade.XML(const.imageselFile,"imageSelect","gramps") window = self.glade.get_widget("imageSelect") self.fname = self.glade.get_widget("fname") @@ -623,8 +623,7 @@ class LocalMediaProperties: self.db = parent.db fname = self.object.getPath() - self.change_dialog = gtk.glade.XML(const.imageselFile, - "change_description") + self.change_dialog = gtk.glade.XML(const.imageselFile,"change_description","gramps") title = _('Change local media object properties') Utils.set_titles(self.change_dialog.get_widget('change_description'), @@ -752,7 +751,7 @@ class GlobalMediaProperties: self.refs = 0 self.path = self.db.getSavePath() - self.change_dialog = gtk.glade.XML(const.imageselFile,"change_global") + self.change_dialog = gtk.glade.XML(const.imageselFile,"change_global","gramps") title = _('Change global media object properties') diff --git a/gramps2/src/Julian.py b/gramps2/src/Julian.py index c5245295a..f9864f994 100644 --- a/gramps2/src/Julian.py +++ b/gramps2/src/Julian.py @@ -34,7 +34,7 @@ __version__ = "$Revision$" # #------------------------------------------------------------------------- import Calendar -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/LocEdit.py b/gramps2/src/LocEdit.py index 5c8109ae8..98482a6b1 100644 --- a/gramps2/src/LocEdit.py +++ b/gramps2/src/LocEdit.py @@ -35,7 +35,7 @@ import const import Utils import RelLib -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -47,7 +47,7 @@ class LocationEditor: def __init__(self,parent,location): self.parent = parent self.location = location - self.top = gtk.glade.XML(const.dialogFile, "loc_edit") + self.top = gtk.glade.XML(const.dialogFile, "loc_edit","gramps") self.window = self.top.get_widget("loc_edit") self.city = self.top.get_widget("city") self.state = self.top.get_widget("state") diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am index db02613d3..2bd444a08 100644 --- a/gramps2/src/Makefile.am +++ b/gramps2/src/Makefile.am @@ -4,9 +4,8 @@ SUBDIRS = docgen filters plugins data po calendars # For intl. support, how do we compile? CFLAGS = -fPIC -shared -O @GNOMEINC@ @CFLAGS@ @CPPFLAGS@ -I@includedir@ LDFLAGS = @GNOMELIB@ @LDFLAGS@ -L@libdir@ @LIBS@ -CLEANFILES = $(INTLLIBS) grampslib.so +CLEANFILES = grampslib.so MOSTLYCLEANFILES = -INTLLIBS= intl22.so # What are the PYTHON scripts for this package that need to be handled? # @@ -53,7 +52,6 @@ pkgpython_PYTHON = \ Hebrew.py\ ImageSelect.py\ ImgManip.py\ - intl.py\ Julian.py\ latin_ansel.py\ latin_utf8.py\ @@ -133,16 +131,14 @@ GRAPHICS = \ # Other stuff that we need to install dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) gramps.desktop -nodist_pkgdata_DATA = grampslib.so $(INTLLIBS) +nodist_pkgdata_DATA = grampslib.so -EXTRA_DIST = grampslib.i intl.c grampslib_wrap.c +EXTRA_DIST = grampslib.i grampslib_wrap.c -all-local: $(INTLLIBS) grampslib.so +all-local: grampslib.so # These can probably be done in a better or more elegant/generic way # eventually (libtool?), but this works. -intl22.so: $(srcdir)/intl.c - $(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_CPPFLAGS) -DVER22 -o $@ $(srcdir)/intl.c grampslib.so: $(srcdir)/grampslib_wrap.c $(CC) $(CFLAGS) $(PYTHON_CPPFLAGS) -o $@ $(srcdir)/grampslib_wrap.c $(LDFLAGS) diff --git a/gramps2/src/Makefile.in b/gramps2/src/Makefile.in index add8b1492..f00780f7f 100644 --- a/gramps2/src/Makefile.in +++ b/gramps2/src/Makefile.in @@ -74,7 +74,6 @@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = intl22.so LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ @@ -108,7 +107,7 @@ SUBDIRS = docgen filters plugins data po calendars # For intl. support, how do we compile? CFLAGS = -fPIC -shared -O @GNOMEINC@ @CFLAGS@ @CPPFLAGS@ -I@includedir@ LDFLAGS = @GNOMELIB@ @LDFLAGS@ -L@libdir@ @LIBS@ -CLEANFILES = $(INTLLIBS) grampslib.so +CLEANFILES = grampslib.so MOSTLYCLEANFILES = @@ -156,7 +155,6 @@ pkgpython_PYTHON = \ Hebrew.py\ ImageSelect.py\ ImgManip.py\ - intl.py\ Julian.py\ latin_ansel.py\ latin_utf8.py\ @@ -239,9 +237,9 @@ GRAPHICS = \ # Other stuff that we need to install dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) gramps.desktop -nodist_pkgdata_DATA = grampslib.so $(INTLLIBS) +nodist_pkgdata_DATA = grampslib.so -EXTRA_DIST = grampslib.i intl.c grampslib_wrap.c +EXTRA_DIST = grampslib.i grampslib_wrap.c subdir = src mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = const.py @@ -555,12 +553,10 @@ uninstall-info: uninstall-info-recursive uninstall-recursive -all-local: $(INTLLIBS) grampslib.so +all-local: grampslib.so # These can probably be done in a better or more elegant/generic way # eventually (libtool?), but this works. -intl22.so: $(srcdir)/intl.c - $(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_CPPFLAGS) -DVER22 -o $@ $(srcdir)/intl.c grampslib.so: $(srcdir)/grampslib_wrap.c $(CC) $(CFLAGS) $(PYTHON_CPPFLAGS) -o $@ $(srcdir)/grampslib_wrap.c $(LDFLAGS) diff --git a/gramps2/src/Marriage.py b/gramps2/src/Marriage.py index dac2dd11d..aef06253b 100644 --- a/gramps2/src/Marriage.py +++ b/gramps2/src/Marriage.py @@ -44,7 +44,7 @@ import ImageSelect import Date from QuestionDialog import QuestionDialog, WarningDialog, SaveDialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -77,7 +77,7 @@ class Marriage: p = db.getPlaceDisplay(key) self.pmap[p[0]] = key - self.top = gtk.glade.XML(const.marriageFile,"marriageEditor") + self.top = gtk.glade.XML(const.marriageFile,"marriageEditor","gramps") top_window = self.get_widget("marriageEditor") Utils.set_titles(top_window, self.top.get_widget('title'), diff --git a/gramps2/src/MediaView.py b/gramps2/src/MediaView.py index cd756513c..848964468 100644 --- a/gramps2/src/MediaView.py +++ b/gramps2/src/MediaView.py @@ -54,7 +54,7 @@ from QuestionDialog import QuestionDialog, ErrorDialog, WarningDialog # internationalization # #------------------------------------------------------------------------- -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/MergeData.py b/gramps2/src/MergeData.py index b9a9c1703..8076e4def 100644 --- a/gramps2/src/MergeData.py +++ b/gramps2/src/MergeData.py @@ -42,7 +42,7 @@ import Utils import GrampsCfg import ListModel import const -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -58,7 +58,7 @@ class MergePeople: self.update = update self.ep_update = ep_update - self.glade = gtk.glade.XML(const.mergeFile,"merge") + self.glade = gtk.glade.XML(const.mergeFile,"merge","gramps") self.top = self.glade.get_widget("merge") Utils.set_titles(self.top,self.glade.get_widget('title'), @@ -820,7 +820,7 @@ class MergePlaces: self.p2 = place2 self.update = update - self.glade = gtk.glade.XML(const.mergeFile,"merge_places") + self.glade = gtk.glade.XML(const.mergeFile,"merge_places","gramps") self.top = self.glade.get_widget("merge_places") self.glade.get_widget("title1_text").set_text(place1.get_title()) self.glade.get_widget("title2_text").set_text(place2.get_title()) diff --git a/gramps2/src/NameEdit.py b/gramps2/src/NameEdit.py index 87146c087..0fc11c830 100644 --- a/gramps2/src/NameEdit.py +++ b/gramps2/src/NameEdit.py @@ -36,7 +36,7 @@ import AutoComp import Sources import RelLib -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -49,7 +49,7 @@ class NameEditor: self.parent = parent self.name = name self.callback = callback - self.top = gtk.glade.XML(const.dialogFile, "name_edit") + self.top = gtk.glade.XML(const.dialogFile, "name_edit","gramps") self.window = self.top.get_widget("name_edit") self.given_field = self.top.get_widget("alt_given") self.title_field = self.top.get_widget("alt_title") diff --git a/gramps2/src/NoteEdit.py b/gramps2/src/NoteEdit.py index cd6374e17..3785668df 100644 --- a/gramps2/src/NoteEdit.py +++ b/gramps2/src/NoteEdit.py @@ -31,7 +31,7 @@ import gtk # #------------------------------------------------------------------------- import Utils -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/PaperMenu.py b/gramps2/src/PaperMenu.py index 5003beb47..f09cf7d4d 100644 --- a/gramps2/src/PaperMenu.py +++ b/gramps2/src/PaperMenu.py @@ -34,7 +34,7 @@ import TextDoc import GrampsCfg import const import Utils -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/PedView.py b/gramps2/src/PedView.py index fe2dd5126..07ebf7e44 100644 --- a/gramps2/src/PedView.py +++ b/gramps2/src/PedView.py @@ -38,7 +38,7 @@ import pango # #------------------------------------------------------------------------- import GrampsCfg -from intl import gettext as _ +from gettext import gettext as _ _BORN = _('b.') _DIED = _('d.') diff --git a/gramps2/src/PlaceView.py b/gramps2/src/PlaceView.py index 597e13cec..e642dff3f 100644 --- a/gramps2/src/PlaceView.py +++ b/gramps2/src/PlaceView.py @@ -41,7 +41,7 @@ import EditPlace import Utils from QuestionDialog import QuestionDialog, ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/Plugins.py b/gramps2/src/Plugins.py index 146c76ddc..96cab0104 100644 --- a/gramps2/src/Plugins.py +++ b/gramps2/src/Plugins.py @@ -57,9 +57,9 @@ import Utils import GrampsCfg import Errors -import intl +import gettext -_ = intl.gettext +_ = gettext.gettext #------------------------------------------------------------------------- # @@ -126,7 +126,7 @@ class PluginDialog: self.update = None self.imap = {} - self.dialog = gtk.glade.XML(const.pluginsFile,"report") + self.dialog = gtk.glade.XML(const.pluginsFile,"report","gramps") self.dialog.signal_autoconnect({ "on_report_apply_clicked" : self.on_apply_clicked, "on_report_ok_clicked" : self.on_ok_clicked, @@ -289,7 +289,7 @@ class PluginStatus: def __init__(self): import cStringIO - self.glade = gtk.glade.XML(const.pluginsFile,"plugstat") + self.glade = gtk.glade.XML(const.pluginsFile,"plugstat","gramps") self.top = self.glade.get_widget("plugstat") self.top.set_title("%s - GRAMPS" % _('Plugin status')) window = self.glade.get_widget("text") @@ -299,9 +299,6 @@ class PluginStatus: info = cStringIO.StringIO() - if intl.status: - _expect.append(('intl:py','GRAMPS was built without internationalization support')) - if len(_expect) + len(_failmsg) == 0: window.get_buffer().set_text(_('All modules were successfully loaded.')) else: diff --git a/gramps2/src/QuestionDialog.py b/gramps2/src/QuestionDialog.py index a03a96724..b2617a8af 100644 --- a/gramps2/src/QuestionDialog.py +++ b/gramps2/src/QuestionDialog.py @@ -22,11 +22,11 @@ import gtk import gtk.glade import const -from intl import gettext as _ +from gettext import gettext as _ class SaveDialog: def __init__(self,msg1,msg2,task1,task2): - self.xml = gtk.glade.XML(const.errdialogsFile,"savedialog") + self.xml = gtk.glade.XML(const.errdialogsFile,"savedialog","gramps") self.top = self.xml.get_widget('savedialog') self.task1 = task1 self.task2 = task2 @@ -49,7 +49,7 @@ class SaveDialog: class QuestionDialog: def __init__(self,msg1,msg2,label,task): - self.xml = gtk.glade.XML(const.errdialogsFile,"questiondialog") + self.xml = gtk.glade.XML(const.errdialogsFile,"questiondialog","gramps") self.top = self.xml.get_widget('questiondialog') self.top.set_title('') @@ -71,7 +71,7 @@ class QuestionDialog: class OptionDialog: def __init__(self,msg1,msg2,btnmsg1,task1,btnmsg2,task2): - self.xml = gtk.glade.XML(const.errdialogsFile,"optiondialog") + self.xml = gtk.glade.XML(const.errdialogsFile,"optiondialog","gramps") self.top = self.xml.get_widget('optiondialog') self.top.set_title('') @@ -101,7 +101,7 @@ class OptionDialog: class ErrorDialog: def __init__(self,msg1,msg2=""): - self.xml = gtk.glade.XML(const.errdialogsFile,"errdialog") + self.xml = gtk.glade.XML(const.errdialogsFile,"errdialog","gramps") self.top = self.xml.get_widget('errdialog') label1 = self.xml.get_widget('label1') @@ -116,7 +116,7 @@ class ErrorDialog: class WarningDialog: def __init__(self,msg1,msg2=""): - self.xml = gtk.glade.XML(const.errdialogsFile,"warndialog") + self.xml = gtk.glade.XML(const.errdialogsFile,"warndialog","gramps") self.top = self.xml.get_widget('warndialog') label1 = self.xml.get_widget('label1') @@ -131,7 +131,7 @@ class WarningDialog: class OkDialog: def __init__(self,msg1,msg2=""): - self.xml = gtk.glade.XML(const.errdialogsFile,"okdialog") + self.xml = gtk.glade.XML(const.errdialogsFile,"okdialog","gramps") self.top = self.xml.get_widget('okdialog') label1 = self.xml.get_widget('label1') @@ -145,7 +145,7 @@ class OkDialog: class MissingMediaDialog: def __init__(self,msg1,msg2,task1,task2,task3): - self.xml = gtk.glade.XML(const.errdialogsFile,"missmediadialog") + self.xml = gtk.glade.XML(const.errdialogsFile,"missmediadialog","gramps") self.top = self.xml.get_widget('missmediadialog') self.task1 = task1 self.task2 = task2 diff --git a/gramps2/src/QuickAdd.py b/gramps2/src/QuickAdd.py index 0b2206f08..aece32a02 100644 --- a/gramps2/src/QuickAdd.py +++ b/gramps2/src/QuickAdd.py @@ -34,7 +34,7 @@ import Utils import AutoComp import const import RelLib -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -46,7 +46,7 @@ class QuickAdd: self.db = db self.callback = callback - self.xml = gtk.glade.XML(const.gladeFile,"addperson") + self.xml = gtk.glade.XML(const.gladeFile,"addperson","gramps") self.xml.get_widget(sex).set_active(1) self.xml.signal_autoconnect({ "on_addfather_close": self.close, diff --git a/gramps2/src/ReadXML.py b/gramps2/src/ReadXML.py index e4202709f..335dc260c 100644 --- a/gramps2/src/ReadXML.py +++ b/gramps2/src/ReadXML.py @@ -37,7 +37,7 @@ from xml.parsers.expat import ExpatError import RelLib from GrampsParser import GrampsParser, GrampsImportParser from QuestionDialog import ErrorDialog, WarningDialog, MissingMediaDialog -from intl import gettext as _ +from gettext import gettext as _ import Utils #------------------------------------------------------------------------- diff --git a/gramps2/src/RelImage.py b/gramps2/src/RelImage.py index 8374e070f..c9a362815 100644 --- a/gramps2/src/RelImage.py +++ b/gramps2/src/RelImage.py @@ -42,7 +42,7 @@ from QuestionDialog import ErrorDialog, WarningDialog import const import Utils import ImgManip -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/Report.py b/gramps2/src/Report.py index c253111c6..51844ed80 100644 --- a/gramps2/src/Report.py +++ b/gramps2/src/Report.py @@ -54,7 +54,7 @@ import StyleEditor import GrampsCfg import PaperMenu -from intl import gettext as _ +from gettext import gettext as _ from QuestionDialog import ErrorDialog, OptionDialog #------------------------------------------------------------------------- diff --git a/gramps2/src/SelectChild.py b/gramps2/src/SelectChild.py index cdc7b4035..d1a33cb1e 100644 --- a/gramps2/src/SelectChild.py +++ b/gramps2/src/SelectChild.py @@ -24,7 +24,7 @@ # internationalization # #------------------------------------------------------------------------- -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -58,7 +58,7 @@ class SelectChild: self.family = family self.redraw = redraw self.add_person = add_person - self.xml = gtk.glade.XML(const.gladeFile,"select_child") + self.xml = gtk.glade.XML(const.gladeFile,"select_child","gramps") if person: self.default_name = person.getPrimaryName().getSurname().upper() @@ -317,7 +317,7 @@ class EditRel: self.child = child self.family = family - self.xml = gtk.glade.XML(const.gladeFile,"editrel") + self.xml = gtk.glade.XML(const.gladeFile,"editrel","gramps") self.top = self.xml.get_widget('editrel') self.mdesc = self.xml.get_widget('mrel_desc') self.fdesc = self.xml.get_widget('frel_desc') diff --git a/gramps2/src/SelectPerson.py b/gramps2/src/SelectPerson.py index 459f5b9fe..49fb0b200 100644 --- a/gramps2/src/SelectPerson.py +++ b/gramps2/src/SelectPerson.py @@ -23,7 +23,7 @@ # internationalization # #------------------------------------------------------------------------- -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -58,7 +58,7 @@ class SelectPerson: self.db = db self.filter = filter gladefile = "%s/choose.glade" % const.rootDir - self.glade = gtk.glade.XML(gladefile,"select") + self.glade = gtk.glade.XML(gladefile,"select","gramps") self.top = self.glade.get_widget('select') title_label = self.glade.get_widget('title') self.filter_select = self.glade.get_widget('filter') diff --git a/gramps2/src/SourceView.py b/gramps2/src/SourceView.py index 68e98c72d..d233cfcc8 100644 --- a/gramps2/src/SourceView.py +++ b/gramps2/src/SourceView.py @@ -49,7 +49,7 @@ from QuestionDialog import QuestionDialog # internationalization # #------------------------------------------------------------------------- -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/Sources.py b/gramps2/src/Sources.py index bee3947af..e24476693 100644 --- a/gramps2/src/Sources.py +++ b/gramps2/src/Sources.py @@ -35,7 +35,7 @@ import gtk.glade import const import Utils import RelLib -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -52,7 +52,7 @@ class SourceSelector: for s in self.orig: self.list.append(RelLib.SourceRef(s)) self.update=update - self.top = gtk.glade.XML(const.srcselFile,"sourcesel") + self.top = gtk.glade.XML(const.srcselFile,"sourcesel","gramps") self.sourcesel = self.top.get_widget("sourcesel") Utils.set_titles(self.sourcesel, self.top.get_widget('title'), @@ -227,7 +227,7 @@ class SourceEditor: self.parent = parent self.update = update self.source_ref = srcref - self.showSource = gtk.glade.XML(const.srcselFile, "sourceDisplay") + self.showSource = gtk.glade.XML(const.srcselFile, "sourceDisplay","gramps") self.sourceDisplay = self.get_widget("sourceDisplay") Utils.set_titles(self.sourceDisplay, self.showSource.get_widget('title'), diff --git a/gramps2/src/StartupDialog.py b/gramps2/src/StartupDialog.py index c6189b938..018bdf250 100644 --- a/gramps2/src/StartupDialog.py +++ b/gramps2/src/StartupDialog.py @@ -24,7 +24,7 @@ import gnome import gnome.ui import gconf -from intl import gettext as _ +from gettext import gettext as _ _StartupEntry = "/apps/gramps/startup" diff --git a/gramps2/src/StyleEditor.py b/gramps2/src/StyleEditor.py index f41b330f1..08f05bbc6 100644 --- a/gramps2/src/StyleEditor.py +++ b/gramps2/src/StyleEditor.py @@ -43,7 +43,7 @@ import const import TextDoc import ListModel import locale -from intl import gettext as _ +from gettext import gettext as _ class StyleListDisplay: """ @@ -62,7 +62,7 @@ class StyleListDisplay: self.callback = callback self.sheetlist = stylesheetlist - self.top = gtk.glade.XML(const.stylesFile,"styles") + self.top = gtk.glade.XML(const.stylesFile,"styles","gramps") Utils.set_titles(self.top.get_widget('styles'), self.top.get_widget('title'), @@ -162,7 +162,7 @@ class StyleEditor: self.original_style = style self.style = TextDoc.StyleSheet(style) self.parent = parent - self.top = gtk.glade.XML(const.stylesFile,"editor") + self.top = gtk.glade.XML(const.stylesFile,"editor","gramps") self.top.signal_autoconnect({ "on_save_style_clicked" : self.on_save_style_clicked, diff --git a/gramps2/src/UrlEdit.py b/gramps2/src/UrlEdit.py index 8ddc3c6cb..a62f066ca 100644 --- a/gramps2/src/UrlEdit.py +++ b/gramps2/src/UrlEdit.py @@ -33,7 +33,7 @@ import gtk.glade import const import Utils import RelLib -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -46,7 +46,7 @@ class UrlEditor: self.parent = parent self.url = url self.callback = callback - self.top = gtk.glade.XML(const.dialogFile, "url_edit") + self.top = gtk.glade.XML(const.dialogFile, "url_edit","gramps") self.window = self.top.get_widget("url_edit") self.des = self.top.get_widget("url_des") self.addr = self.top.get_widget("url_addr") diff --git a/gramps2/src/Utils.py b/gramps2/src/Utils.py index 356e82fdc..b41735af8 100644 --- a/gramps2/src/Utils.py +++ b/gramps2/src/Utils.py @@ -48,7 +48,7 @@ import RelImage # internationalization # #------------------------------------------------------------------------- -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/VersionControl.py b/gramps2/src/VersionControl.py index e8c5f569e..734109d93 100644 --- a/gramps2/src/VersionControl.py +++ b/gramps2/src/VersionControl.py @@ -47,7 +47,7 @@ import gtk.glade # standard python modules # #------------------------------------------------------------------------- -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -76,7 +76,7 @@ class RevisionComment: def __init__(self,filename,save_file): self.filename = filename self.save = save_file - self.top = gtk.glade.XML(const.revisionFile, "revcom") + self.top = gtk.glade.XML(const.revisionFile, "revcom","gramps") self.win = self.top.get_widget("revcom") self.top.signal_autoconnect({ "on_savecomment_clicked" : self.on_savecomment_clicked, @@ -101,7 +101,7 @@ class RevisionSelect: self.load = load self.callback = callback - dialog = gtk.glade.XML(const.revisionFile, "revselect") + dialog = gtk.glade.XML(const.revisionFile, "revselect","gramps") dialog.signal_autoconnect({ "destroy_passed_object" : self.on_cancel_clicked, "on_loadrev_clicked" : self.on_loadrev_clicked, diff --git a/gramps2/src/Witness.py b/gramps2/src/Witness.py index 65b973df8..79012480e 100644 --- a/gramps2/src/Witness.py +++ b/gramps2/src/Witness.py @@ -36,7 +36,7 @@ import const import Utils import RelLib import ListModel -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -112,7 +112,7 @@ class WitnessEditor: self.parent = parent self.update = update self.ref = ref - self.show_witness = gtk.glade.XML(const.dialogFile, "witness_edit") + self.show_witness = gtk.glade.XML(const.dialogFile, "witness_edit","gramps") self.show_witness.signal_autoconnect({ "ok_clicked" : self.ok_clicked, "on_toggled" : self.on_toggled, diff --git a/gramps2/src/WriteXML.py b/gramps2/src/WriteXML.py index db66f5c68..f9912bdea 100644 --- a/gramps2/src/WriteXML.py +++ b/gramps2/src/WriteXML.py @@ -43,7 +43,7 @@ import GrampsCfg import Calendar import Gregorian import RelLib -from intl import gettext as _ +from gettext import gettext as _ from QuestionDialog import ErrorDialog #------------------------------------------------------------------------- diff --git a/gramps2/src/calendars/Islamic.py b/gramps2/src/calendars/Islamic.py index 368426dce..705f0c551 100644 --- a/gramps2/src/calendars/Islamic.py +++ b/gramps2/src/calendars/Islamic.py @@ -41,7 +41,7 @@ import math # #------------------------------------------------------------------------- import Calendar -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/calendars/Makefile.in b/gramps2/src/calendars/Makefile.in index 9b8d0a179..dad64e11f 100644 --- a/gramps2/src/calendars/Makefile.in +++ b/gramps2/src/calendars/Makefile.in @@ -79,7 +79,6 @@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ diff --git a/gramps2/src/calendars/Persian.py b/gramps2/src/calendars/Persian.py index 171d1b073..309d08fb8 100644 --- a/gramps2/src/calendars/Persian.py +++ b/gramps2/src/calendars/Persian.py @@ -41,7 +41,7 @@ import math # #------------------------------------------------------------------------- import Calendar -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/const.py.in b/gramps2/src/const.py.in index 367eea2d1..cc7561300 100644 --- a/gramps2/src/const.py.in +++ b/gramps2/src/const.py.in @@ -32,7 +32,7 @@ import os # internationalization # #------------------------------------------------------------------------- -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/data/Makefile.in b/gramps2/src/data/Makefile.in index 508b80bdb..00bc82cd7 100644 --- a/gramps2/src/data/Makefile.in +++ b/gramps2/src/data/Makefile.in @@ -74,7 +74,6 @@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ diff --git a/gramps2/src/data/templates/Makefile.in b/gramps2/src/data/templates/Makefile.in index 0d64301ec..5633ad08e 100644 --- a/gramps2/src/data/templates/Makefile.in +++ b/gramps2/src/data/templates/Makefile.in @@ -75,7 +75,6 @@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ diff --git a/gramps2/src/docgen/AbiWord2Doc.py b/gramps2/src/docgen/AbiWord2Doc.py index 723ec7e95..6efc7c820 100644 --- a/gramps2/src/docgen/AbiWord2Doc.py +++ b/gramps2/src/docgen/AbiWord2Doc.py @@ -34,7 +34,7 @@ import Plugins import ImgManip from latin_utf8 import latin_to_utf8 -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/docgen/AbiWordDoc.py b/gramps2/src/docgen/AbiWordDoc.py index d6d58279d..eff845b3a 100644 --- a/gramps2/src/docgen/AbiWordDoc.py +++ b/gramps2/src/docgen/AbiWordDoc.py @@ -35,7 +35,7 @@ import string import Plugins import ImgManip import Errors -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/docgen/HtmlDoc.py b/gramps2/src/docgen/HtmlDoc.py index 707708f61..bea65bbb6 100644 --- a/gramps2/src/docgen/HtmlDoc.py +++ b/gramps2/src/docgen/HtmlDoc.py @@ -31,7 +31,7 @@ import const import Errors import TextDoc -from intl import gettext as _ +from gettext import gettext as _ t_header_line_re = re.compile(r"(.*)(.*)(.*)", re.DOTALL|re.IGNORECASE|re.MULTILINE) diff --git a/gramps2/src/docgen/KwordDoc.py b/gramps2/src/docgen/KwordDoc.py index 916326657..052fc7137 100644 --- a/gramps2/src/docgen/KwordDoc.py +++ b/gramps2/src/docgen/KwordDoc.py @@ -29,7 +29,7 @@ import Errors from TarFile import TarFile import Plugins import ImgManip -from intl import gettext as _ +from gettext import gettext as _ def points(val): inch = float(val)/2.54 diff --git a/gramps2/src/docgen/LaTeXDoc.py b/gramps2/src/docgen/LaTeXDoc.py index c5b13b574..bab1f8ea3 100644 --- a/gramps2/src/docgen/LaTeXDoc.py +++ b/gramps2/src/docgen/LaTeXDoc.py @@ -40,7 +40,7 @@ import Plugins import ImgManip import Errors -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/docgen/Makefile.in b/gramps2/src/docgen/Makefile.in index e6646f20f..29cd75d4d 100644 --- a/gramps2/src/docgen/Makefile.in +++ b/gramps2/src/docgen/Makefile.in @@ -78,7 +78,6 @@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ diff --git a/gramps2/src/docgen/OpenDrawDoc.py b/gramps2/src/docgen/OpenDrawDoc.py index b677a5b01..522540480 100644 --- a/gramps2/src/docgen/OpenDrawDoc.py +++ b/gramps2/src/docgen/OpenDrawDoc.py @@ -41,7 +41,7 @@ import DrawDoc import const import FontScale -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/docgen/OpenOfficeDoc.py b/gramps2/src/docgen/OpenOfficeDoc.py index 8e106f102..c4e1c2d4c 100644 --- a/gramps2/src/docgen/OpenOfficeDoc.py +++ b/gramps2/src/docgen/OpenOfficeDoc.py @@ -45,7 +45,7 @@ import ImgManip # internationalization # #------------------------------------------------------------------------- -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/docgen/PSDrawDoc.py b/gramps2/src/docgen/PSDrawDoc.py index e5e544615..f69b5443c 100644 --- a/gramps2/src/docgen/PSDrawDoc.py +++ b/gramps2/src/docgen/PSDrawDoc.py @@ -37,7 +37,7 @@ import TextDoc import DrawDoc from Report import run_print_dialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- diff --git a/gramps2/src/docgen/PdfDoc.py b/gramps2/src/docgen/PdfDoc.py index be6691b63..f9ea18284 100644 --- a/gramps2/src/docgen/PdfDoc.py +++ b/gramps2/src/docgen/PdfDoc.py @@ -27,7 +27,7 @@ import TextDoc import Plugins import Errors import ImgManip -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/docgen/PdfDrawDoc.py b/gramps2/src/docgen/PdfDrawDoc.py index 9ab6e0fd4..b5a3a6630 100644 --- a/gramps2/src/docgen/PdfDrawDoc.py +++ b/gramps2/src/docgen/PdfDrawDoc.py @@ -36,7 +36,7 @@ import Errors import TextDoc import DrawDoc from Report import run_print_dialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/gramps2/src/docgen/RTFDoc.py b/gramps2/src/docgen/RTFDoc.py index 4fa65818b..dad1900d8 100644 --- a/gramps2/src/docgen/RTFDoc.py +++ b/gramps2/src/docgen/RTFDoc.py @@ -28,7 +28,7 @@ import Plugins import ImgManip import Errors -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/docgen/SvgDrawDoc.py b/gramps2/src/docgen/SvgDrawDoc.py index 957da5fc7..59bd82c70 100644 --- a/gramps2/src/docgen/SvgDrawDoc.py +++ b/gramps2/src/docgen/SvgDrawDoc.py @@ -32,7 +32,7 @@ from math import pi, cos, sin, fabs # #------------------------------------------------------------------------- import Plugins -from intl import gettext as _ +from gettext import gettext as _ import TextDoc import DrawDoc import Errors diff --git a/gramps2/src/filters/After.py b/gramps2/src/filters/After.py index 509750e16..07966ab1e 100644 --- a/gramps2/src/filters/After.py +++ b/gramps2/src/filters/After.py @@ -22,7 +22,7 @@ import Filter import Date -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/filters/AltFam.py b/gramps2/src/filters/AltFam.py index 41950cc68..5b54e438e 100644 --- a/gramps2/src/filters/AltFam.py +++ b/gramps2/src/filters/AltFam.py @@ -21,7 +21,7 @@ "People who were adopted" import Filter -from intl import gettext as _ +from gettext import gettext as _ class HaveAltFamilies(Filter.Filter): "People who were adopted" diff --git a/gramps2/src/filters/Before.py b/gramps2/src/filters/Before.py index d3f2ad15a..8f413af99 100644 --- a/gramps2/src/filters/Before.py +++ b/gramps2/src/filters/Before.py @@ -22,7 +22,7 @@ import Filter import Date -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/filters/Disconnected.py b/gramps2/src/filters/Disconnected.py index 8d3a09b74..7831312ef 100644 --- a/gramps2/src/filters/Disconnected.py +++ b/gramps2/src/filters/Disconnected.py @@ -21,7 +21,7 @@ "Disconnected individuals" import Filter -from intl import gettext as _ +from gettext import gettext as _ class Disconnected(Filter.Filter): "Disconnected individuals" diff --git a/gramps2/src/filters/EventPlace.py b/gramps2/src/filters/EventPlace.py index cbfb46c1e..0ab815418 100644 --- a/gramps2/src/filters/EventPlace.py +++ b/gramps2/src/filters/EventPlace.py @@ -22,7 +22,7 @@ import Filter import re -from intl import gettext as _ +from gettext import gettext as _ class EventPlace(Filter.Filter): """Finds people with a specfied event location in any field""" diff --git a/gramps2/src/filters/EventType.py b/gramps2/src/filters/EventType.py index 52232f6c3..1e46ffaf4 100644 --- a/gramps2/src/filters/EventType.py +++ b/gramps2/src/filters/EventType.py @@ -21,7 +21,7 @@ "People who have an event type of ..." import Filter -from intl import gettext as _ +from gettext import gettext as _ class EventType(Filter.Filter): diff --git a/gramps2/src/filters/Females.py b/gramps2/src/filters/Females.py index 96665a3dc..153dd60c6 100644 --- a/gramps2/src/filters/Females.py +++ b/gramps2/src/filters/Females.py @@ -22,7 +22,7 @@ import Filter import RelLib -from intl import gettext as _ +from gettext import gettext as _ class Females(Filter.Filter): "Females" diff --git a/gramps2/src/filters/HavePhotos.py b/gramps2/src/filters/HavePhotos.py index 282c73fb6..f38e941f6 100644 --- a/gramps2/src/filters/HavePhotos.py +++ b/gramps2/src/filters/HavePhotos.py @@ -21,7 +21,7 @@ "People who have images" import Filter -from intl import gettext as _ +from gettext import gettext as _ class HavePhotos(Filter.Filter): "People who have images" diff --git a/gramps2/src/filters/IncompleteNames.py b/gramps2/src/filters/IncompleteNames.py index 391465eb8..9412f58b6 100644 --- a/gramps2/src/filters/IncompleteNames.py +++ b/gramps2/src/filters/IncompleteNames.py @@ -21,7 +21,7 @@ "People with incomplete names" import Filter -from intl import gettext as _ +from gettext import gettext as _ class IncompleteNames(Filter.Filter): "People with incomplete names" diff --git a/gramps2/src/filters/Makefile.in b/gramps2/src/filters/Makefile.in index f52b6858c..e7dc156c5 100644 --- a/gramps2/src/filters/Makefile.in +++ b/gramps2/src/filters/Makefile.in @@ -74,7 +74,6 @@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ diff --git a/gramps2/src/filters/Males.py b/gramps2/src/filters/Males.py index edde2d0b1..a7a9275d8 100644 --- a/gramps2/src/filters/Males.py +++ b/gramps2/src/filters/Males.py @@ -22,7 +22,7 @@ import Filter import RelLib -from intl import gettext as _ +from gettext import gettext as _ class Males(Filter.Filter): "Males" diff --git a/gramps2/src/filters/MatchSndEx.py b/gramps2/src/filters/MatchSndEx.py index cb7878f43..b1ca39066 100644 --- a/gramps2/src/filters/MatchSndEx.py +++ b/gramps2/src/filters/MatchSndEx.py @@ -22,7 +22,7 @@ import Filter import soundex -from intl import gettext as _ +from gettext import gettext as _ class MatchSndEx(Filter.Filter): "Names with same SoundEx code as ..." diff --git a/gramps2/src/filters/MatchSndEx2.py b/gramps2/src/filters/MatchSndEx2.py index 5a5919916..569f61b24 100644 --- a/gramps2/src/filters/MatchSndEx2.py +++ b/gramps2/src/filters/MatchSndEx2.py @@ -22,7 +22,7 @@ import Filter import soundex -from intl import gettext as _ +from gettext import gettext as _ class MatchSndEx2(Filter.Filter): "Names with the specified SoundEx code" diff --git a/gramps2/src/filters/MutlipleMarriages.py b/gramps2/src/filters/MutlipleMarriages.py index 0b9615d27..8e1ccd7da 100644 --- a/gramps2/src/filters/MutlipleMarriages.py +++ b/gramps2/src/filters/MutlipleMarriages.py @@ -21,7 +21,7 @@ "People with multiple marriage records" import Filter -from intl import gettext as _ +from gettext import gettext as _ class MultipleMarriages(Filter.Filter): "People with multiple marriage records" diff --git a/gramps2/src/filters/NeverMarried.py b/gramps2/src/filters/NeverMarried.py index 2a0ae46a8..7db1556af 100644 --- a/gramps2/src/filters/NeverMarried.py +++ b/gramps2/src/filters/NeverMarried.py @@ -21,7 +21,7 @@ "People with no marriage records" import Filter -from intl import gettext as _ +from gettext import gettext as _ class NeverMarried(Filter.Filter): "People with no marriage records" diff --git a/gramps2/src/filters/NoBirthdate.py b/gramps2/src/filters/NoBirthdate.py index be9e71d36..860dc248f 100644 --- a/gramps2/src/filters/NoBirthdate.py +++ b/gramps2/src/filters/NoBirthdate.py @@ -21,7 +21,7 @@ "People without a birth date" import Filter -from intl import gettext as _ +from gettext import gettext as _ class NoBirthdate(Filter.Filter): "People without a birth date" diff --git a/gramps2/src/filters/NoChildren.py b/gramps2/src/filters/NoChildren.py index 4b8ca2398..da3f9e088 100644 --- a/gramps2/src/filters/NoChildren.py +++ b/gramps2/src/filters/NoChildren.py @@ -21,7 +21,7 @@ "People with children" import Filter -from intl import gettext as _ +from gettext import gettext as _ class HaveChildren(Filter.Filter): "People with children" diff --git a/gramps2/src/filters/RegExMatch.py b/gramps2/src/filters/RegExMatch.py index 3b1beb74f..e0469d7da 100644 --- a/gramps2/src/filters/RegExMatch.py +++ b/gramps2/src/filters/RegExMatch.py @@ -23,7 +23,7 @@ import Filter import re import Utils -from intl import gettext as _ +from gettext import gettext as _ class RegExMatch(Filter.Filter): "Names that match a regular expression" diff --git a/gramps2/src/filters/SubString.py b/gramps2/src/filters/SubString.py index 4e490d7de..6cd1177b6 100644 --- a/gramps2/src/filters/SubString.py +++ b/gramps2/src/filters/SubString.py @@ -23,7 +23,7 @@ import Filter import string import Utils -from intl import gettext as _ +from gettext import gettext as _ class SubString(Filter.Filter): "Names that contain a substring" diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index 08ba5cbc2..795e17f55 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -31,7 +31,7 @@ import getopt # internationalization # #------------------------------------------------------------------------- -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -276,7 +276,7 @@ class Gramps: widgets that it will need. """ - self.gtop = gtk.glade.XML(const.gladeFile, "gramps") + self.gtop = gtk.glade.XML(const.gladeFile, "gramps", "gramps") self.topWindow = self.gtop.get_widget("gramps") self.report_button = self.gtop.get_widget("reports") @@ -1558,7 +1558,7 @@ class Gramps: self.save_query_noquit) if not Utils.wasModified(): - wFs = gtk.glade.XML(const.revisionFile, "dbopen") + wFs = gtk.glade.XML(const.revisionFile, "dbopen","gramps") wFs.signal_autoconnect({ "on_ok_button1_clicked": self.on_ok_button1_clicked, "destroy_passed_object": Utils.destroy_passed_object @@ -1611,7 +1611,7 @@ class Gramps: Utils.clear_timer() def on_save_as_activate(self,obj): - wFs = gtk.glade.XML (const.gladeFile, "fileselection") + wFs = gtk.glade.XML (const.gladeFile, "fileselection","gramps") wFs.signal_autoconnect({ "on_ok_button1_clicked": self.on_ok_button2_clicked, "destroy_passed_object": Utils.destroy_passed_object diff --git a/gramps2/src/plugins/AncestorChart.py b/gramps2/src/plugins/AncestorChart.py index 25022406a..4231b1d57 100644 --- a/gramps2/src/plugins/AncestorChart.py +++ b/gramps2/src/plugins/AncestorChart.py @@ -48,7 +48,7 @@ import Errors import FontScale from QuestionDialog import ErrorDialog from SubstKeywords import SubstKeywords -from intl import gettext as _ +from gettext import gettext as _ _BORN = _('b.') _DIED = _('d.') diff --git a/gramps2/src/plugins/AncestorReport.py b/gramps2/src/plugins/AncestorReport.py index cdc4dffc2..d8524ba9b 100644 --- a/gramps2/src/plugins/AncestorReport.py +++ b/gramps2/src/plugins/AncestorReport.py @@ -38,7 +38,7 @@ import TextDoc import RelLib import Errors from QuestionDialog import ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/Ancestors.py b/gramps2/src/plugins/Ancestors.py index fda0a83f2..868604e6a 100644 --- a/gramps2/src/plugins/Ancestors.py +++ b/gramps2/src/plugins/Ancestors.py @@ -35,7 +35,7 @@ import RelLib import Errors import Relationship from QuestionDialog import ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/BookReport.py b/gramps2/src/plugins/BookReport.py index d9021380e..5664c404a 100644 --- a/gramps2/src/plugins/BookReport.py +++ b/gramps2/src/plugins/BookReport.py @@ -47,7 +47,7 @@ except: # internationalization # #------------------------------------------------------------------------- -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -471,7 +471,7 @@ class BookListDisplay: self.booklist = booklist base = os.path.dirname(__file__) glade_file = os.path.join(base,"book.glade") - self.xml = gtk.glade.XML(glade_file,"booklist") + self.xml = gtk.glade.XML(glade_file,"booklist","gramps") self.top = self.xml.get_widget('booklist') Utils.set_titles(self.top, @@ -556,7 +556,7 @@ class BookReportSelector: base = os.path.dirname(__file__) glade_file = os.path.join(base,"book.glade") - self.xml = gtk.glade.XML(glade_file,"top") + self.xml = gtk.glade.XML(glade_file,"top","gramps") self.top = self.xml.get_widget("top") self.xml.signal_autoconnect({ diff --git a/gramps2/src/plugins/ChangeTypes.py b/gramps2/src/plugins/ChangeTypes.py index 8e4f6948f..3e9577416 100644 --- a/gramps2/src/plugins/ChangeTypes.py +++ b/gramps2/src/plugins/ChangeTypes.py @@ -27,7 +27,7 @@ import gtk.glade import const import Utils -from intl import gettext as _ +from gettext import gettext as _ from QuestionDialog import OkDialog import AutoComp @@ -55,7 +55,7 @@ class ChangeTypes: base = os.path.dirname(__file__) glade_file = "%s/%s" % (base,"changetype.glade") - self.glade = gtk.glade.XML(glade_file,"top") + self.glade = gtk.glade.XML(glade_file,"top","gramps") self.auto1 = AutoComp.AutoCombo(self.glade.get_widget("original"), const.personalEvents) diff --git a/gramps2/src/plugins/Check.py b/gramps2/src/plugins/Check.py index 08ede68c5..9b4abfa71 100644 --- a/gramps2/src/plugins/Check.py +++ b/gramps2/src/plugins/Check.py @@ -45,7 +45,7 @@ import gtk.glade import RelLib import Utils -from intl import gettext as _ +from gettext import gettext as _ from QuestionDialog import OkDialog, MissingMediaDialog #------------------------------------------------------------------------- @@ -327,7 +327,7 @@ class CheckIntegrity: else: base = os.path.dirname(__file__) glade_file = base + os.sep + "summary.glade" - topDialog = gtk.glade.XML(glade_file,"summary") + topDialog = gtk.glade.XML(glade_file,"summary","gramps") topDialog.signal_autoconnect({ "destroy_passed_object" : Utils.destroy_passed_object, }) diff --git a/gramps2/src/plugins/CustomBookText.py b/gramps2/src/plugins/CustomBookText.py index 34df2f8a9..d80dcc1ca 100644 --- a/gramps2/src/plugins/CustomBookText.py +++ b/gramps2/src/plugins/CustomBookText.py @@ -41,7 +41,7 @@ import TextDoc import RelLib import Errors from QuestionDialog import ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ import gtk import gnome diff --git a/gramps2/src/plugins/DesGraph.py b/gramps2/src/plugins/DesGraph.py index 89800acc7..43016df23 100644 --- a/gramps2/src/plugins/DesGraph.py +++ b/gramps2/src/plugins/DesGraph.py @@ -47,7 +47,7 @@ import TextDoc import Errors from SubstKeywords import SubstKeywords -from intl import gettext as _ +from gettext import gettext as _ from QuestionDialog import ErrorDialog _BORN = _('b.') diff --git a/gramps2/src/plugins/Desbrowser.py b/gramps2/src/plugins/Desbrowser.py index 2c3702fd7..e1e665011 100644 --- a/gramps2/src/plugins/Desbrowser.py +++ b/gramps2/src/plugins/Desbrowser.py @@ -33,7 +33,7 @@ import os # #------------------------------------------------------------------------ import Utils -from intl import gettext as _ +from gettext import gettext as _ import GrampsCfg #------------------------------------------------------------------------ @@ -66,7 +66,7 @@ class DesBrowse: base = os.path.dirname(__file__) glade_file = base + os.sep + "desbrowse.glade" - self.glade = gtk.glade.XML(glade_file,"top") + self.glade = gtk.glade.XML(glade_file,"top","gramps") self.glade.signal_autoconnect({ "destroy_passed_object" : Utils.destroy_passed_object, }) diff --git a/gramps2/src/plugins/DescendReport.py b/gramps2/src/plugins/DescendReport.py index a4798d836..f5200a4e9 100644 --- a/gramps2/src/plugins/DescendReport.py +++ b/gramps2/src/plugins/DescendReport.py @@ -39,7 +39,7 @@ import TextDoc import Errors from QuestionDialog import ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/DetAncestralReport.py b/gramps2/src/plugins/DetAncestralReport.py index 98d112652..1fcbda904 100644 --- a/gramps2/src/plugins/DetAncestralReport.py +++ b/gramps2/src/plugins/DetAncestralReport.py @@ -26,7 +26,7 @@ import sort import Errors import string -from intl import gettext as _ +from gettext import gettext as _ from QuestionDialog import ErrorDialog import Report diff --git a/gramps2/src/plugins/DetDescendantReport.py b/gramps2/src/plugins/DetDescendantReport.py index 10130e0f5..1d755e83e 100644 --- a/gramps2/src/plugins/DetDescendantReport.py +++ b/gramps2/src/plugins/DetDescendantReport.py @@ -27,7 +27,7 @@ import Errors import string from QuestionDialog import ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ import Report import TextDoc diff --git a/gramps2/src/plugins/EventCmp.py b/gramps2/src/plugins/EventCmp.py index 8d2de8bc0..f4af9e6a7 100644 --- a/gramps2/src/plugins/EventCmp.py +++ b/gramps2/src/plugins/EventCmp.py @@ -49,7 +49,7 @@ import OpenSpreadSheet import const from QuestionDialog import WarningDialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # @@ -129,7 +129,7 @@ class EventComparison: self.glade_file = base + os.sep + "eventcmp.glade" self.qual = 0 - self.filterDialog = gtk.glade.XML(self.glade_file,"filters") + self.filterDialog = gtk.glade.XML(self.glade_file,"filters","gramps") self.filterDialog.signal_autoconnect({ "on_apply_clicked" : self.on_apply_clicked, "on_editor_clicked" : self.filter_editor_clicked, @@ -208,7 +208,7 @@ class DisplayChart: base = os.path.dirname(__file__) self.glade_file = base + os.sep + "eventcmp.glade" - self.topDialog = gtk.glade.XML(self.glade_file,"view") + self.topDialog = gtk.glade.XML(self.glade_file,"view","gramps") self.topDialog.signal_autoconnect({ "on_write_table" : self.on_write_table, "destroy_passed_object" : Utils.destroy_passed_object @@ -306,7 +306,7 @@ class DisplayChart: return [_("Person"),_("Birth"),_("Death")] + sort_list def on_write_table(self,obj): - self.form = gtk.glade.XML(self.glade_file,"dialog1") + self.form = gtk.glade.XML(self.glade_file,"dialog1","gramps") self.form.signal_autoconnect({ "on_save_clicked" : self.on_save_clicked, "on_html_toggled" : self.on_html_toggled, diff --git a/gramps2/src/plugins/FamilyGroup.py b/gramps2/src/plugins/FamilyGroup.py index 519ff8117..96f9f7f8d 100644 --- a/gramps2/src/plugins/FamilyGroup.py +++ b/gramps2/src/plugins/FamilyGroup.py @@ -38,7 +38,7 @@ import Report import TextDoc import Errors import Utils -from intl import gettext as _ +from gettext import gettext as _ from QuestionDialog import ErrorDialog #------------------------------------------------------------------------ diff --git a/gramps2/src/plugins/FanChart.py b/gramps2/src/plugins/FanChart.py index 1660e5ac5..f7f43d022 100644 --- a/gramps2/src/plugins/FanChart.py +++ b/gramps2/src/plugins/FanChart.py @@ -40,7 +40,7 @@ import Calendar from QuestionDialog import ErrorDialog from FontScale import string_width from SubstKeywords import SubstKeywords -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/FilterEditor.py b/gramps2/src/plugins/FilterEditor.py index 37acb987c..2e31ab471 100644 --- a/gramps2/src/plugins/FilterEditor.py +++ b/gramps2/src/plugins/FilterEditor.py @@ -49,7 +49,7 @@ import AutoComp import ListModel import Utils import SelectPerson -from intl import gettext as _ +from gettext import gettext as _ _name2list = { _('Personal event:') : const.personalEvents, @@ -217,7 +217,7 @@ class FilterEditor: self.filterdb = GenericFilter.GenericFilterList(filterdb) self.filterdb.load() - self.editor = gtk.glade.XML(const.filterFile,'filter_list') + self.editor = gtk.glade.XML(const.filterFile,'filter_list',"gramps") self.editor_top = self.editor.get_widget('filter_list') self.filter_list = self.editor.get_widget('filters') self.edit = self.editor.get_widget('edit') @@ -289,7 +289,7 @@ class FilterEditor: def filter_editor(self,filter): self.filter = filter - self.glade = gtk.glade.XML(const.filterFile,'define_filter') + self.glade = gtk.glade.XML(const.filterFile,'define_filter',"gramps") self.top = self.glade.get_widget('define_filter') self.define_title = self.glade.get_widget('title') @@ -392,7 +392,7 @@ class FilterEditor: self.pmap[p.get_title()] = p self.active_rule = val - self.rule = gtk.glade.XML(const.filterFile,'rule_editor') + self.rule = gtk.glade.XML(const.filterFile,'rule_editor',"gramps") self.rule_top = self.rule.get_widget('rule_editor') self.valuebox = self.rule.get_widget('valuebox') self.rname = self.rule.get_widget('ruletree') @@ -568,7 +568,7 @@ class FilterEditor: class ShowResults: def __init__(self,plist): - self.glade = gtk.glade.XML(const.filterFile,'test') + self.glade = gtk.glade.XML(const.filterFile,'test',"gramps") self.top = self.glade.get_widget('test') text = self.glade.get_widget('text') diff --git a/gramps2/src/plugins/FtmStyleAncestors.py b/gramps2/src/plugins/FtmStyleAncestors.py index 59581f5ff..bd502d6c5 100644 --- a/gramps2/src/plugins/FtmStyleAncestors.py +++ b/gramps2/src/plugins/FtmStyleAncestors.py @@ -37,7 +37,7 @@ import TextDoc import RelLib import Errors from QuestionDialog import ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/FtmStyleDescendants.py b/gramps2/src/plugins/FtmStyleDescendants.py index 636f4bca0..66508ec44 100644 --- a/gramps2/src/plugins/FtmStyleDescendants.py +++ b/gramps2/src/plugins/FtmStyleDescendants.py @@ -43,7 +43,7 @@ import RelLib import Errors import Utils from QuestionDialog import ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/GraphViz.py b/gramps2/src/plugins/GraphViz.py index d043439c6..a6ba40abd 100644 --- a/gramps2/src/plugins/GraphViz.py +++ b/gramps2/src/plugins/GraphViz.py @@ -46,7 +46,7 @@ import TextDoc import GenericFilter import Errors -from intl import gettext as _ +from gettext import gettext as _ from latin_utf8 import utf8_to_latin #------------------------------------------------------------------------ diff --git a/gramps2/src/plugins/IndivComplete.py b/gramps2/src/plugins/IndivComplete.py index 08d993b2d..8955c8bcf 100644 --- a/gramps2/src/plugins/IndivComplete.py +++ b/gramps2/src/plugins/IndivComplete.py @@ -39,7 +39,7 @@ import Report import GenericFilter import Errors from QuestionDialog import ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/IndivSummary.py b/gramps2/src/plugins/IndivSummary.py index 3cd4fa916..7166eb624 100644 --- a/gramps2/src/plugins/IndivSummary.py +++ b/gramps2/src/plugins/IndivSummary.py @@ -46,7 +46,7 @@ import StyleEditor import Report import Errors from QuestionDialog import ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/Makefile.in b/gramps2/src/plugins/Makefile.in index 22d81da05..1dba8d36e 100644 --- a/gramps2/src/plugins/Makefile.in +++ b/gramps2/src/plugins/Makefile.in @@ -75,7 +75,6 @@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@ diff --git a/gramps2/src/plugins/Merge.py b/gramps2/src/plugins/Merge.py index 10b2d06e5..3e1c45754 100644 --- a/gramps2/src/plugins/Merge.py +++ b/gramps2/src/plugins/Merge.py @@ -31,7 +31,7 @@ import soundex import GrampsCfg import ListModel import MergeData -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -101,7 +101,7 @@ class Merge: base = os.path.dirname(__file__) self.glade_file = "%s/%s" % (base,"merge.glade") - top = gtk.glade.XML(self.glade_file,"dialog") + top = gtk.glade.XML(self.glade_file,"dialog","gramps") my_menu = gtk.Menu() item = gtk.MenuItem(_("Low")) @@ -142,7 +142,7 @@ class Merge: gtk.mainiteration() def find_potentials(self,thresh): - top = gtk.glade.XML(self.glade_file,"message") + top = gtk.glade.XML(self.glade_file,"message","gramps") self.topWin = top.get_widget("message") self.progress = top.get_widget("progressbar1") @@ -208,7 +208,7 @@ class Merge: self.dellist = {} def show(self): - top = gtk.glade.XML(self.glade_file,"mergelist") + top = gtk.glade.XML(self.glade_file,"mergelist","gramps") self.window = top.get_widget("mergelist") Utils.set_titles(self.window, top.get_widget('title'), diff --git a/gramps2/src/plugins/PatchNames.py b/gramps2/src/plugins/PatchNames.py index b421bc411..9f0459b09 100644 --- a/gramps2/src/plugins/PatchNames.py +++ b/gramps2/src/plugins/PatchNames.py @@ -44,7 +44,7 @@ import gtk.glade #------------------------------------------------------------------------- import Utils from QuestionDialog import OkDialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -114,7 +114,7 @@ class PatchNames: base = os.path.dirname(__file__) glade_file = base + os.sep + "patchnames.glade" - self.top = gtk.glade.XML(glade_file,"top") + self.top = gtk.glade.XML(glade_file,"top","gramps") self.top.signal_autoconnect({ "destroy_passed_object" : Utils.destroy_passed_object, "on_ok_clicked" : self.on_ok_clicked diff --git a/gramps2/src/plugins/ReadGedcom.py b/gramps2/src/plugins/ReadGedcom.py index ab581990f..fc30908c7 100644 --- a/gramps2/src/plugins/ReadGedcom.py +++ b/gramps2/src/plugins/ReadGedcom.py @@ -55,7 +55,7 @@ import latin_utf8 import Utils from GedcomInfo import * from QuestionDialog import ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -128,7 +128,7 @@ def importData(database, filename, cb=None): glade_file = "%s/gedcomimport.glade" % os.path.dirname(__file__) - statusTop = gtk.glade.XML(glade_file,"status") + statusTop = gtk.glade.XML(glade_file,"status","gramps") statusWindow = statusTop.get_widget("status") Utils.set_titles(statusWindow,statusTop.get_widget('title'), diff --git a/gramps2/src/plugins/ReadNative.py b/gramps2/src/plugins/ReadNative.py index 7b8239e2d..5b9b65bc6 100644 --- a/gramps2/src/plugins/ReadNative.py +++ b/gramps2/src/plugins/ReadNative.py @@ -26,7 +26,7 @@ from ReadXML import * import Utils -from intl import gettext as _ +from gettext import gettext as _ import gtk import const import os diff --git a/gramps2/src/plugins/ReadPkg.py b/gramps2/src/plugins/ReadPkg.py index 90e65c520..a3e925cb7 100644 --- a/gramps2/src/plugins/ReadPkg.py +++ b/gramps2/src/plugins/ReadPkg.py @@ -26,7 +26,7 @@ from ReadXML import * import Utils -from intl import gettext as _ +from gettext import gettext as _ import gtk import const import os diff --git a/gramps2/src/plugins/RelCalc.py b/gramps2/src/plugins/RelCalc.py index 052d770cf..af28dc4ce 100644 --- a/gramps2/src/plugins/RelCalc.py +++ b/gramps2/src/plugins/RelCalc.py @@ -46,7 +46,7 @@ import RelLib import Utils import ListModel import Plugins -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -73,7 +73,7 @@ class RelCalc: base = os.path.dirname(__file__) glade_file = "%s/relcalc.glade" % base - self.glade = gtk.glade.XML(glade_file,"relcalc") + self.glade = gtk.glade.XML(glade_file,"relcalc","gramps") name = self.person.getPrimaryName().getRegularName() diff --git a/gramps2/src/plugins/ReorderIds.py b/gramps2/src/plugins/ReorderIds.py index db9e4f891..923da6429 100644 --- a/gramps2/src/plugins/ReorderIds.py +++ b/gramps2/src/plugins/ReorderIds.py @@ -25,7 +25,7 @@ scheme specified in the database's prefix ids import re import Utils -from intl import gettext as _ +from gettext import gettext as _ _findint = re.compile('^[^\d]*(\d+)[^\d]*') diff --git a/gramps2/src/plugins/SimpleBookTitle.py b/gramps2/src/plugins/SimpleBookTitle.py index 7b867cd02..833fca2c9 100644 --- a/gramps2/src/plugins/SimpleBookTitle.py +++ b/gramps2/src/plugins/SimpleBookTitle.py @@ -36,7 +36,7 @@ import TextDoc import RelLib import Errors from QuestionDialog import ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ import gtk import gnome diff --git a/gramps2/src/plugins/Summary.py b/gramps2/src/plugins/Summary.py index 50b7409cf..52fd315ce 100644 --- a/gramps2/src/plugins/Summary.py +++ b/gramps2/src/plugins/Summary.py @@ -35,7 +35,7 @@ import posixpath #------------------------------------------------------------------------ import Utils import RelLib -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # @@ -134,7 +134,7 @@ def report(database,person): base = os.path.dirname(__file__) glade_file = "%s/summary.glade" % base - topDialog = gtk.glade.XML(glade_file,"summary") + topDialog = gtk.glade.XML(glade_file,"summary","gramps") topDialog.signal_autoconnect({ "destroy_passed_object" : Utils.destroy_passed_object, }) diff --git a/gramps2/src/plugins/TimeLine.py b/gramps2/src/plugins/TimeLine.py index 369489f83..29bc48cf3 100644 --- a/gramps2/src/plugins/TimeLine.py +++ b/gramps2/src/plugins/TimeLine.py @@ -52,7 +52,7 @@ import FontScale import sort from QuestionDialog import ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/Verify.py b/gramps2/src/plugins/Verify.py index c9dca16ea..d1b60bebf 100644 --- a/gramps2/src/plugins/Verify.py +++ b/gramps2/src/plugins/Verify.py @@ -49,7 +49,7 @@ import gtk.glade #------------------------------------------------------------------------ import RelLib import Utils -from intl import gettext as _ +from gettext import gettext as _ db = None glade_file = None @@ -74,7 +74,7 @@ def runTool(database,active_person,callback): base = os.path.dirname(__file__) glade_file = base + os.sep + "verify.glade" - verifySettings = gtk.glade.XML(glade_file,"verify_settings") + verifySettings = gtk.glade.XML(glade_file,"verify_settings","gramps") verifySettings.signal_autoconnect({ "destroy_passed_object" : Utils.destroy_passed_object, "on_verify_ok_clicked" : on_apply_clicked @@ -391,7 +391,7 @@ def on_apply_clicked(obj): error.close() warn.close() - verifyResult = gtk.glade.XML(glade_file,"verify_result") + verifyResult = gtk.glade.XML(glade_file,"verify_result","gramps") Utils.set_titles(verifyResult.get_widget('verify_result'), verifyResult.get_widget('title'), _('Database Verify')) diff --git a/gramps2/src/plugins/WebPage.py b/gramps2/src/plugins/WebPage.py index f38a7b17d..650323026 100644 --- a/gramps2/src/plugins/WebPage.py +++ b/gramps2/src/plugins/WebPage.py @@ -54,7 +54,7 @@ import sort import Report import Errors from QuestionDialog import ErrorDialog -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/WriteCD.py b/gramps2/src/plugins/WriteCD.py index aef291e06..c4d997b81 100644 --- a/gramps2/src/plugins/WriteCD.py +++ b/gramps2/src/plugins/WriteCD.py @@ -50,7 +50,7 @@ import QuestionDialog import RelImage import ImgManip -from intl import gettext as _ +from gettext import gettext as _ _title_string = _("Export to CD") @@ -89,7 +89,7 @@ class PackageWriter: "on_ok_clicked" : self.on_ok_clicked } - self.top = gtk.glade.XML(glade_file,"packageExport") + self.top = gtk.glade.XML(glade_file,"packageExport","gramps") Utils.set_titles(self.top.get_widget('packageExport'), self.top.get_widget('title'),_title_string) diff --git a/gramps2/src/plugins/WriteFtree.py b/gramps2/src/plugins/WriteFtree.py index 42801253a..a944e975b 100644 --- a/gramps2/src/plugins/WriteFtree.py +++ b/gramps2/src/plugins/WriteFtree.py @@ -50,7 +50,7 @@ import Errors from QuestionDialog import MissingMediaDialog -from intl import gettext as _ +from gettext import gettext as _ _title_string = _("Export to Web Family Tree") @@ -86,7 +86,7 @@ class FtreeWriter: } self.plist = {} - self.top = gtk.glade.XML(glade_file,"top") + self.top = gtk.glade.XML(glade_file,"top","gramps") Utils.set_titles(self.top.get_widget('top'), self.top.get_widget('title'), diff --git a/gramps2/src/plugins/WriteGedcom.py b/gramps2/src/plugins/WriteGedcom.py index 529509bc0..74647b809 100644 --- a/gramps2/src/plugins/WriteGedcom.py +++ b/gramps2/src/plugins/WriteGedcom.py @@ -56,7 +56,7 @@ import GedcomInfo import Errors import ansel_utf8 -from intl import gettext as _ +from gettext import gettext as _ from QuestionDialog import ErrorDialog _title_string = _("Export to GEDCOM") @@ -364,7 +364,7 @@ class GedcomWriter: else: glade_file = "%s/gedcomexport.glade" % os.path.dirname(__file__) - self.topDialog = gtk.glade.XML(glade_file,"gedcomExport") + self.topDialog = gtk.glade.XML(glade_file,"gedcomExport","gramps") self.topDialog.signal_autoconnect({ "destroy_passed_object" : Utils.destroy_passed_object, "gnu_free" : self.gnu_free, @@ -499,7 +499,7 @@ class GedcomWriter: glade_file = "%s/gedcomexport.glade" % os.path.dirname(__file__) - self.exprogress = gtk.glade.XML(glade_file,"exportprogress") + self.exprogress = gtk.glade.XML(glade_file,"exportprogress","gramps") self.exprogress.signal_autoconnect({ "on_close_clicked" : Utils.destroy_passed_object }) diff --git a/gramps2/src/plugins/WritePkg.py b/gramps2/src/plugins/WritePkg.py index 8389be51c..1c872de6a 100644 --- a/gramps2/src/plugins/WritePkg.py +++ b/gramps2/src/plugins/WritePkg.py @@ -47,7 +47,7 @@ import TarFile import Utils from QuestionDialog import MissingMediaDialog -from intl import gettext as _ +from gettext import gettext as _ _title_string = _("Export to GRAMPS package") #------------------------------------------------------------------------- @@ -81,7 +81,7 @@ class PackageWriter: "on_ok_clicked" : self.on_ok_clicked } - self.top = gtk.glade.XML(glade_file,"packageExport") + self.top = gtk.glade.XML(glade_file,"packageExport","gramps") Utils.set_titles(self.top.get_widget('packageExport'), self.top.get_widget('title'), diff --git a/gramps2/src/plugins/count_anc.py b/gramps2/src/plugins/count_anc.py index 41e3cb747..306f3204d 100644 --- a/gramps2/src/plugins/count_anc.py +++ b/gramps2/src/plugins/count_anc.py @@ -22,7 +22,7 @@ import os import Utils -from intl import gettext as _ +from gettext import gettext as _ from gnome.ui import * import gtk @@ -41,7 +41,7 @@ class CountAncestors: text = "" glade_file = "%s/summary.glade" % os.path.dirname(__file__) - topDialog = gtk.glade.XML(glade_file,"summary") + topDialog = gtk.glade.XML(glade_file,"summary","gramps") topDialog.signal_autoconnect({ "destroy_passed_object" : Utils.destroy_passed_object, }) diff --git a/gramps2/src/plugins/eval.py b/gramps2/src/plugins/eval.py index 4169f6859..2a1c72b9f 100644 --- a/gramps2/src/plugins/eval.py +++ b/gramps2/src/plugins/eval.py @@ -30,13 +30,13 @@ import gtk.glade import Utils -from intl import gettext as _ +from gettext import gettext as _ class EvalWindow: def __init__(self): glade_file = "%s/%s" % (os.path.dirname(__file__),"eval.glade") - self.glade = gtk.glade.XML(glade_file,"top") + self.glade = gtk.glade.XML(glade_file,"top","gramps") self.top = self.glade.get_widget("top") self.dbuf = self.glade.get_widget("display").get_buffer() diff --git a/gramps2/src/plugins/leak.py b/gramps2/src/plugins/leak.py index aa9bf4954..395bfbbd8 100644 --- a/gramps2/src/plugins/leak.py +++ b/gramps2/src/plugins/leak.py @@ -27,13 +27,13 @@ import gtk.glade import gc import string -from intl import gettext as _ +from gettext import gettext as _ class EvalWindow: def __init__(self): glade_file = "%s/%s" % (os.path.dirname(__file__),"leak.glade") - self.glade = gtk.glade.XML(glade_file,"top") + self.glade = gtk.glade.XML(glade_file,"top","gramps") self.top = self.glade.get_widget("top") self.eval = self.glade.get_widget("eval") diff --git a/gramps2/src/plugins/soundgen.py b/gramps2/src/plugins/soundgen.py index d5c6aea14..e97633815 100644 --- a/gramps2/src/plugins/soundgen.py +++ b/gramps2/src/plugins/soundgen.py @@ -29,7 +29,7 @@ import soundex import Utils import AutoComp -from intl import gettext as _ +from gettext import gettext as _ #------------------------------------------------------------------------- # @@ -46,7 +46,7 @@ class SoundGen: base = os.path.dirname(__file__) glade_file = base + os.sep + "soundex.glade" - self.glade = gtk.glade.XML(glade_file,"soundEx") + self.glade = gtk.glade.XML(glade_file,"soundEx","gramps") self.glade.signal_autoconnect({ "destroy_passed_object" : Utils.destroy_passed_object, }) diff --git a/gramps2/src/po/Makefile.in b/gramps2/src/po/Makefile.in index 0e04391cb..b2f7d82ff 100644 --- a/gramps2/src/po/Makefile.in +++ b/gramps2/src/po/Makefile.in @@ -74,7 +74,6 @@ GNOMELIB = @GNOMELIB@ GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ MSGFMT = @MSGFMT@