@@ -42,7 +42,7 @@ class Locale {
42
42
* The following static members are used with the getLocale methods of
43
43
* the various locale affected classes, such as numfmt.
44
44
*/
45
- const DEFAULT_LOCALE = default_locale ;
45
+ const DEFAULT_LOCALE = null ;
46
46
47
47
/**
48
48
* identifiers for the actual locale, valid locale
@@ -59,13 +59,13 @@ class Locale {
59
59
/**
60
60
* Valid locale tag and subtag values
61
61
*/
62
- LANG_TAG = "language";
63
- EXTLANG_TAG = "extlang";
64
- SCRIPT_TAG = "script";
65
- REGION_TAG = "region";
66
- VARIANT_TAG = "variant";
67
- GRANDFATHERED_LANG_TAG = "grandfathered";
68
- PRIVATE_TAG = "private ";
62
+ const LANG_TAG = "language " ;
63
+ const EXTLANG_TAG = "extlang " ;
64
+ const SCRIPT_TAG = "script " ;
65
+ const REGION_TAG = "region " ;
66
+ const VARIANT_TAG = "variant " ;
67
+ const GRANDFATHERED_LANG_TAG = "grandfathered " ;
68
+ const PRIVATE_TAG = "private " ;
69
69
70
70
71
71
#############################################################################
@@ -206,9 +206,10 @@ public static function getDisplayVariant($variant, $in_locale = null) {}
206
206
*
207
207
* @param string $langtag the language tag to check
208
208
* @param string $locale the language range to check against
209
+ * @param bool $canonicalize Canonicalize parameters?
209
210
* @return boolean 'true' if $locale matches $langtag 'false' otherwise
210
211
*/
211
- public static function filterMatches ($ langtag , $ locale ) {}
212
+ public static function filterMatches ($ langtag , $ locale, $ canonicalize ) {}
212
213
213
214
/**
214
215
* Searchs the items in $langtag for the best match to the language
@@ -263,7 +264,7 @@ public static function parseLocale($locale) {}
263
264
*
264
265
* @return string the current runtime locale
265
266
*/
266
- public static function locale_get_default () {}
267
+ function locale_get_default () {}
267
268
268
269
/**
269
270
* sets the default runtime locale to $locale
@@ -273,7 +274,7 @@ public static function locale_get_default() {}
273
274
* locale identifier. UAX #35 extensions are accepted.
274
275
* @return boolean 'true' if okay, 'false' if an error
275
276
*/
276
- public static function locale_set_default ($ locale ) {}
277
+ function locale_set_default ($ locale ) {}
277
278
278
279
279
280
/**
@@ -283,7 +284,7 @@ public static function locale_set_default($locale) {}
283
284
* @return string the language code associated with the language
284
285
* or null in case of error.
285
286
*/
286
- public static function locale_get_primary_language ($ locale ) {}
287
+ function locale_get_primary_language ($ locale ) {}
287
288
288
289
289
290
/**
@@ -292,7 +293,7 @@ public static function locale_get_primary_language($locale) {}
292
293
* @param string $locale the locale to extract the script code from
293
294
* @return string the script subtag for the locale or null if not present
294
295
*/
295
- public static function locale_get_script ($ locale ) {}
296
+ function locale_get_script ($ locale ) {}
296
297
297
298
298
299
/**
@@ -301,7 +302,7 @@ public static function locale_get_script($locale) {}
301
302
* @param string $locale the locale to extract the region code from
302
303
* @return string the region subtag for the locale or null if not present
303
304
*/
304
- public static function locale_get_region ($ locale ) {}
305
+ function locale_get_region ($ locale ) {}
305
306
306
307
307
308
/**
@@ -311,7 +312,7 @@ public static function locale_get_region($locale) {}
311
312
* @return array the array containing the list of all variants
312
313
* subtag for the locale or null if not present
313
314
*/
314
- public static function locale_get_all_variants ($ locale ) {}
315
+ function locale_get_all_variants ($ locale ) {}
315
316
316
317
317
318
/**
@@ -320,7 +321,7 @@ public static function locale_get_all_variants($locale) {}
320
321
* @param string $locale the locale to extract the keywords from
321
322
* @return array associative array containing the keyword-value pairs for this locale
322
323
*/
323
- public static function locale_get_keywords ($ locale ) {}
324
+ function locale_get_keywords ($ locale ) {}
324
325
325
326
326
327
/**
@@ -332,7 +333,7 @@ public static function locale_get_keywords($locale) {}
332
333
* @return string display name of the locale in the format
333
334
* appropriate for $in_locale.
334
335
*/
335
- public static function locale_get_display_name ($ locale , $ in_locale = null ) {}
336
+ function locale_get_display_name ($ locale , $ in_locale = null ) {}
336
337
337
338
338
339
/**
@@ -344,7 +345,7 @@ public static function locale_get_display_name($locale, $in_locale = null) {}
344
345
* @return string display name of the language for the $locale in the format
345
346
* appropriate for $in_locale.
346
347
*/
347
- public static function locale_get_display_language ($ lang , $ in_locale = null ) {}
348
+ function locale_get_display_language ($ lang , $ in_locale = null ) {}
348
349
349
350
/**
350
351
* Returns an appropriately localized display name for script of the input locale
@@ -355,7 +356,7 @@ public static function locale_get_display_language($lang, $in_locale = null) {}
355
356
* @return string display name of the script for the $locale in the format
356
357
* appropriate for $in_locale.
357
358
*/
358
- public static function locale_get_display_script ($ script , $ in_locale = null ) {}
359
+ function locale_get_display_script ($ script , $ in_locale = null ) {}
359
360
360
361
361
362
/**
@@ -367,7 +368,7 @@ public static function locale_get_display_script($script, $in_locale = null) {}
367
368
* @return string display name of the region for the $locale in the format
368
369
* appropriate for $in_locale.
369
370
*/
370
- public static function locale_get_display_region ($ region , $ in_locale = null ) {}
371
+ function locale_get_display_region ($ region , $ in_locale = null ) {}
371
372
372
373
373
374
/**
@@ -379,7 +380,7 @@ public static function locale_get_display_region($region, $in_locale = null) {}
379
380
* @return string display name of the variant for the $locale in the format
380
381
* appropriate for $in_locale.
381
382
*/
382
- public static function locale_get_display_variant ($ variant , $ in_locale = null ) {}
383
+ function locale_get_display_variant ($ variant , $ in_locale = null ) {}
383
384
384
385
385
386
/**
@@ -388,9 +389,10 @@ public static function locale_get_display_variant($variant, $in_locale = null) {
388
389
*
389
390
* @param string $langtag the language tag to check
390
391
* @param string $locale the language range to check against
392
+ * @param bool $canonicalize Canonicalize parameters?
391
393
* @return boolean 'true' if $locale matches $langtag 'false' otherwise
392
394
*/
393
- public static function locale_filter_matches ($ langtag , $ locale ) {}
395
+ function locale_filter_matches ($ langtag , $ locale, $ canonicalize ) {}
394
396
395
397
/**
396
398
* Searchs the items in $langtag for the best match to the language
@@ -403,7 +405,7 @@ public static function locale_filter_matches($langtag, $locale) {}
403
405
* @return string closest matching language tag, $default,
404
406
* or empty string
405
407
*/
406
- public static function locale_lookup (array $ langtag , $ locale , $ default = null ) {}
408
+ function locale_lookup (array $ langtag , $ locale , $ default = null ) {}
407
409
408
410
409
411
/**
@@ -415,7 +417,7 @@ public static function locale_lookup(array $langtag, $locale, $default = null) {
415
417
*
416
418
* @return string the corresponding locale identifier.
417
419
*/
418
- public static function locale_compose_locale (array $ subtags ) {}
420
+ function locale_compose_locale (array $ subtags ) {}
419
421
420
422
421
423
/**
@@ -427,6 +429,6 @@ public static function locale_compose_locale(array $subtags) {}
427
429
* the keys identify the particular locale ID subtags,
428
430
* and the values are the associated subtag values.
429
431
*/
430
- public static function locale_parse_locale ($ locale ) {}
432
+ function locale_parse_locale ($ locale ) {}
431
433
432
434
?>
0 commit comments