From 1d25e5111006cd8fd722ee323d55cf001160a98e Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 3 Sep 2003 04:20:11 +0000 Subject: [PATCH] update svn: r2086 --- ChangeLog | 5 ++++ Makefile.in | 1 + configure | 42 ++++++++++++++++++++++++++++++++- configure.in | 1 + doc/Makefile.in | 1 + doc/gramps-manual/C/Makefile.in | 1 + doc/gramps-manual/Makefile.in | 1 + example/Makefile.in | 1 + example/gramps/Makefile.in | 1 + gramps.spec | 2 +- src/Makefile.in | 1 + src/calendars/Makefile.in | 1 + src/data/Makefile.in | 1 + src/data/templates/Makefile.in | 1 + src/docgen/Makefile.in | 2 +- src/filters/Makefile.in | 1 + src/plugins/Makefile.in | 1 + src/po/Makefile.in | 5 +++- 18 files changed, 65 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c3415c40..e3c231dd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-09-02 Don Allingham + * src/po/Makefile.am: convert .po files to unicode before + running through msgfmt + * src/revision.glade: make the open dialog box a bit bigger + 2003-09-02 Alex Roitman * src/gramps_main.py: Really fix start-up view when family view style is the default. Clean up the use of views. diff --git a/Makefile.in b/Makefile.in index c341e28e0..d11092245 100644 --- a/Makefile.in +++ b/Makefile.in @@ -78,6 +78,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ +MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ diff --git a/configure b/configure index e9ecf1af3..e8a95b61c 100755 --- a/configure +++ b/configure @@ -273,7 +273,7 @@ PACKAGE_STRING='gramps 0.9.3' PACKAGE_BUGREPORT='gramps-bugs@lists.sourceforge.net' ac_unique_file="src/gramps.py" -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_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 MSGCONV 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. @@ -1666,6 +1666,45 @@ else echo "${ECHO_T}no" >&6 fi +# Extract the first word of "msgconv", so it can be a program name with args. +set dummy msgconv; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MSGCONV+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MSGCONV in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGCONV="$MSGCONV" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MSGCONV="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +MSGCONV=$ac_cv_path_MSGCONV + +if test -n "$MSGCONV"; then + echo "$as_me:$LINENO: result: $MSGCONV" >&5 +echo "${ECHO_T}$MSGCONV" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + LANGUAGES="cs da_DK de es fr it nl pl pt_BR ro ru sv" @@ -3946,6 +3985,7 @@ s,@SET_MAKE@,$SET_MAKE,;t t s,@RELEASE@,$RELEASE,;t t s,@VERSIONSTRING@,$VERSIONSTRING,;t t s,@MSGFMT@,$MSGFMT,;t t +s,@MSGCONV@,$MSGCONV,;t t s,@LANGUAGES@,$LANGUAGES,;t t s,@POFILES@,$POFILES,;t t s,@MOFILES@,$MOFILES,;t t diff --git a/configure.in b/configure.in index a1a26374f..afa0ee844 100644 --- a/configure.in +++ b/configure.in @@ -17,6 +17,7 @@ AC_SUBST(RELEASE) AC_SUBST(VERSIONSTRING) AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(MSGCONV, msgconv) LANGUAGES="cs da_DK de es fr it nl pl pt_BR ro ru sv" AC_SUBST(LANGUAGES) diff --git a/doc/Makefile.in b/doc/Makefile.in index 843e9c2a2..7d7bf0812 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -78,6 +78,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ +MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ diff --git a/doc/gramps-manual/C/Makefile.in b/doc/gramps-manual/C/Makefile.in index 83a697702..5f18e4e8f 100644 --- a/doc/gramps-manual/C/Makefile.in +++ b/doc/gramps-manual/C/Makefile.in @@ -138,6 +138,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ +MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ diff --git a/doc/gramps-manual/Makefile.in b/doc/gramps-manual/Makefile.in index 2a5c1fa9a..f0b8ed599 100644 --- a/doc/gramps-manual/Makefile.in +++ b/doc/gramps-manual/Makefile.in @@ -78,6 +78,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ +MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ diff --git a/example/Makefile.in b/example/Makefile.in index 0a874fd43..1084f409d 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -76,6 +76,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ +MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ diff --git a/example/gramps/Makefile.in b/example/gramps/Makefile.in index 22ac4c186..ab33ca644 100644 --- a/example/gramps/Makefile.in +++ b/example/gramps/Makefile.in @@ -77,6 +77,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ +MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ diff --git a/gramps.spec b/gramps.spec index 55c7c2578..4bf83c61d 100644 --- a/gramps.spec +++ b/gramps.spec @@ -1,5 +1,5 @@ %define ver 0.9.3 -%define rel 0.CVS20030820 +%define rel 0.CVS20030902 %define prefix /usr %define localstatedir /var/lib # Ensure that internal RPM macros for configure & makeinstall diff --git a/src/Makefile.in b/src/Makefile.in index f00780f7f..0cc6b8095 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -76,6 +76,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ +MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ diff --git a/src/calendars/Makefile.in b/src/calendars/Makefile.in index dad64e11f..9277370e0 100644 --- a/src/calendars/Makefile.in +++ b/src/calendars/Makefile.in @@ -81,6 +81,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ +MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ diff --git a/src/data/Makefile.in b/src/data/Makefile.in index 00bc82cd7..00dadf061 100644 --- a/src/data/Makefile.in +++ b/src/data/Makefile.in @@ -76,6 +76,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ +MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ diff --git a/src/data/templates/Makefile.in b/src/data/templates/Makefile.in index 5633ad08e..42f65a054 100644 --- a/src/data/templates/Makefile.in +++ b/src/data/templates/Makefile.in @@ -77,6 +77,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ +MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ diff --git a/src/docgen/Makefile.in b/src/docgen/Makefile.in index 29cd75d4d..78b0f7e5d 100644 --- a/src/docgen/Makefile.in +++ b/src/docgen/Makefile.in @@ -80,6 +80,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ +MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ @@ -116,7 +117,6 @@ pkgpython_PYTHON = \ OpenOfficeDoc.py\ OpenSpreadSheet.py\ PdfDoc.py\ - PdfDrawDoc.py\ PSDrawDoc.py\ RTFDoc.py\ SvgDrawDoc.py diff --git a/src/filters/Makefile.in b/src/filters/Makefile.in index e7dc156c5..00caea84b 100644 --- a/src/filters/Makefile.in +++ b/src/filters/Makefile.in @@ -76,6 +76,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ +MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index 1dba8d36e..ba3f10e68 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -77,6 +77,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ +MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ diff --git a/src/po/Makefile.in b/src/po/Makefile.in index b2f7d82ff..22db22e34 100644 --- a/src/po/Makefile.in +++ b/src/po/Makefile.in @@ -76,6 +76,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LANGUAGES = @LANGUAGES@ MOFILES = @MOFILES@ +MSGCONV = @MSGCONV@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ @@ -242,7 +243,9 @@ uninstall-local: done .po.mo: - $(MSGFMT) -v $< -o $@ + @MSGCONV@ --to-code=UTF-8 $< -o temp.po + $(MSGFMT) -v temp.po -o $@ + rm temp.po # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: