Index: trunk/admin/config/importlang_progress.php
===================================================================
diff -u -r701 -r898
--- trunk/admin/config/importlang_progress.php (.../importlang_progress.php) (revision 701)
+++ trunk/admin/config/importlang_progress.php (.../importlang_progress.php) (revision 898)
@@ -171,7 +171,8 @@
$PhraseType = $PhraseTag->attributes["TYPE"];
$psql = "INSERT INTO $PhraseTable (Phrase,Translation,PhraseType,LanguageId) VALUES ($Phrase,$Translation,$PhraseType,$LangId)";
- $ado->Execute($psql);
+ mysql_query($psql,$ado->_connectionID);
+ //$ado->Execute($psql);
//echo "$psql
\n";
}
break;
@@ -187,6 +188,10 @@
case "THOUSANDS":
$Thousands = $tag->contents;
break;
+ case 'CHARSET':
+ $Charset = $tag->contents;
+ break;
+
case "EVENTS":
foreach($tag->children as $EventTag)
{
@@ -197,7 +202,8 @@
$EventId = $Events[$event."_".$Type];
$esql = "INSERT INTO $EventTable (Template,MessageType,EventId,LanguageId) VALUES ('$template','$MsgType',$EventId,$LangId)";
- $ado->Execute($esql);
+ mysql_query($esql,$ado->_connectionID);
+ //$ado->Execute($esql);
//echo htmlentities($esql)."
\n";
}
break;
@@ -210,6 +216,7 @@
$l->Set("TimeFormat",$TimeFormat);
$l->Set("DecimalPoint",$Decimal);
$l->Set("ThousandSep",$Thousands);
+ $l->Set('Charset', (isset($Charset)&&$Charset)?$Charset:'iso-8859-1');
$l->Update();
}
}