lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ajoute methode convToOuptutCharset

Browse Source
This commit is contained in:
Laurent Destailleur 2007-05-25 22:23:03 +00:00
parent 1ae66c9d80
commit 31a7346214
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/translate.class.php
View File

@ -256,15 +256,7 @@ class Translate {
$newstr=ereg_replace('>','__gt__',$newstr); $newstr=ereg_replace('>','__gt__',$newstr);
$newstr=ereg_replace('"','__quot__',$newstr); $newstr=ereg_replace('"','__quot__',$newstr);
/* $newstr=$this->convToOuptutCharset($newstr);
if ($key=='DatabaseConnection') {
print utf8_encode($newstr).'-'.$newstr;
print '-'.$this->charset_output;
print '-'.htmlentities($newstr,ENT_QUOTES,'UTF-8').'<br>';
}
*/
if ($this->charset_output=='UTF-8') $newstr=utf8_encode($newstr);
//if ($this->charset_output=='ISO-8859-1') $newstr=$newstr;
// Cryptage en html de la chaine // Cryptage en html de la chaine
// $newstr est une chaine stockee en memoire au format $this->charset_output // $newstr est une chaine stockee en memoire au format $this->charset_output
@ -276,7 +268,10 @@ class Translate {
$newstr=ereg_replace('__quot__','"',$newstr); $newstr=ereg_replace('__quot__','"',$newstr);
return $newstr; return $newstr;
} }
return $key; else
{
return $this->convToOuptutCharset($key);
}
} }
@ -316,6 +311,19 @@ class Translate {
} }
/**
* \brief Convertit une chaine dans le charset de sortie
* \param str chaine a convertir
* \return string chaine traduite
*/
function convToOuptutCharset($str)
{
if ($this->charset_output=='UTF-8') $str=utf8_encode($str);
//if ($this->charset_output=='ISO-8859-1') $str=$str;
return $str;
}
/** /**
* \brief Retourne la liste des langues disponibles * \brief Retourne la liste des langues disponibles
* \return array list of languages * \return array list of languages