Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-23 09:51:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Suuport UTF8 format

Browse Source
This commit is contained in:
Laurent Destailleur
2008-10-20 22:12:21 +00:00
parent 5758db39d3
commit 91ee242a97
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/lib/functions.lib.php
View File

@@ -456,7 +456,11 @@ function dolibarr_print_date($time,$format='',$to_gmt=false,$convtooutput=true)
// Date is a timestamps // Date is a timestamps
$ret=adodb_strftime($format,$time,$to_gmt); $ret=adodb_strftime($format,$time,$to_gmt);
} }
return ($convtooutput?$langs->convToOuptutCharset($ret):$ret);
// Page code for text from strftime functions
$pagecodefrom='ISO-8859-1';
return ($convtooutput?$langs->convToOuptutCharset($ret,$pagecodefrom):$ret);
} }

9
htdocs/translate.class.php
View File

@@ -425,14 +425,15 @@ class Translate {
/** /**
* \brief Convertit une chaine dans le charset de sortie * \brief Convert a string into output charset (this->charset_output)
* \param str chaine a convertir * \param str chaine a convertir
* \param pagecodefrom Page code of src string
* \return string chaine traduite * \return string chaine traduite
*/ */
function convToOuptutCharset($str) function convToOuptutCharset($str,$pagecodefrom='UTF-8')
{ {
//if ($this->charset_output=='UTF-8') $str=utf8_encode($str); if ($pagecodefrom == 'ISO-8859-1' && $this->charset_output == 'UTF-8') $str=utf8_encode($str);
if ($this->charset_output=='ISO-8859-1') $str=utf8_decode($str); if ($pagecodefrom == 'UTF-8' && $this->charset_output == 'ISO-8859-1') $str=utf8_decode($str);
return $str; return $str;
} }