nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add workaround for multibyte chars that can contain \ as last byte.

Browse Source
This commit is contained in:
Michal Čihař
2005-11-29 19:04:05 +00:00
parent 75ba7193a3
commit d28c615af4
2 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2005-11-29 Michal Čihař <michal@cihar.com>
* lang/sync_lang.sh: Add workaround for multibyte chars that can contain \
as last byte.
2005-11-29 Marc Delisle <lem9@users.sourceforge.net>
* tbl_change.php, libraries/tbl_replace_fields.inc.php:
bug #1367549, handling of CURRENT_TIMESTAMP

30
lang/sync_lang.sh
View File

@@ -11,6 +11,8 @@
# Written by Michal Cihar <nijel at users.sourceforge.net>
##
# Changes:
# 2005-11-29
# * hack for multibyte chars, so that \'; at the end will not fool PHP
# 2004-09-22
# * default to iconv, as it doesn't break things as recode does
# 2004-09-03
@@ -220,34 +222,20 @@ for base in $BASE_TRANSLATIONS ; do
is_utf=yes
$CONVERTOR $(printf "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php| sed -e "s/$replace_charset/$charset/" -e '/\$charset/a\
$allow_recoding = TRUE;' > $TEMPFILE
if [ -s $TEMPFILE ] ; then
cat $TEMPFILE > $file
echo done
else
FAILED="$FAILED $file"
echo FAILED
fi
elif [ $src_charset = 'utf-8' ] ; then
is_utf=yes
# if we convert from utf-8, we should remove allow_recoding
$CONVERTOR $(printf "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php| grep -v allow_recoding | sed "s/$replace_charset/$charset/" > $TEMPFILE
if [ -s $TEMPFILE ] ; then
cat $TEMPFILE > $file
echo done
else
FAILED="$FAILED $file"
echo FAILED
fi
else
# just convert
$CONVERTOR $(printf "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php| sed "s/$replace_charset/$charset/" > $TEMPFILE
if [ -s $TEMPFILE ] ; then
cat $TEMPFILE > $file
echo done
else
FAILED="$FAILED $file"
echo FAILED
fi
fi
if [ -s $TEMPFILE ] ; then
sed "s/\\\\';[[:space:]]*$/\\ ';/" $TEMPFILE > $file
echo done
else
FAILED="$FAILED $file"
echo FAILED
fi
done