Do not overwrite utf-8 files in some cases.

This commit is contained in:
Michal Čihař
2004-10-13 08:59:36 +00:00
parent 5471f4b11f
commit bcf8206ff4
2 changed files with 14 additions and 5 deletions

View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$
$Source$
2004-10-13 Michal Čihař <michal@cihar.com>
* lang/sync_lang.sh: Do not overwrite utf-8 files in some cases.
2004-10-12 Alexander M. Turek <me@derrabus.de>
* db_search.php, tbl_select.php, libraries/database_interface.lib.php:
- bug #1033388 (Illegal mix of collations for converted strings),

View File

@@ -184,7 +184,12 @@ for base in $BASE_TRANSLATIONS ; do
fi
echo "$base [charset $src_charset]"
is_utf=no
# do we already have utf-8 translation?
if [ $src_charset = 'utf-8' ] ; then
is_utf=yes
else
is_utf=no
fi
# at first update existing translations
for file in $create_files ; do
@@ -196,11 +201,12 @@ for base in $BASE_TRANSLATIONS ; do
charset=$(echo $file | sed -e 's/^[^-]*-//' -e 's/\.inc\.php\?$//')
fi
if [ $charset = 'utf-8' ] ; then
is_utf=yes
fi
# check whether we need to update translation
if [ ! "$base.inc.php" -nt "$file" -a "$FORCE" -eq 0 -a -s "$file" ] ; then
if [ $charset = 'utf-8' ] ; then
is_utf=yes
fi
echo " $file is not needed to update"
continue
fi