Mercurial > pidgin
view setup-gettext @ 4151:1a5dcfa1823e
[gaim-migrate @ 4377]
Why do I make these things so long? I'm defective, that's why.
Mr. Walp pointed out a problem with "allow only peeps in my buddy list"
for ICQ, so I fixed that. One important problem: If you set your
permdeny to "allow only peeps in my buddy list," and then add or remove
someone from your buddy list, it will not update the allow/deny list on
the server. And that's a bad thing.
I changed an error message string or 4 in oscar.c for various reasons.
1) I feel that "he/she" is much better than "it." If you disagree,
please let me know, because I'm not sure of the correct phrasing.
2) There is only 1 unknown reason, it just applies to multiple messages.
I shuffled some of the clientauto functions around in oscar.c to make
it more uniform. I intend to look into why status messages aren't
working well soon.
I added some semblance of more advanced ICQ info support to libfaim.
There's also a bit of support in oscar.c for it, but making it display
itself nicely will take a little work, so I'll do it later.
A patch from the good Mr. Blanton taking out a non-ascii character
from oscar.c (my bad).
A patch from the good Mr. Blanton adding support for i18n to away
messages and aim profile info. Questions for the good Mr. Blanton:
1) Line 59 of info.c, in the first half of that if statement, should
profile_len also be &&'ed in with the other 2?
2) I changed a gaim_parse_user_info so that it works for non-unicode
away messages and profiles. Or so I think.
3) I changed little bits of your patch to appease my annoyingness,
so it might not cvs update cleanly for you. Sorry.
I organized the ChangeLog entries for 0.60. I tried to put stuff
that I thought was more important near the top of each category.
Please change stuff around, because I'm pretty sure it could be
better.
Breathe in, breathe out, breathe in, breathe out...
Tied to a wheel...
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 29 Dec 2002 17:12:05 +0000 |
parents | cd42bf49e2bb |
children | d6491dc2b7b2 |
line wrap: on
line source
#!/bin/sh # # setup-gettext - Provides compatibility with versions of gettext # from the 0.10.x series and 0.11.x. # # Copyright (C) 2002 Christian Hammond. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of # the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public # License along with this program; if not, write to the Free # Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # VERSION=0.1.3 VERBOSE=0 parse_gettext_version() { GETTEXT_VERSION=`$GETTEXT_TOOL --version | sed -n 's/^.*\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\).*$/\1.\2.\3/p'` GETTEXT_MAJOR_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^\([0-9]\+\).*/\1/p'` GETTEXT_MINOR_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^[0-9]\+\.\([0-9]\+\).*/\1/p'` GETTEXT_MICRO_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^[0-9]\+\.[0-9]\+\.\([0-9]\+\).*/\1/p'` } find_gettext() { GETTEXT_TOOL=autopoint (autopoint --version) < /dev/null > /dev/null 2>&1 || { GETTEXT_TOOL=gettextize (gettextize --version) < /dev/null > /dev/null 2>&1 || { GETTEXT_TOOL= } } } install() { [ -f configure.in ] && { cp configure.in .tmp-configure.in sed -e 's/^AM_GNU_GETTEXT\(.*\)$/AM_GNU_GETTEXT\1\ AM_GNU_GETTEXT_VERSION(0.10.40)/' < .tmp-configure.in > configure.in rm .tmp-configure.in } [ -f configure.ac ] && { cp configure.ac .tmp-configure.ac sed -e 's/^AM_GNU_GETTEXT\(.*\)$/AM_GNU_GETTEXT\1\ AM_GNU_GETTEXT_VERSION(0.10.40)/' < .tmp-configure.ac > configure.ac rm .tmp-configure.ac } [ -f autogen.sh ] && { cp autogen.sh .tmp-autogen.sh sed -e 's/\(gettextize\|autopoint\) --version/.\/setup-gettext --gettext-tool/1' -e 's/^\(echo.*|[\t ]*\)\?\(gettextize\|autopoint\) -.*$/.\/setup-gettext/1' < .tmp-autogen.sh > autogen.sh rm .tmp-autogen.sh } echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' >> acinclude.m4 } backup_m4() { [ -d m4 ] && mv m4 m4~ } restore_m4() { [ -d m4~ ] && { rm -rf m4 mv m4~ m4 } } restore_files() { [ -f configure.in~ ] && mv -f configure.in~ configure.in [ -f configure.ac~ ] && mv -f configure.ac~ configure.ac [ -f Makefile.am~ ] && mv -f Makefile.am~ Makefile.am } abort() { restore_files restore_m4 exit 1 } # Main code find_gettext # See if a version of gettext and its tools are installed. if [ x$GETTEXT_TOOL = x ]; then echo echo "You do not have a version of gettext installed." echo "Please download one from your local package repository or" echo "from ftp://ftp.gnu.org/pub/gnu/gettext/" echo exit 1 fi parse_gettext_version NUMVAR=$# if [ $NUMVAR -gt 0 ]; then if [ $NUMVAR -gt 1 ]; then echo "Only one option at a time!" exit 1 elif [ $1 = "--gettext-tool" ]; then echo $GETTEXT_TOOL exit 0 elif [ $1 = "--help" ]; then echo "setup-gettext v$VERSION" echo "Usage:" echo " --gettext-tool Returns gettextize or autopoint, depending" echo " on the version of gettext installed." echo " --gettext-version Returns the version of gettext installed." echo " --gettext-major-version Returns the major version of gettext installed." echo " --gettext-minor-version Returns the minor version of gettext installed." echo " --gettext-micro-version Returns the micro version of gettext installed." echo " --help Displays this help screen." echo exit 0 elif [ $1 = "--version" ]; then echo $VERSION exit 0 elif [ $1 = "--gettext-version" ]; then echo $GETTEXT_VERSION exit 0 elif [ $1 = "--gettext-major-version" ]; then echo $GETTEXT_MAJOR_VERSION exit 0 elif [ $1 = "--gettext-minor-version" ]; then echo $GETTEXT_MINOR_VERSION exit 0 elif [ $1 = "--gettext-micro-version" ]; then echo $GETTEXT_MICRO_VERSION exit 0 elif [ $1 = "--install" ]; then install echo "setup-gettext installed." exit 0 elif [ $1 = "--happy-url" ]; then echo http://gaim.sf.net/forkgettext.jpg exit 0 elif [ $1 = "--verbose" ]; then VERBOSE=1 else echo "Invalid option '$1'" exit 1 fi fi # Okay, run the main stuff if [ "$GETTEXT_TOOL" = "autopoint" ]; then backup_m4 [ $VERBOSE -eq 1 ] && echo " autopoint --force" echo n | autopoint --force || abort restore_m4 else if [ $GETTEXT_MINOR_VERSION -eq 11 ]; then backup_m4 # Gettext is pure evil. It DEMANDS that we press Return no matter # what. This gets rid of their happy "feature" of doom. [ $VERBOSE -eq 1 ] && \ echo " gettextize --copy --force --intl --no-changelog" sed 's:read .*< /dev/tty::' `which gettextize` > .temp-gettextize chmod +x .temp-gettextize echo n | ./.temp-gettextize --copy --force --intl --no-changelog || abort rm .temp-gettextize restore_files restore_m4 [ -f po/Makevars.template ] && mv po/Makevars.template po/Makevars else [ $VERBOSE -eq 1 ] && echo " gettextize --copy --force" echo n | gettextize --copy --force || exit; fi fi