pradosoft / prado

framework/I18N/TChoiceFormat.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 		$choice = new ChoiceFormat();
 		$value = $this->getValue();
 		$string = $choice->format($text, $value);
-		if($string)
+		if ($string)
 			return strtr($string, ['{Value}' => $value]);
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -105,7 +105,8 @@
 		$choice = new ChoiceFormat();
 		$value = $this->getValue();
 		$string = $choice->format($text, $value);
-		if($string)
-			return strtr($string, ['{Value}' => $value]);
+		if($string) {
+					return strtr($string, ['{Value}' => $value]);
+		}
 	}
 }

framework/I18N/TDateFormat.php

Spacing +14 added lines, -14 removed lines

@@ -73,10 +73,10 @@ 
 	 * @var array
 	 */
 	private static $_patternPresets = [
-			'fulldate' => 'P','full' => 'P',
-			'longdate' => 'D','long' => 'd',
-			'mediumdate' => 'p','medium' => 'p',
-			'shortdate' => 'd','short' => 'd',
+			'fulldate' => 'P', 'full' => 'P',
+			'longdate' => 'D', 'long' => 'd',
+			'mediumdate' => 'p', 'medium' => 'p',
+			'shortdate' => 'd', 'short' => 'd',
 			'fulltime' => 'Q', 'longtime' => 'T',
 			'mediumtime' => 'q', 'shorttime' => 't'];
 
@@ -102,14 +102,14 @@ 
 		//try the subpattern of "date time" presets
 		$subpatterns = explode(' ', $string, 2);
 		$datetime = [];
-		if(count($subpatterns) == 2)
+		if (count($subpatterns) == 2)
 		{
 			$datetime[] = $this->getPreset($subpatterns[0]);
 			$datetime[] = $this->getPreset($subpatterns[1]);
 		}
 
 		//we have a good subpattern
-		if(count($datetime) == 2
+		if (count($datetime) == 2
 			&& strlen($datetime[0]) == 1
 			&& strlen($datetime[1]) == 1)
 		{
@@ -120,7 +120,7 @@ 
 
 		//no presets found, use the string as the pattern
 		//and let the DateFormat handle it.
-		if($pattern === null)
+		if ($pattern === null)
 			$pattern = $string;
 		if (!is_array($pattern) && strlen($pattern) == 0)
 			$pattern = null;
@@ -135,9 +135,9 @@ 
 	protected function getPreset($string)
 	{
 		$string = strtolower($string);
-		foreach(self::$_patternPresets as $pattern => $preset)
+		foreach (self::$_patternPresets as $pattern => $preset)
 		{
-			if($string == $pattern)
+			if ($string == $pattern)
 				return $preset;
 		}
 	}
@@ -149,10 +149,10 @@ 
 	public function getValue()
 	{
 		$value = $this->getViewState('Value', '');
-		if(empty($value))
+		if (empty($value))
 		{
 			$defaultText = $this->getDefaultText();
-			if(empty($defaultText))
+			if (empty($defaultText))
 				return time();
 		}
 		return $value;
@@ -221,19 +221,19 @@ 
 	{
 		$value = $this->getValue();
 		$defaultText = $this->getDefaultText();
-		if(empty($value) && !empty($defaultText))
+		if (empty($value) && !empty($defaultText))
 			return $this->getDefaultText();
 
 		$app = $this->getApplication()->getGlobalization();
 
 		//initialized the default class wide formatter
-		if(self::$formatter === null)
+		if (self::$formatter === null)
 			self::$formatter = new DateFormat($app->getCulture());
 
 		$culture = $this->getCulture();
 
 		//return the specific cultural formatted date time
-		if(strlen($culture) && $app->getCulture() !== $culture)
+		if (strlen($culture) && $app->getCulture() !== $culture)
 		{
 			$formatter = new DateFormat($culture);
 			return $formatter->format($value,

Braces +21 added lines, -14 removed lines

@@ -114,16 +114,19 @@ 
 			&& strlen($datetime[1]) == 1)
 		{
 			$pattern = $datetime;
-		}
-		else //no subpattern, try the presets
+		} else {
+			//no subpattern, try the presets
 			$pattern = $this->getPreset($string);
+		}
 
 		//no presets found, use the string as the pattern
 		//and let the DateFormat handle it.
-		if($pattern === null)
-			$pattern = $string;
-		if (!is_array($pattern) && strlen($pattern) == 0)
-			$pattern = null;
+		if($pattern === null) {
+					$pattern = $string;
+		}
+		if (!is_array($pattern) && strlen($pattern) == 0) {
+					$pattern = null;
+		}
 		return $pattern;
 	}
 
@@ -137,8 +140,9 @@ 
 		$string = strtolower($string);
 		foreach(self::$_patternPresets as $pattern => $preset)
 		{
-			if($string == $pattern)
-				return $preset;
+			if($string == $pattern) {
+							return $preset;
+			}
 		}
 	}
 
@@ -152,8 +156,9 @@ 
 		if(empty($value))
 		{
 			$defaultText = $this->getDefaultText();
-			if(empty($defaultText))
-				return time();
+			if(empty($defaultText)) {
+							return time();
+			}
 		}
 		return $value;
 	}
@@ -221,14 +226,16 @@ 
 	{
 		$value = $this->getValue();
 		$defaultText = $this->getDefaultText();
-		if(empty($value) && !empty($defaultText))
-			return $this->getDefaultText();
+		if(empty($value) && !empty($defaultText)) {
+					return $this->getDefaultText();
+		}
 
 		$app = $this->getApplication()->getGlobalization();
 
 		//initialized the default class wide formatter
-		if(self::$formatter === null)
-			self::$formatter = new DateFormat($app->getCulture());
+		if(self::$formatter === null) {
+					self::$formatter = new DateFormat($app->getCulture());
+		}
 
 		$culture = $this->getCulture();
 

framework/I18N/Translation.php

Spacing +7 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
 		static $saveEventHandlerAttached = false;
 
 		//initialized the default class wide formatter
-		if(!isset(self::$formatters[$catalogue]))
+		if (!isset(self::$formatters[$catalogue]))
 		{
 			$app = Prado::getApplication()->getGlobalization();
 			$config = $app->getTranslationConfiguration();
@@ -57,18 +57,18 @@ 
 
 			$source->setCulture($app->getCulture());
 
-			if(isset($config['cache']))
+			if (isset($config['cache']))
 				$source->setCache(new MessageCache($config['cache']));
 
 			self::$formatters[$catalogue] = new MessageFormat($source, $app->getCharset());
 
 			//mark untranslated text
-			if($ps = $config['marker'])
-				self::$formatters[$catalogue]->setUntranslatedPS([$ps,$ps]);
+			if ($ps = $config['marker'])
+				self::$formatters[$catalogue]->setUntranslatedPS([$ps, $ps]);
 
 			//save the message on end request
 			// Do it only once !
-			if(!$saveEventHandlerAttached && TPropertyValue::ensureBoolean($config['autosave']))
+			if (!$saveEventHandlerAttached && TPropertyValue::ensureBoolean($config['autosave']))
 			{
 				Prado::getApplication()->attachEventHandler(
 				'OnEndRequest', ['Translation', 'saveMessages']);
@@ -94,13 +94,13 @@ 
 	{
 		static $onceonly = true;
 
-		if($onceonly)
+		if ($onceonly)
 		{
 			foreach (self::$formatters as $catalogue => $formatter)
 			{
 				$app = Prado::getApplication()->getGlobalization();
 				$config = $app->getTranslationConfiguration();
-				if(isset($config['autosave']))
+				if (isset($config['autosave']))
 				{
 					$formatter->getSource()->setCulture($app->getCulture());
 					$formatter->getSource()->save($catalogue);

Braces +6 added lines, -4 removed lines

@@ -57,14 +57,16 @@
 
 			$source->setCulture($app->getCulture());
 
-			if(isset($config['cache']))
-				$source->setCache(new MessageCache($config['cache']));
+			if(isset($config['cache'])) {
+							$source->setCache(new MessageCache($config['cache']));
+			}
 
 			self::$formatters[$catalogue] = new MessageFormat($source, $app->getCharset());
 
 			//mark untranslated text
-			if($ps = $config['marker'])
-				self::$formatters[$catalogue]->setUntranslatedPS([$ps,$ps]);
+			if($ps = $config['marker']) {
+							self::$formatters[$catalogue]->setUntranslatedPS([$ps,$ps]);
+			}
 
 			//save the message on end request
 			// Do it only once !

framework/I18N/TGlobalization.php

Spacing +21 added lines, -21 removed lines

@@ -74,21 +74,21 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_charset === null)
+		if ($this->_charset === null)
 			$this->_charset = $this->getDefaultCharset();
-		if($this->_culture === null)
+		if ($this->_culture === null)
 			$this->_culture = $this->getDefaultCulture();
 
-		if($config !== null)
+		if ($config !== null)
 		{
-			if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
-				$translation = isset($config['translate'])?$config['translate']:null;
+			if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+				$translation = isset($config['translate']) ? $config['translate'] : null;
 			else
 			{
 				$t = $config->getElementByTagName('translation');
-				$translation = ($t)?$t->getAttributes():null;
+				$translation = ($t) ? $t->getAttributes() : null;
 			}
-			if($translation)
+			if ($translation)
 				$this->setTranslationConfiguration($translation);
 		}
 		$this->getApplication()->setGlobalization($this);
@@ -200,14 +200,14 @@ 
 	 */
 	protected function setTranslationConfiguration($config)
 	{
-		if($config['type'] == 'XLIFF' || $config['type'] == 'gettext' || $config['type'] == 'PHP')
+		if ($config['type'] == 'XLIFF' || $config['type'] == 'gettext' || $config['type'] == 'PHP')
 		{
-			if($config['source'])
+			if ($config['source'])
 			{
 				$config['source'] = Prado::getPathOfNamespace($config['source']);
-				if(!is_dir($config['source']))
+				if (!is_dir($config['source']))
 				{
-					if(@mkdir($config['source']) === false)
+					if (@mkdir($config['source']) === false)
 					throw new TConfigurationException('globalization_source_path_failed',
 						$config['source']);
 					chmod($config['source'], PRADO_CHMOD); //make it deletable
@@ -218,12 +218,12 @@ 
 				throw new TConfigurationException("invalid source dir '{$config['source']}'");
 			}
 		}
-		if(isset($config['cache']) && TPropertyValue::ensureBoolean($config['cache']))
+		if (isset($config['cache']) && TPropertyValue::ensureBoolean($config['cache']))
 		{
-			$config['cache'] = $this->getApplication()->getRunTimePath() . '/i18n';
-			if(!is_dir($config['cache']))
+			$config['cache'] = $this->getApplication()->getRunTimePath().'/i18n';
+			if (!is_dir($config['cache']))
 			{
-				if(@mkdir($config['cache']) === false)
+				if (@mkdir($config['cache']) === false)
 					throw new TConfigurationException('globalization_cache_path_failed',
 						$config['cache']);
 				chmod($config['cache'], PRADO_CHMOD); //make it deletable
@@ -260,10 +260,10 @@ 
 	 */
 	public function getCultureVariants($culture = null)
 	{
-		if($culture === null) $culture = $this->getCulture();
+		if ($culture === null) $culture = $this->getCulture();
 		$variants = explode('_', $culture);
 		$result = [];
-		for(; count($variants) > 0; array_pop($variants))
+		for (; count($variants) > 0; array_pop($variants))
 			$result[] = implode('_', $variants);
 		return $result;
 	}
@@ -292,11 +292,11 @@ 
 		$files = [];
 		$variants = $this->getCultureVariants($culture);
 		$path = pathinfo($file);
-		foreach($variants as $variant)
-			$files[] = $path['dirname'] . DIRECTORY_SEPARATOR . $variant . DIRECTORY_SEPARATOR . $path['basename'];
+		foreach ($variants as $variant)
+			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
 		$filename = substr($path['basename'], 0, strrpos($path['basename'], '.'));
-		foreach($variants as $variant)
-			$files[] = $path['dirname'] . DIRECTORY_SEPARATOR . $filename . '.' . $variant . '.' . $path['extension'];
+		foreach ($variants as $variant)
+			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
 		$files[] = $file;
 		return $files;
 	}

Braces +32 added lines, -24 removed lines

@@ -74,22 +74,25 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_charset === null)
-			$this->_charset = $this->getDefaultCharset();
-		if($this->_culture === null)
-			$this->_culture = $this->getDefaultCulture();
+		if($this->_charset === null) {
+					$this->_charset = $this->getDefaultCharset();
+		}
+		if($this->_culture === null) {
+					$this->_culture = $this->getDefaultCulture();
+		}
 
 		if($config !== null)
 		{
-			if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
-				$translation = isset($config['translate'])?$config['translate']:null;
-			else
+			if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP) {
+							$translation = isset($config['translate'])?$config['translate']:null;
+			} else
 			{
 				$t = $config->getElementByTagName('translation');
 				$translation = ($t)?$t->getAttributes():null;
 			}
-			if($translation)
-				$this->setTranslationConfiguration($translation);
+			if($translation) {
+							$this->setTranslationConfiguration($translation);
+			}
 		}
 		$this->getApplication()->setGlobalization($this);
 	}
@@ -207,13 +210,13 @@ 
 				$config['source'] = Prado::getPathOfNamespace($config['source']);
 				if(!is_dir($config['source']))
 				{
-					if(@mkdir($config['source']) === false)
-					throw new TConfigurationException('globalization_source_path_failed',
+					if(@mkdir($config['source']) === false) {
+										throw new TConfigurationException('globalization_source_path_failed',
 						$config['source']);
+					}
 					chmod($config['source'], PRADO_CHMOD); //make it deletable
 				}
-			}
-			else
+			} else
 			{
 				throw new TConfigurationException("invalid source dir '{$config['source']}'");
 			}
@@ -223,13 +226,13 @@ 
 			$config['cache'] = $this->getApplication()->getRunTimePath() . '/i18n';
 			if(!is_dir($config['cache']))
 			{
-				if(@mkdir($config['cache']) === false)
-					throw new TConfigurationException('globalization_cache_path_failed',
+				if(@mkdir($config['cache']) === false) {
+									throw new TConfigurationException('globalization_cache_path_failed',
 						$config['cache']);
+				}
 				chmod($config['cache'], PRADO_CHMOD); //make it deletable
 			}
-		}
-		else
+		} else
 		{
 			unset($config['cache']);
 		}
@@ -260,11 +263,14 @@ 
 	 */
 	public function getCultureVariants($culture = null)
 	{
-		if($culture === null) $culture = $this->getCulture();
+		if($culture === null) {
+			$culture = $this->getCulture();
+		}
 		$variants = explode('_', $culture);
 		$result = [];
-		for(; count($variants) > 0; array_pop($variants))
-			$result[] = implode('_', $variants);
+		for(; count($variants) > 0; array_pop($variants)) {
+					$result[] = implode('_', $variants);
+		}
 		return $result;
 	}
 
@@ -292,11 +298,13 @@ 
 		$files = [];
 		$variants = $this->getCultureVariants($culture);
 		$path = pathinfo($file);
-		foreach($variants as $variant)
-			$files[] = $path['dirname'] . DIRECTORY_SEPARATOR . $variant . DIRECTORY_SEPARATOR . $path['basename'];
+		foreach($variants as $variant) {
+					$files[] = $path['dirname'] . DIRECTORY_SEPARATOR . $variant . DIRECTORY_SEPARATOR . $path['basename'];
+		}
 		$filename = substr($path['basename'], 0, strrpos($path['basename'], '.'));
-		foreach($variants as $variant)
-			$files[] = $path['dirname'] . DIRECTORY_SEPARATOR . $filename . '.' . $variant . '.' . $path['extension'];
+		foreach($variants as $variant) {
+					$files[] = $path['dirname'] . DIRECTORY_SEPARATOR . $filename . '.' . $variant . '.' . $path['extension'];
+		}
 		$files[] = $file;
 		return $files;
 	}

framework/I18N/TI18NControl.php

Spacing +2 added lines, -2 removed lines

@@ -49,11 +49,11 @@
 		$charset = $this->getViewState('Charset', '');
 
 		//fall back to globalization charset
-		if(empty($charset))
+		if (empty($charset))
 			$charset = ($app === null) ? '' : $app->getCharset();
 
 		//fall back to default charset
-		if(empty($charset))
+		if (empty($charset))
 			$charset = ($app === null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		return $charset;

Braces +6 added lines, -4 removed lines

@@ -49,12 +49,14 @@
 		$charset = $this->getViewState('Charset', '');
 
 		//fall back to globalization charset
-		if(empty($charset))
-			$charset = ($app === null) ? '' : $app->getCharset();
+		if(empty($charset)) {
+					$charset = ($app === null) ? '' : $app->getCharset();
+		}
 
 		//fall back to default charset
-		if(empty($charset))
-			$charset = ($app === null) ? 'UTF-8' : $app->getDefaultCharset();
+		if(empty($charset)) {
+					$charset = ($app === null) ? 'UTF-8' : $app->getDefaultCharset();
+		}
 
 		return $charset;
 	}

framework/I18N/TNumberFormat.php

Spacing +6 added lines, -6 removed lines

@@ -173,7 +173,7 @@ 
 	{
 		$type = strtolower($type);
 
-		switch($type)
+		switch ($type)
 		{
 			case 'decimal':
 				$this->setViewState('Type', 'd', ''); break;
@@ -217,12 +217,12 @@ 
 	{
 		$value = $this->getValue();
 		$defaultText = $this->getDefaultText();
-		if(empty($value) && !empty($defaultText))
+		if (empty($value) && !empty($defaultText))
 			return $this->getDefaultText();
 
 		$app = $this->getApplication()->getGlobalization();
 		//initialized the default class wide formatter
-		if(self::$formatter === null)
+		if (self::$formatter === null)
 			self::$formatter = new NumberFormat($app->getCulture());
 
 		$pattern = strlen($this->getPattern()) > 0
@@ -230,16 +230,16 @@ 
 
 		$culture = $this->getCulture();
 		//return the specific cultural formatted number
-		if(!empty($culture) && $app->getCulture() != $culture)
+		if (!empty($culture) && $app->getCulture() != $culture)
 		{
 			$formatter = new NumberFormat($culture);
-			return $formatter->format($this->getValue(),$pattern,
+			return $formatter->format($this->getValue(), $pattern,
 									  $this->getCurrency(),
 									  $this->getCharset());
 		}
 
 		//return the application wide culture formatted number.
-		return self::$formatter->format($this->getValue(),$pattern,
+		return self::$formatter->format($this->getValue(), $pattern,
 										$this->getCurrency(),
 										$this->getCharset());
 	}

Braces +6 added lines, -4 removed lines

@@ -217,13 +217,15 @@
 	{
 		$value = $this->getValue();
 		$defaultText = $this->getDefaultText();
-		if(empty($value) && !empty($defaultText))
-			return $this->getDefaultText();
+		if(empty($value) && !empty($defaultText)) {
+					return $this->getDefaultText();
+		}
 
 		$app = $this->getApplication()->getGlobalization();
 		//initialized the default class wide formatter
-		if(self::$formatter === null)
-			self::$formatter = new NumberFormat($app->getCulture());
+		if(self::$formatter === null) {
+					self::$formatter = new NumberFormat($app->getCulture());
+		}
 
 		$pattern = strlen($this->getPattern()) > 0
 						? $this->getPattern() : $this->getType();

framework/I18N/TTranslate.php

Spacing +16 added lines, -16 removed lines

@@ -146,7 +146,7 @@ 
 	 */
 	public function getParameters()
 	{
-		if($parameters = $this->getViewState('Parameters', null))
+		if ($parameters = $this->getViewState('Parameters', null))
 			return $parameters;
 		else
 		{
@@ -162,7 +162,7 @@ 
 	 */
 	public function hasParameter($name)
 	{
-		if($parameters = $this->getViewState('Parameters', null))
+		if ($parameters = $this->getViewState('Parameters', null))
 			return $parameters->contains($name);
 		else
 			return false;
@@ -173,7 +173,7 @@ 
 	 */
 	public function getParameter($name)
 	{
-		if($parameters = $this->getViewState('Parameters', null))
+		if ($parameters = $this->getViewState('Parameters', null))
 			return $parameters->itemAt($name);
 		else
 			return null;
@@ -195,7 +195,7 @@ 
 	 */
 	public function removeParameter($name)
 	{
-		if($parameters = $this->getViewState('Parameters', null))
+		if ($parameters = $this->getViewState('Parameters', null))
 			return $parameters->remove($name);
 		else
 			return null;
@@ -208,22 +208,22 @@ 
 	{
 		$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 		$subs = [];
-		foreach($this->getParameters() as $key => $value)
-			$subs['{' . $key . '}'] = $value;
-		foreach($this->getControls() as $control)
+		foreach ($this->getParameters() as $key => $value)
+			$subs['{'.$key.'}'] = $value;
+		foreach ($this->getControls() as $control)
 		{
-			if($control instanceof TTranslateParameter)
-				$subs['{' . $control->getKey() . '}'] = $control->getParameter();
-			elseif($control instanceof TControl)
+			if ($control instanceof TTranslateParameter)
+				$subs['{'.$control->getKey().'}'] = $control->getParameter();
+			elseif ($control instanceof TControl)
 				$control->render($htmlWriter);
-			elseif(is_string($control))
+			elseif (is_string($control))
 				$htmlWriter->write($control);
 		}
 
 		$text = $this->getText();
-		if(strlen($text) == 0)
+		if (strlen($text) == 0)
 			$text = $htmlWriter->flush();
-		if($this->getTrim())
+		if ($this->getTrim())
 			$text = trim($text);
 
 		$writer->write($this->translateText($text, $subs));
@@ -240,17 +240,17 @@ 
 		$app = $this->getApplication()->getGlobalization();
 
 		//no translation handler provided
-		if(($config = $app->getTranslationConfiguration()) === null)
+		if (($config = $app->getTranslationConfiguration()) === null)
 			return strtr($text, $subs);
 
 		$catalogue = $this->getCatalogue();
-		if(empty($catalogue) && isset($config['catalogue']))
+		if (empty($catalogue) && isset($config['catalogue']))
 			$catalogue = $config['catalogue'];
 		if (empty($catalogue)) $catalogue = 'messages';
 		Translation::init($catalogue);
 
 		$key = $this->getKey();
-		if(!empty($key)) $text = $key;
+		if (!empty($key)) $text = $key;
 
 		//translate it
 		return Translation::formatter($catalogue)->format($text,

Braces +46 added lines, -33 removed lines

@@ -146,9 +146,9 @@ 
 	 */
 	public function getParameters()
 	{
-		if($parameters = $this->getViewState('Parameters', null))
-			return $parameters;
-		else
+		if($parameters = $this->getViewState('Parameters', null)) {
+					return $parameters;
+		} else
 		{
 			$parameters = new TAttributeCollection;
 			$parameters->setCaseSensitive(true);
@@ -162,10 +162,11 @@ 
 	 */
 	public function hasParameter($name)
 	{
-		if($parameters = $this->getViewState('Parameters', null))
-			return $parameters->contains($name);
-		else
-			return false;
+		if($parameters = $this->getViewState('Parameters', null)) {
+					return $parameters->contains($name);
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -173,10 +174,11 @@ 
 	 */
 	public function getParameter($name)
 	{
-		if($parameters = $this->getViewState('Parameters', null))
-			return $parameters->itemAt($name);
-		else
-			return null;
+		if($parameters = $this->getViewState('Parameters', null)) {
+					return $parameters->itemAt($name);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -195,10 +197,11 @@ 
 	 */
 	public function removeParameter($name)
 	{
-		if($parameters = $this->getViewState('Parameters', null))
-			return $parameters->remove($name);
-		else
-			return null;
+		if($parameters = $this->getViewState('Parameters', null)) {
+					return $parameters->remove($name);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -208,23 +211,27 @@ 
 	{
 		$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 		$subs = [];
-		foreach($this->getParameters() as $key => $value)
-			$subs['{' . $key . '}'] = $value;
+		foreach($this->getParameters() as $key => $value) {
+					$subs['{' . $key . '}'] = $value;
+		}
 		foreach($this->getControls() as $control)
 		{
-			if($control instanceof TTranslateParameter)
-				$subs['{' . $control->getKey() . '}'] = $control->getParameter();
-			elseif($control instanceof TControl)
-				$control->render($htmlWriter);
-			elseif(is_string($control))
-				$htmlWriter->write($control);
+			if($control instanceof TTranslateParameter) {
+							$subs['{' . $control->getKey() . '}'] = $control->getParameter();
+			} elseif($control instanceof TControl) {
+							$control->render($htmlWriter);
+			} elseif(is_string($control)) {
+							$htmlWriter->write($control);
+			}
 		}
 
 		$text = $this->getText();
-		if(strlen($text) == 0)
-			$text = $htmlWriter->flush();
-		if($this->getTrim())
-			$text = trim($text);
+		if(strlen($text) == 0) {
+					$text = $htmlWriter->flush();
+		}
+		if($this->getTrim()) {
+					$text = trim($text);
+		}
 
 		$writer->write($this->translateText($text, $subs));
 	}
@@ -240,17 +247,23 @@ 
 		$app = $this->getApplication()->getGlobalization();
 
 		//no translation handler provided
-		if(($config = $app->getTranslationConfiguration()) === null)
-			return strtr($text, $subs);
+		if(($config = $app->getTranslationConfiguration()) === null) {
+					return strtr($text, $subs);
+		}
 
 		$catalogue = $this->getCatalogue();
-		if(empty($catalogue) && isset($config['catalogue']))
-			$catalogue = $config['catalogue'];
-		if (empty($catalogue)) $catalogue = 'messages';
+		if(empty($catalogue) && isset($config['catalogue'])) {
+					$catalogue = $config['catalogue'];
+		}
+		if (empty($catalogue)) {
+			$catalogue = 'messages';
+		}
 		Translation::init($catalogue);
 
 		$key = $this->getKey();
-		if(!empty($key)) $text = $key;
+		if(!empty($key)) {
+			$text = $key;
+		}
 
 		//translate it
 		return Translation::formatter($catalogue)->format($text,

framework/I18N/TGlobalizationAutoDetect.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 		//set the culture according to browser language settings
 		$http = new core\HTTPNegotiator();
 		$languages = $http->getLanguages();
-		if(count($languages) > 0)
+		if (count($languages) > 0)
 		{
 			$this->_detectedLanguage = $languages[0];
 			$this->setCulture($languages[0]);

framework/I18N/core/Gettext/TGettext_PO.php

Spacing +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
  * @license     PHP License
  */
 
-require_once dirname(__FILE__) . '/TGettext.php';
+require_once dirname(__FILE__).'/TGettext.php';
 
 /**
  * File_Gettext_PO
@@ -84,7 +84,7 @@ 
 
 		// match all msgid/msgstr entries
 		$matched = preg_match_all(
-			'/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+' .
+			'/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+'.
 			'(msgstr\s+("([^"]|\\\\")*?"\s*)+)/',
 			$contents, $matches
 		);
@@ -137,17 +137,17 @@ 
 		}
 		// write meta info
 		if (count($this->meta)) {
-			$meta = 'msgid ""' . "\nmsgstr " . '""' . "\n";
+			$meta = 'msgid ""'."\nmsgstr ".'""'."\n";
 			foreach ($this->meta as $k => $v) {
-				$meta .= '"' . $k . ': ' . $v . '\n"' . "\n";
+				$meta .= '"'.$k.': '.$v.'\n"'."\n";
 			}
-			fwrite($fh, $meta . "\n");
+			fwrite($fh, $meta."\n");
 		}
 		// write strings
 		foreach ($this->strings as $o => $t) {
 			fwrite($fh,
-				'msgid "' . parent::prepare($o, true) . '"' . "\n" .
-				'msgstr "' . parent::prepare($t, true) . '"' . "\n\n"
+				'msgid "'.parent::prepare($o, true).'"'."\n".
+				'msgstr "'.parent::prepare($t, true).'"'."\n\n"
 			);
 		}