stas Wed Jul 1 20:25:38 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/doc collator_api.php common_api.php
datefmt_api.php formatter_api.php
locale_api.php
Log:
update API files
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/collator_api.php?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/intl/doc/collator_api.php
diff -u php-src/ext/intl/doc/collator_api.php:1.1.2.1
php-src/ext/intl/doc/collator_api.php:1.1.2.2
--- php-src/ext/intl/doc/collator_api.php:1.1.2.1 Mon Jul 7 22:51:03 2008
+++ php-src/ext/intl/doc/collator_api.php Wed Jul 1 20:25:38 2009
@@ -395,4 +395,3 @@
* Collator API function call.
*/
function collator_get_error_message( $coll ) {}
-?>
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/common_api.php?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/intl/doc/common_api.php
diff -u php-src/ext/intl/doc/common_api.php:1.1.2.1
php-src/ext/intl/doc/common_api.php:1.1.2.2
--- php-src/ext/intl/doc/common_api.php:1.1.2.1 Mon Jul 7 22:51:03 2008
+++ php-src/ext/intl/doc/common_api.php Wed Jul 1 20:25:38 2009
@@ -54,5 +54,3 @@
* @return string Error code name.
*/
function intl_error_name($code) {}
-
-?>
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/datefmt_api.php?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/intl/doc/datefmt_api.php
diff -u php-src/ext/intl/doc/datefmt_api.php:1.1.2.1
php-src/ext/intl/doc/datefmt_api.php:1.1.2.2
--- php-src/ext/intl/doc/datefmt_api.php:1.1.2.1 Mon Jul 7 22:51:03 2008
+++ php-src/ext/intl/doc/datefmt_api.php Wed Jul 1 20:25:38 2009
@@ -434,6 +434,3 @@
* @return string Description of the last error.
*/
function datefmt_get_error_message($fmt) {}
-
-
-?>
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/formatter_api.php?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/intl/doc/formatter_api.php
diff -u php-src/ext/intl/doc/formatter_api.php:1.1.2.1
php-src/ext/intl/doc/formatter_api.php:1.1.2.2
--- php-src/ext/intl/doc/formatter_api.php:1.1.2.1 Mon Jul 7 22:51:03 2008
+++ php-src/ext/intl/doc/formatter_api.php Wed Jul 1 20:25:38 2009
@@ -498,5 +498,3 @@
* @return string Description of the last occured error.
*/
function numfmt_get_error_message($formatter) {}
-
-?>
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/doc/locale_api.php?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/intl/doc/locale_api.php
diff -u php-src/ext/intl/doc/locale_api.php:1.1.2.1
php-src/ext/intl/doc/locale_api.php:1.1.2.2
--- php-src/ext/intl/doc/locale_api.php:1.1.2.1 Mon Jul 7 22:51:03 2008
+++ php-src/ext/intl/doc/locale_api.php Wed Jul 1 20:25:38 2009
@@ -42,7 +42,7 @@
* The following static members are used with the getLocale methods of
* the various locale affected classes, such as numfmt.
*/
- const DEFAULT_LOCALE = default_locale;
+ const DEFAULT_LOCALE = null;
/**
* identifiers for the actual locale, valid locale
@@ -59,13 +59,13 @@
/**
* Valid locale tag and subtag values
*/
- LANG_TAG = "language";
- EXTLANG_TAG = "extlang";
- SCRIPT_TAG = "script";
- REGION_TAG = "region";
- VARIANT_TAG = "variant";
- GRANDFATHERED_LANG_TAG = "grandfathered";
- PRIVATE_TAG = "private";
+ const LANG_TAG = "language";
+ const EXTLANG_TAG = "extlang";
+ const SCRIPT_TAG = "script";
+ const REGION_TAG = "region";
+ const VARIANT_TAG = "variant";
+ const GRANDFATHERED_LANG_TAG = "grandfathered";
+ const PRIVATE_TAG = "private";
#############################################################################
@@ -206,9 +206,10 @@
*
* @param string $langtag the language tag to
check
* @param string $locale the language range to
check against
+ * @param bool $canonicalize Canonicalize parameters?
* @return boolean 'true' if $locale
matches $langtag 'false' otherwise
*/
- public static function filterMatches($langtag, $locale) {}
+ public static function filterMatches($langtag, $locale, $canonicalize)
{}
/**
* Searchs the items in $langtag for the best match to the language
@@ -263,7 +264,7 @@
*
* @return string the current runtime locale
*/
- public static function locale_get_default() {}
+ function locale_get_default() {}
/**
* sets the default runtime locale to $locale
@@ -273,7 +274,7 @@
* locale identifier. UAX #35
extensions are accepted.
* @return boolean 'true' if okay, 'false' if an
error
*/
- public static function locale_set_default($locale) {}
+ function locale_set_default($locale) {}
/**
@@ -283,7 +284,7 @@
* @return string the language code associated
with the language
* or null in case of error.
*/
- public static function locale_get_primary_language($locale) {}
+ function locale_get_primary_language($locale) {}
/**
@@ -292,7 +293,7 @@
* @param string $locale the locale to extract the
script code from
* @return string the script subtag for the
locale or null if not present
*/
- public static function locale_get_script($locale) {}
+ function locale_get_script($locale) {}
/**
@@ -301,7 +302,7 @@
* @param string $locale the locale to extract the
region code from
* @return string the region subtag for the
locale or null if not present
*/
- public static function locale_get_region($locale) {}
+ function locale_get_region($locale) {}
/**
@@ -311,7 +312,7 @@
* @return array the array containing the list
of all variants
* subtag for the locale or null
if not present
*/
- public static function locale_get_all_variants($locale) {}
+ function locale_get_all_variants($locale) {}
/**
@@ -320,7 +321,7 @@
* @param string $locale the locale to extract the
keywords from
* @return array associative array containing
the keyword-value pairs for this locale
*/
- public static function locale_get_keywords($locale) {}
+ function locale_get_keywords($locale) {}
/**
@@ -332,7 +333,7 @@
* @return string display name of the
locale in the format
* appropriate for
$in_locale.
*/
- public static function locale_get_display_name($locale, $in_locale =
null) {}
+ function locale_get_display_name($locale, $in_locale = null) {}
/**
@@ -344,7 +345,7 @@
* @return string display name of the
language for the $locale in the format
* appropriate for
$in_locale.
*/
- public static function locale_get_display_language($lang, $in_locale =
null) {}
+ function locale_get_display_language($lang, $in_locale = null) {}
/**
* Returns an appropriately localized display name for script of the
input locale
@@ -355,7 +356,7 @@
* @return string display name of the
script for the $locale in the format
* appropriate for
$in_locale.
*/
- public static function locale_get_display_script($script, $in_locale =
null) {}
+ function locale_get_display_script($script, $in_locale = null) {}
/**
@@ -367,7 +368,7 @@
* @return string display name of the
region for the $locale in the format
* appropriate for
$in_locale.
*/
- public static function locale_get_display_region($region, $in_locale =
null) {}
+ function locale_get_display_region($region, $in_locale = null) {}
/**
@@ -379,7 +380,7 @@
* @return string display name of the
variant for the $locale in the format
* appropriate for
$in_locale.
*/
- public static function locale_get_display_variant($variant, $in_locale
= null) {}
+ function locale_get_display_variant($variant, $in_locale = null) {}
/**
@@ -388,9 +389,10 @@
*
* @param string $langtag the language tag to
check
* @param string $locale the language range to
check against
+ * @param bool $canonicalize Canonicalize parameters?
* @return boolean 'true' if $locale
matches $langtag 'false' otherwise
*/
- public static function locale_filter_matches($langtag, $locale) {}
+ function locale_filter_matches($langtag, $locale, $canonicalize) {}
/**
* Searchs the items in $langtag for the best match to the language
@@ -403,7 +405,7 @@
* @return string closest matching
language tag, $default,
* or empty string
*/
- public static function locale_lookup(array $langtag, $locale, $default
= null) {}
+ function locale_lookup(array $langtag, $locale, $default = null) {}
/**
@@ -415,7 +417,7 @@
*
* @return string the corresponding
locale identifier.
*/
- public static function locale_compose_locale(array $subtags) {}
+ function locale_compose_locale(array $subtags) {}
/**
@@ -427,6 +429,6 @@
* the keys identify the
particular locale ID subtags,
* and the values are the
associated subtag values.
*/
- public static function locale_parse_locale($locale) {}
+ function locale_parse_locale($locale) {}
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
