summaryrefslogtreecommitdiff
path: root/framework/I18N
diff options
context:
space:
mode:
authorxue <>2006-05-12 12:38:32 +0000
committerxue <>2006-05-12 12:38:32 +0000
commite2149e3d8b87b382563a9def6f376a5f289754d3 (patch)
treefd24e9c28d023a483cc632683e6e998d2e11bfce /framework/I18N
parentd84327e69e858d369ea0c78f6106cfaa54994032 (diff)
Merge from 3.0 branch till 1054.
Diffstat (limited to 'framework/I18N')
-rw-r--r--framework/I18N/TGlobalizationAutoDetect.php20
-rw-r--r--framework/I18N/core/CultureInfo.php2
-rw-r--r--framework/I18N/core/MessageSource.php2
3 files changed, 18 insertions, 6 deletions
diff --git a/framework/I18N/TGlobalizationAutoDetect.php b/framework/I18N/TGlobalizationAutoDetect.php
index 3d550a62..7393d79a 100644
--- a/framework/I18N/TGlobalizationAutoDetect.php
+++ b/framework/I18N/TGlobalizationAutoDetect.php
@@ -1,15 +1,27 @@
<?php
+/**
+ * TMultiView and TView class file.
+ *
+ * @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: 1.66 $ $Date: ${DATE} ${TIME} $
+ * @package System.I18N
+ */
+/**
+ * Import the HTTPNeogtiator
+ */
Prado::using('System.I18N.core.HTTPNegotiator');
/**
- * ${classname}
- *
- * ${description}
+ * TGlobalizationAutoDetect class will automatically try to resolve the default
+ * culture using the user browser language settings.
*
* @author Wei Zhuo<weizhuo[at]gmail[dot]com>
* @version $Revision: 1.66 $ $Date: ${DATE} ${TIME} $
- * @package ${package}
+ * @package System.I18N
*/
class TGlobalizationAutoDetect extends TGlobalization
{
diff --git a/framework/I18N/core/CultureInfo.php b/framework/I18N/core/CultureInfo.php
index fe2c45e6..299a8b16 100644
--- a/framework/I18N/core/CultureInfo.php
+++ b/framework/I18N/core/CultureInfo.php
@@ -161,7 +161,7 @@ class CultureInfo
* Initializes a new instance of the CultureInfo class based on the
* culture specified by name. E.g. <code>new CultureInfo('en_AU');</cdoe>
* The culture indentifier must be of the form
- * "<language>_(country/region/variant)".
+ * "language_(country/region/variant)".
* @param string a culture name, e.g. "en_AU".
* @return return new CultureInfo.
*/
diff --git a/framework/I18N/core/MessageSource.php b/framework/I18N/core/MessageSource.php
index d69a13d9..6563f8c9 100644
--- a/framework/I18N/core/MessageSource.php
+++ b/framework/I18N/core/MessageSource.php
@@ -121,7 +121,7 @@ abstract class MessageSource implements IMessageSource
* @param string the location of the resource.
* @param string the filename of the custom message source.
* @return MessageSource a new message source of the specified type.
- * @throw InvalidMessageSourceTypeException
+ * @throws InvalidMessageSourceTypeException
*/
static function &factory($type, $source='.', $filename='')
{