diff options
| author | xue <> | 2006-05-12 12:38:32 +0000 |
|---|---|---|
| committer | xue <> | 2006-05-12 12:38:32 +0000 |
| commit | e2149e3d8b87b382563a9def6f376a5f289754d3 (patch) | |
| tree | fd24e9c28d023a483cc632683e6e998d2e11bfce /framework/I18N/core | |
| parent | d84327e69e858d369ea0c78f6106cfaa54994032 (diff) | |
Merge from 3.0 branch till 1054.
Diffstat (limited to 'framework/I18N/core')
| -rw-r--r-- | framework/I18N/core/CultureInfo.php | 2 | ||||
| -rw-r--r-- | framework/I18N/core/MessageSource.php | 2 |
2 files changed, 2 insertions, 2 deletions
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='')
{
|