Cleanup of I18N.

1 files changed, 18 insertions, 24 deletions

diff --git a/framework/I18N/TChoiceFormat.php b/framework/I18N/TChoiceFormat.php
index 255bf638..cd6ef511 100644
--- a/framework/I18N/TChoiceFormat.php
+++ b/framework/I18N/TChoiceFormat.php
@@ -1,18 +1,12 @@
 <?php

 /**

  * TChoiceFormat, I18N choice format component.

- * 

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the BSD License.

  *

- * Copyright(c) 2004 by Xiang Wei Zhuo. 

- *

- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}

- * The latest version of PRADO can be obtained from:

- * {@link http://prado.sourceforge.net/}

- *

- * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>

- * @version $Revision: 1.2 $  $Date: 2005/04/24 00:21:13 $

+ * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

+ * @link http://www.pradosoft.com/

+ * @copyright Copyright &copy; 2005 PradoSoft

+ * @license http://www.pradosoft.com/license/

+ * @version $Revision: $  $Date: $

  * @package System.I18N

  */

 

@@ -24,16 +18,16 @@ Prado::using('System.I18N.TTranslate');
 

 /**

  * TChoiceFormat class.

- * 

+ *

  * This component performs message/string choice translation. The translation

- * source is set in the TGlobalization handler. The following example

- * demonstrated a simple 2 choice message translation.

+ * source is set in the TGlobalization module. The following example

+ * demonstrates a simple 2 choice message translation.

  * <code>

- * <com:TChoiceFormat Value="1"/>[1] One Apple. |[2] Two Apples</com:TChoiceFormat>

+ * <com:TChoiceFormat Value="1">[1] One Apple. |[2] Two Apples</com:TChoiceFormat>

  * </code>

  *

  * The Choice has <b>Value</b> "1" (one), thus the translated string

- * is "One Apple". If the <b>Value</b> was "2", then it will show

+ * is "One Apple". If the <b>Value</b> is "2", then it will show

  * "Two Apples".

  *

  * The message/string choices are separated by the pipe "|" followed

@@ -41,17 +35,17 @@ Prado::using('System.I18N.TTranslate');
  *  # <tt>[1,2]</tt> -- accepts values between 1 and 2, inclusive.

  *  # <tt>(1,2)</tt> -- accepts values between 1 and 2, excluding 1 and 2.

  *  # <tt>{1,2,3,4}</tt> -- only values defined in the set are accepted.

- *  # <tt>[-Inf,0)</tt> -- accepts value greater or equal to negative infinity 

+ *  # <tt>[-Inf,0)</tt> -- accepts value greater or equal to negative infinity

  *                       and strictly less than 0

  * Any non-empty combinations of the delimiters of square and round brackets

  * are acceptable.

- * 

- * The string choosen for display depends on the <b>Value</b> property. 

+ *

+ * The string choosen for display depends on the <b>Value</b> property.

  * The <b>Value</b> is evaluated for each set until the Value is found

  * to belong to a particular set.

  *

  * Properties

- * - <b>Value</b>, float, 

+ * - <b>Value</b>, float,

  *   <br>Gets or sets the Value that determines which string choice to display.

  *

  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>

@@ -63,7 +57,7 @@ class TChoiceFormat extends TTranslate
 	/**

 	 * @return float the numerical value.

 	 */

-	function getValue()

+	public function getValue()

 	{

 		return $this->getViewState('Value','');

 	}

@@ -72,14 +66,14 @@ class TChoiceFormat extends TTranslate
 	 * Sets the numerical choice value

 	 * @param float the choice value

 	 */

-	function setValue($value)

+	public function setValue($value)

 	{

 		$this->setViewState('Value',$value,'');

 	}

 

 	/**

 	 * Display the choosen translated string.

-	 * Overrides the parent method, also calls parent's renderBody to 

+	 * Overrides the parent method, also calls parent's renderBody to

 	 * translate.

 	 */

 	protected function translateText($text, $subs)

@@ -88,7 +82,7 @@ class TChoiceFormat extends TTranslate
 		$choice = new ChoiceFormat();

 		$value = $this->getValue();

 		$string = $choice->format($text, $value);

-		if($string) 

+		if($string)

 			return strtr($string, array('{Value}'=> $value));

 	}

 }