Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* configure.in: Detect iconv at configuration time.

Browse Source 
* src/po/Makefile.am: Invoke detected iconv in its simplest form.
Minor cleanup.
* gramps.sh.in: Correct paths for systems with custom datadir.
* src/DisplayTrace.py: Check for LANG before including in the message.


svn: r2279
This commit is contained in:
Alex Roitman 2003-10-22 04:15:27 +00:00
parent 70b3853997
commit ff581b3772
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gramps2/configure.in
View File

@ -19,6 +19,7 @@ AC_SUBST(VERSIONSTRING)
AC_PATH_PROG(MSGFMT, msgfmt) AC_PATH_PROG(MSGFMT, msgfmt)
AC_PATH_PROG(MSGCONV, msgconv) AC_PATH_PROG(MSGCONV, msgconv)
AC_PATH_PROG(ICONV, iconv)
LANGUAGES="hu zh_CN cs da_DK de es fr it nl pl pt_BR ro ru sv" LANGUAGES="hu zh_CN cs da_DK de es fr it nl pl pt_BR ro ru sv"
AC_SUBST(LANGUAGES) AC_SUBST(LANGUAGES)

9
gramps2/gramps.sh.in
View File

@ -22,16 +22,19 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
PACKAGE=@PACKAGE@
export GRAMPSDIR=@datadir@/@PACKAGE@ export GRAMPSDIR=@datadir@/@PACKAGE@
export GRAMPSPYDIR=@pkgpythondir@
export GRAMPSPLUGINSDIR=$GRAMPSPYDIR/plugins:$GRAMPSPYDIR/docgen:$GRAMPSPYDIR/filters
export GRAMPSLIBDIR=@libdir@/@PACKAGE@ export GRAMPSLIBDIR=@libdir@/@PACKAGE@
export GRAMPSI18N=@prefix@/share/locale export GRAMPSI18N=@prefix@/share/locale
if [ "$PYTHONPATH" = "" ] if [ "$PYTHONPATH" = "" ]
then then
export PYTHONPATH=$GRAMPSDIR:$GRAMPSLIBDIR export PYTHONPATH=$GRAMPSDIR:$GRAMPSPLUGINSDIR:$GRAMPSLIBDIR
else else
export PYTHONPATH=$GRAMPSDIR:$GRAMPSLIBDIR:$PYTHONPATH export PYTHONPATH=$GRAMPSDIR:$GRAMPSLIBDIR:$GRAMPSPLUGINSDIR:$PYTHONPATH
fi fi
exec @PYTHON@ $GRAMPSDIR/gramps.py $* exec @PYTHON@ $GRAMPSPYDIR/gramps.py $*

5
gramps2/src/DisplayTrace.py
View File

@ -18,6 +18,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# $Id$
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# Standard python modules # Standard python modules
@ -74,7 +76,8 @@ class DisplayTrace:
'email message to gramps-bugs@lists.sourceforge.net\n\n')) 'email message to gramps-bugs@lists.sourceforge.net\n\n'))
msg.write("GRAMPS : %s\n" % const.version) msg.write("GRAMPS : %s\n" % const.version)
msg.write("LANG : %s\n" % os.environ['LANG']) if os.environ.has_key('LANG'):
msg.write("LANG : %s\n" % os.environ['LANG'])
msg.write("Python : %s.%s.%s %s\n" % (ver[0],ver[1],ver[2],ver[3])) msg.write("Python : %s.%s.%s %s\n" % (ver[0],ver[1],ver[2],ver[3]))
msg.write("GTK : %s.%s.%s\n" % gtk.gtk_version) msg.write("GTK : %s.%s.%s\n" % gtk.gtk_version)
msg.write('PyGTK : %d.%d.%d\n' % gtk.pygtk_version) msg.write('PyGTK : %d.%d.%d\n' % gtk.pygtk_version)

4
gramps2/src/po/Makefile.am
View File

@ -20,12 +20,12 @@ uninstall-local:
SUFFIXES = .po .mo SUFFIXES = .po .mo
.po.mo: .po.mo:
@MSGCONV@ --to-code=UTF-8 $< -o temp.po $(MSGCONV) --to-code=UTF-8 $< -o temp.po
$(MSGFMT) -v temp.po -o $@ $(MSGFMT) -v temp.po -o $@
rm temp.po rm temp.po
zh_CN.mo: $(top_srcdir)/src/po/zh_CN.po zh_CN.mo: $(top_srcdir)/src/po/zh_CN.po
iconv --from-code=GB2312 --to-code=UTF-8 $< -o temp.po $(ICONV) -f GB2312 -t UTF-8 $< > temp.po
$(MSGFMT) -v temp.po -o $@ $(MSGFMT) -v temp.po -o $@
rm temp.po rm temp.po