branch/3.1: merged bugfixes from trunk/ up to current

1 files changed, 3 insertions, 4 deletions

diff --git a/framework/I18N/TTranslate.php b/framework/I18N/TTranslate.php
index a444aeba..0ea340f4 100644
--- a/framework/I18N/TTranslate.php
+++ b/framework/I18N/TTranslate.php
@@ -201,8 +201,7 @@ class TTranslate extends TI18NControl
 	 */

 	public function render($writer)

 	{

-		$textWriter=new TTextWriter;

-		$htmlWriter=new THtmlWriter($textWriter);

+		$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());

 		$subs = array();

 		foreach($this->getParameters() as $key => $value)

 			$subs['{'.$key.'}'] = $value;

@@ -213,12 +212,12 @@ class TTranslate extends TI18NControl
 			elseif($control instanceof TControl)

 				$control->render($htmlWriter);

 			elseif(is_string($control))

-				$textWriter->write($control);

+				$htmlWriter->write($control);

 		}

 

 		$text = $this->getText();

 		if(strlen($text)==0)

-			$text = $textWriter->flush();

+			$text = $htmlWriter->flush();

 		if($this->getTrim())

 			$text = trim($text);