projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating Media dependent modules to versions compatible with core Media.
[yaffs-website]
/
vendor
/
symfony
/
translation
/
PluralizationRules.php
diff --git
a/vendor/symfony/translation/PluralizationRules.php
b/vendor/symfony/translation/PluralizationRules.php
index 09748211b13b3daaf3c703b2de66e05ec46af2a7..48a6c608cbfe2f3b638be32da9087cef22970295 100644
(file)
--- a/
vendor/symfony/translation/PluralizationRules.php
+++ b/
vendor/symfony/translation/PluralizationRules.php
@@
-71,7
+71,6
@@
class PluralizationRules
case 'vi':
case 'zh':
return 0;
case 'vi':
case 'zh':
return 0;
- break;
case 'af':
case 'bn':
case 'af':
case 'bn':
@@
-108,6
+107,7
@@
class PluralizationRules
case 'nl':
case 'nn':
case 'no':
case 'nl':
case 'nn':
case 'no':
+ case 'oc':
case 'om':
case 'or':
case 'pa':
case 'om':
case 'or':
case 'pa':
@@
-123,7
+123,7
@@
class PluralizationRules
case 'tk':
case 'ur':
case 'zu':
case 'tk':
case 'ur':
case 'zu':
- return (
$number == 1
) ? 0 : 1;
+ return (
1 == $number
) ? 0 : 1;
case 'am':
case 'bh':
case 'am':
case 'bh':
@@
-138,7
+138,7
@@
class PluralizationRules
case 'xbr':
case 'ti':
case 'wa':
case 'xbr':
case 'ti':
case 'wa':
- return ((
$number == 0) || ($number == 1
)) ? 0 : 1;
+ return ((
0 == $number) || (1 == $number
)) ? 0 : 1;
case 'be':
case 'bs':
case 'be':
case 'bs':
@@
-146,41
+146,41
@@
class PluralizationRules
case 'ru':
case 'sr':
case 'uk':
case 'ru':
case 'sr':
case 'uk':
- return ((
$number % 10 == 1) && ($number % 100 != 11
)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
+ return ((
1 == $number % 10) && (11 != $number % 100
)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
case 'cs':
case 'sk':
case 'cs':
case 'sk':
- return (
$number == 1
) ? 0 : ((($number >= 2) && ($number <= 4)) ? 1 : 2);
+ return (
1 == $number
) ? 0 : ((($number >= 2) && ($number <= 4)) ? 1 : 2);
case 'ga':
case 'ga':
- return (
$number == 1) ? 0 : (($number == 2
) ? 1 : 2);
+ return (
1 == $number) ? 0 : ((2 == $number
) ? 1 : 2);
case 'lt':
case 'lt':
- return ((
$number % 10 == 1) && ($number % 100 != 11
)) ? 0 : ((($number % 10 >= 2) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
+ return ((
1 == $number % 10) && (11 != $number % 100
)) ? 0 : ((($number % 10 >= 2) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
case 'sl':
case 'sl':
- return (
$number % 100 == 1) ? 0 : (($number % 100 == 2) ? 1 : ((($number % 100 == 3) || ($number % 100 == 4
)) ? 2 : 3));
+ return (
1 == $number % 100) ? 0 : ((2 == $number % 100) ? 1 : (((3 == $number % 100) || (4 == $number % 100
)) ? 2 : 3));
case 'mk':
case 'mk':
- return (
$number % 10 == 1
) ? 0 : 1;
+ return (
1 == $number % 10
) ? 0 : 1;
case 'mt':
case 'mt':
- return (
$number == 1) ? 0 : ((($number == 0
) || (($number % 100 > 1) && ($number % 100 < 11))) ? 1 : ((($number % 100 > 10) && ($number % 100 < 20)) ? 2 : 3));
+ return (
1 == $number) ? 0 : (((0 == $number
) || (($number % 100 > 1) && ($number % 100 < 11))) ? 1 : ((($number % 100 > 10) && ($number % 100 < 20)) ? 2 : 3));
case 'lv':
case 'lv':
- return (
$number == 0) ? 0 : ((($number % 10 == 1) && ($number % 100 != 11
)) ? 1 : 2);
+ return (
0 == $number) ? 0 : (((1 == $number % 10) && (11 != $number % 100
)) ? 1 : 2);
case 'pl':
case 'pl':
- return (
$number == 1
) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 12) || ($number % 100 > 14))) ? 1 : 2);
+ return (
1 == $number
) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 12) || ($number % 100 > 14))) ? 1 : 2);
case 'cy':
case 'cy':
- return (
$number == 1) ? 0 : (($number == 2) ? 1 : ((($number == 8) || ($number == 11
)) ? 2 : 3));
+ return (
1 == $number) ? 0 : ((2 == $number) ? 1 : (((8 == $number) || (11 == $number
)) ? 2 : 3));
case 'ro':
case 'ro':
- return (
$number == 1) ? 0 : ((($number == 0
) || (($number % 100 > 0) && ($number % 100 < 20))) ? 1 : 2);
+ return (
1 == $number) ? 0 : (((0 == $number
) || (($number % 100 > 0) && ($number % 100 < 20))) ? 1 : 2);
case 'ar':
case 'ar':
- return (
$number == 0) ? 0 : (($number == 1) ? 1 : (($number == 2
) ? 2 : ((($number % 100 >= 3) && ($number % 100 <= 10)) ? 3 : ((($number % 100 >= 11) && ($number % 100 <= 99)) ? 4 : 5))));
+ return (
0 == $number) ? 0 : ((1 == $number) ? 1 : ((2 == $number
) ? 2 : ((($number % 100 >= 3) && ($number % 100 <= 10)) ? 3 : ((($number % 100 >= 11) && ($number % 100 <= 99)) ? 4 : 5))));
default:
return 0;
default:
return 0;
@@
-192,10
+192,8
@@
class PluralizationRules
*
* @param callable $rule A PHP callable
* @param string $locale The locale
*
* @param callable $rule A PHP callable
* @param string $locale The locale
- *
- * @throws \LogicException
*/
*/
- public static function set($rule, $locale)
+ public static function set(
callable
$rule, $locale)
{
if ('pt_BR' === $locale) {
// temporary set a locale for brazilian
{
if ('pt_BR' === $locale) {
// temporary set a locale for brazilian
@@
-206,10
+204,6
@@
class PluralizationRules
$locale = substr($locale, 0, -strlen(strrchr($locale, '_')));
}
$locale = substr($locale, 0, -strlen(strrchr($locale, '_')));
}
- if (!is_callable($rule)) {
- throw new \LogicException('The given rule can not be called');
- }
-
self::$rules[$locale] = $rule;
}
}
self::$rules[$locale] = $rule;
}
}