From 9db90898be134c9f70c0b334ec071223e60ed76c Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 16 Apr 2006 18:02:31 +0000
Subject: Merge from 3.0 branch till 924

---
 framework/I18N/TI18NControl.php  | 2 +-
 framework/I18N/TNumberFormat.php | 2 +-
 framework/I18N/TTranslate.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'framework/I18N')

diff --git a/framework/I18N/TI18NControl.php b/framework/I18N/TI18NControl.php
index e6aed0fa..efe3ac84 100644
--- a/framework/I18N/TI18NControl.php
+++ b/framework/I18N/TI18NControl.php
@@ -42,7 +42,7 @@ class TI18NControl extends TControl
 	 */
 	public function getCharset()
 	{
-		$app = $this->getApplication()->getGlobalization();
+		$app = $this->getApplication()->getGlobalization(false);
 
 		//instance charset
 		$charset = $this->getViewState('Charset','');
diff --git a/framework/I18N/TNumberFormat.php b/framework/I18N/TNumberFormat.php
index 4dc1e3ee..76373a8e 100644
--- a/framework/I18N/TNumberFormat.php
+++ b/framework/I18N/TNumberFormat.php
@@ -166,7 +166,7 @@ class TNumberFormat extends TI18NControl
 	 */
 	protected function getFormattedValue()
 	{
-		$app = $this->Application->getGlobalization();
+		$app = $this->getApplication()->getGlobalization();
 		//initialized the default class wide formatter
 		if(is_null(self::$formatter))
 			self::$formatter = new NumberFormat($app->getCulture());
diff --git a/framework/I18N/TTranslate.php b/framework/I18N/TTranslate.php
index 0a03b506..6a30f3a6 100644
--- a/framework/I18N/TTranslate.php
+++ b/framework/I18N/TTranslate.php
@@ -168,7 +168,7 @@ class TTranslate extends TI18NControl
 	 */
 	protected function translateText($text, $subs)
 	{
-		$app = $this->Application->getGlobalization();
+		$app = $this->getApplication()->getGlobalization();
 
 		//no translation handler provided
 		if(is_null($config = $app->getTranslationConfiguration()))
-- 
cgit v1.2.3