diff options
Diffstat (limited to 'ext/intl')
| -rw-r--r-- | ext/intl/ERROR.CONVENTIONS | 2 | ||||
| -rw-r--r-- | ext/intl/doc/Tutorial.txt | 2 | ||||
| -rw-r--r-- | ext/intl/doc/grapheme_api.php | 4 | ||||
| -rw-r--r-- | ext/intl/doc/msgfmt_api.php | 4 | ||||
| -rw-r--r-- | ext/intl/tests/badargs.phpt | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/ext/intl/ERROR.CONVENTIONS b/ext/intl/ERROR.CONVENTIONS index 6f9079c56..41cd14ec0 100644 --- a/ext/intl/ERROR.CONVENTIONS +++ b/ext/intl/ERROR.CONVENTIONS @@ -18,7 +18,7 @@ message set by the PHP wrapping code, not by ICU. The message should include the name of the function that failed in order to make debugging easier (though if you activate warnings with intl.error_level or exceptions with intl.use_exceptions you get more fine-grained information about where the -error ocurred). +error occurred). The internal PHP code can set the global last error with: void intl_error_set_code(intl_error* err, UErrorCode err_code TSRMLS_DC); diff --git a/ext/intl/doc/Tutorial.txt b/ext/intl/doc/Tutorial.txt index 4a66dc184..3bb31b00e 100644 --- a/ext/intl/doc/Tutorial.txt +++ b/ext/intl/doc/Tutorial.txt @@ -7,7 +7,7 @@ Examle of locales format: 'en_US', 'ru_UA', 'ua_UA' (see http://demo.icu-project 2. Collator::getDisplayName( $obj_locale, $disp_locale ). -Get name of the object for the desired Locale, in the desired langauge. Both arguments +Get name of the object for the desired Locale, in the desired language. Both arguments must be from getAvailableLocales method. @param string $obj_locale Locale to get display name for. diff --git a/ext/intl/doc/grapheme_api.php b/ext/intl/doc/grapheme_api.php index 465453fd3..e22d165cb 100644 --- a/ext/intl/doc/grapheme_api.php +++ b/ext/intl/doc/grapheme_api.php @@ -98,7 +98,7 @@ * @param string $haystack The input string. * @param string $needle The string to look for. * @param [boolean] $before_needle If TRUE (the default is FALSE), grapheme_strstr() returns the part of the - haystack before the first occurence of the needle. + haystack before the first occurrence of the needle. * @return string Returns the portion of string, or FALSE if needle is not found. */ function grapheme_strstr($haystack, $needle, $before_needle = FALSE) {} @@ -109,7 +109,7 @@ * @param string $haystack The input string. * @param string $needle The string to look for. * @param [boolean] $before_needle If TRUE (the default is FALSE), grapheme_strstr() returns the part of the - haystack before the first occurence of the needle. + haystack before the first occurrence of the needle. * @return string Returns the portion of string, or FALSE if needle is not found. */ function grapheme_stristr($haystack, $needle, $before_needle = FALSE) {} diff --git a/ext/intl/doc/msgfmt_api.php b/ext/intl/doc/msgfmt_api.php index e4d047b97..3df6f0de1 100644 --- a/ext/intl/doc/msgfmt_api.php +++ b/ext/intl/doc/msgfmt_api.php @@ -31,7 +31,7 @@ class MessageFormatter { /** * Format the message * @param array $args arguments to insert into the pattern string - * @return string the formatted string, or false if an error ocurred + * @return string the formatted string, or false if an error occurred */ public function format($args) {} @@ -124,7 +124,7 @@ class MessageFormatter { * Format the message * @param MessageFormatter $fmt The message formatter * @param array $args arguments to insert into the pattern string - * @return string the formatted string, or false if an error ocurred + * @return string the formatted string, or false if an error occurred */ function msgfmt_format($fmt, $args) {} diff --git a/ext/intl/tests/badargs.phpt b/ext/intl/tests/badargs.phpt index b8f48b371..b2120977f 100644 --- a/ext/intl/tests/badargs.phpt +++ b/ext/intl/tests/badargs.phpt @@ -1,5 +1,5 @@ --TEST-- -Check that bad argumens return the same +Check that bad arguments return the same --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> --FILE-- |