[Vtigercrm-commits] [vtiger-commits] r10370 - in /vtigercrm/branches/5.0.3: Image/Canvas/ Smarty/templates/ cron/ modules/Emails/ modules/System/ modules/System/includes/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Wed Mar 7 01:06:55 EST 2007
Author: saraj
Date: Tue Mar 6 23:06:37 2007
New Revision: 10370
Log:
fix for i18n issue - missing label LBL_CHARSET. Fixes #3161 --Minnie
Modified:
vtigercrm/branches/5.0.3/Image/Canvas/SVG.php
vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl
vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl
vtigercrm/branches/5.0.3/cron/class.phpmailer.php
vtigercrm/branches/5.0.3/modules/Emails/class.phpmailer.php
vtigercrm/branches/5.0.3/modules/Emails/mailbox.php
vtigercrm/branches/5.0.3/modules/System/includes/system_header.php
vtigercrm/branches/5.0.3/modules/System/systemconfig.php
Modified: vtigercrm/branches/5.0.3/Image/Canvas/SVG.php
==============================================================================
--- vtigercrm/branches/5.0.3/Image/Canvas/SVG.php (original)
+++ vtigercrm/branches/5.0.3/Image/Canvas/SVG.php Tue Mar 6 23:06:37 2007
@@ -28,6 +28,7 @@
/**
* Include file Image/Canvas.php
*/
+global $app_strings;
require_once 'Image/Canvas.php';
/**
@@ -817,7 +818,7 @@
function show($param = false)
{
parent::show($param);
- $output = '<?xml version="1.0" encoding="iso-8859-1"?>' . "\n" .
+ $output = '<?xml version="1.0" encoding='.$app_strings['LBL_CHARSET'].'?>' . "\n" .
'<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"' . "\n\t" .
' "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">' . "\n" .
'<svg width="' . $this->_width . '" height="' . $this->_height .
@@ -844,7 +845,7 @@
function save($param = false)
{
parent::save($param);
- $output = '<?xml version="1.0" encoding="iso-8859-1"?>' . "\n" .
+ $output = '<?xml version="1.0" encoding='.$app_strings['LBL_CHARSET'].'?>' . "\n" .
'<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"' . "\n\t" .
' "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">' . "\n" .
'<svg width="' . $this->_width . '" height="' . $this->_height .
@@ -915,4 +916,4 @@
}
-?>
+?>
Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl Tue Mar 6 23:06:37 2007
@@ -15,7 +15,7 @@
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset={$APP.LBL_CHARSET}">
<title>{$MOD.TITLE_COMPOSE_MAIL}</title>
<link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">
<style type="text/css">@import url("themes/{$THEME}/style.css");</style>
Modified: vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl Tue Mar 6 23:06:37 2007
@@ -16,7 +16,7 @@
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset={$APP.LBL_CHARSET}">
<link rel="stylesheet" media="print" href="print.css" type="text/css">
<title>vtiger - {$MOD.LBL_PRINT_REPORT}</title>
<style>
Modified: vtigercrm/branches/5.0.3/cron/class.phpmailer.php
==============================================================================
--- vtigercrm/branches/5.0.3/cron/class.phpmailer.php (original)
+++ vtigercrm/branches/5.0.3/cron/class.phpmailer.php Tue Mar 6 23:06:37 2007
@@ -17,6 +17,7 @@
* @author Brent R. Matzelle
* @copyright 2001 - 2003 Brent R. Matzelle
*/
+global $app_strings;
class PHPMailer
{
/////////////////////////////////////////////////
@@ -33,7 +34,7 @@
* Sets the CharSet of the message.
* @var string
*/
- var $CharSet = "iso-8859-1";
+ var $CharSet = $app_strings['LBL_CHARSET'];
/**
* Sets the Content-type of the message.
Modified: vtigercrm/branches/5.0.3/modules/Emails/class.phpmailer.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Emails/class.phpmailer.php (original)
+++ vtigercrm/branches/5.0.3/modules/Emails/class.phpmailer.php Tue Mar 6 23:06:37 2007
@@ -17,6 +17,7 @@
* @author Brent R. Matzelle
* @copyright 2001 - 2003 Brent R. Matzelle
*/
+global $app_strings;
class PHPMailer
{
/////////////////////////////////////////////////
@@ -33,7 +34,7 @@
* Sets the CharSet of the message.
* @var string
*/
- var $CharSet = "iso-8859-1";
+ var $CharSet = $app_strings['LBL_CHARSET'];
/**
* Sets the Content-type of the message.
Modified: vtigercrm/branches/5.0.3/modules/Emails/mailbox.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Emails/mailbox.php (original)
+++ vtigercrm/branches/5.0.3/modules/Emails/mailbox.php Tue Mar 6 23:06:37 2007
@@ -126,7 +126,7 @@
$selectBoxDisplay[$k] = $att[$k]->parameters[1]->value;
}
}
- elseif ($att[$k]->parameters[0]->value != "iso-8859-1" && $att[$k]->parameters[0]->value != "ISO-8859-1") {
+ elseif ($att[$k]->parameters[0]->value != $app_strings['LBL_CHARSET'] && $att[$k]->parameters[0]->value != $app_strings['LBL_CHARSET']) {
$selectBoxDisplay[$k] = $att[$k]->parameters[0]->value;
}
}
@@ -341,7 +341,7 @@
global $log;
$log->debug("Entering transformHTML(".$str.") method ...");
if ((strpos($str,"<HTML") < 0) || (strpos($str,"<html") < 0)) {
- $makeHeader = "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\"></head>\n";
+ $makeHeader = "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=".$app_strings['LBL_CHARSET']."\"></head>\n";
if ((strpos($str,"<BODY") < 0) || (strpos($str,"<body") < 0)) {
$makeBody = "\n<body>\n";
$str = $makeHeader . $makeBody . $str ."\n</body></html>";
@@ -349,7 +349,7 @@
$str = $makeHeader . $str ."\n</html>";
}
} else {
- $str = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">\n". $str;
+ $str = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=".$app_strings['LBL_CHARSET']."\">\n". $str;
}
$log->debug("Exiting transformHTML method ...");
return $str;
Modified: vtigercrm/branches/5.0.3/modules/System/includes/system_header.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/System/includes/system_header.php (original)
+++ vtigercrm/branches/5.0.3/modules/System/includes/system_header.php Tue Mar 6 23:06:37 2007
@@ -18,13 +18,14 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// $Id: system_header.php,v 1.27 2005/12/10 15:54:41 bigmichi1 Exp $
+global $app_strings;
if (!defined('IN_PHPSYSINFO')) {
die("No Hacking");
}
@header("Cache-Control: no-cache, must-revalidate");
if (!isset($charset)) {
- $charset = 'iso-8859-1';
+ $charset = $app_strings['LBL_CHARSET'];
}
setlocale (LC_ALL, $text['locale']);
Modified: vtigercrm/branches/5.0.3/modules/System/systemconfig.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/System/systemconfig.php (original)
+++ vtigercrm/branches/5.0.3/modules/System/systemconfig.php Tue Mar 6 23:06:37 2007
@@ -16,6 +16,7 @@
// phpsysinfo release version number
$VERSION = "2.5.2_rc2";
$startTime = array_sum( explode( " ", microtime() ) );
+global $app_strings;
define('IN_PHPSYSINFO', true);
@@ -137,7 +138,7 @@
$lng = basename($lng);
if (file_exists(APP_ROOT . '/includes/lang/' . $lng . '.php')) {
- $charset = 'iso-8859-1';
+ $charset = $app_strings['LBL_CHARSET'];
require_once(APP_ROOT . '/includes/lang/' . $lng . '.php'); // get our language include
// Store the current language selection in a cookie, set expire date to 30 days later
@setcookie("lng", $lng, (time() + 60 * 60 * 24 * 30));
@@ -168,7 +169,7 @@
require_once(APP_ROOT . '/includes/xml/hddtemp.php');
// build the xml
-$xml = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n";
+$xml = "<?xml version=\"1.0\" encoding=\"".$app_strings['LBL_CHARSET']."\"?>\n";
$xml .= "<!DOCTYPE phpsysinfo SYSTEM \"phpsysinfo.dtd\">\n\n";
$xml .= created_by();
$xml .= "<phpsysinfo>\n";
@@ -200,12 +201,12 @@
$XPath = new XPath();
$XPath->importFromString($xml);
- header("Content-type: text/vnd.wap.wml; charset=iso-8859-1");
+ header("Content-type: text/vnd.wap.wml; charset=".$app_strings['LBL_CHARSET']);
header("");
header("Cache-Control: no-cache, must-revalidate");
header("Pragma: no-cache");
- echo "<?xml version='1.0' encoding='iso-8859-1'?>\n";
+ echo "<?xml version='1.0' encoding='".$app_strings['LBL_CHARSET']."'?>\n";
echo "<!DOCTYPE wml PUBLIC \"-//WAPFORUM//DTD WML 1.1//EN\" \"http://www.wapforum.org/DTD/wml_1.1.xml\" >\n";
echo "<wml>\n";
echo "<card id=\"start\" title=\"phpSysInfo - Menu\">\n";
More information about the vtigercrm-commits
mailing list