Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit c2478d4

Browse filesBrowse files
fabpotfabpot
committed
minor #28977 [Intl] Update the ICU data to 63.1 (jakzal)
This PR was squashed before being merged into the 3.4 branch (closes #28977). Discussion ---------- [Intl] Update the ICU data to 63.1 | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no <!-- don't forget to update src/**/CHANGELOG.md files --> | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - http://site.icu-project.org/download/63 All tests are passing on the CI. I additionally run intl related tests (Form,Intl,Translation,Validator components) with ICU `63.1` on PHP `5.5`, `5.6`, `7.1`, `7.2`, `7.3-rc`. Confirmed `@group intl-data` tests are passing with ICU `63.1` on PHP `5.5` and `7.2`. Commits ------- 76bc6f0 [Intl] Update the ICU data to 63.1
2 parents 4877d60 + 76bc6f0 commit c2478d4
Copy full SHA for c2478d4

File tree

760 files changed

+13605
-3721
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner

760 files changed

+13605
-3721
lines changed

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ public function transform($value)
120120
throw new TransformationFailedException($formatter->getErrorMessage());
121121
}
122122

123-
// Convert fixed spaces to normal ones
124-
$value = str_replace("\xc2\xa0", ' ', $value);
123+
// Convert non-breaking and narrow non-breaking spaces to normal ones
124+
$value = str_replace(array("\xc2\xa0", "\xe2\x80\xaf"), ' ', $value);
125125

126126
return $value;
127127
}

‎src/Symfony/Component/Intl/Intl.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Intl.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public static function getIcuDataVersion()
235235
*/
236236
public static function getIcuStubVersion()
237237
{
238-
return '62.1';
238+
return '63.1';
239239
}
240240

241241
/**

‎src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
+20-15Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ class NumberFormatter
236236
);
237237

238238
private static $enTextAttributes = array(
239-
self::DECIMAL => array('', '', '-', '', ' ', '', ''),
240-
self::CURRENCY => array('¤', '', '-¤', '', ' ', ''),
239+
self::DECIMAL => array('', '', '-', '', ' ', 'XXX', ''),
240+
self::CURRENCY => array('¤', '', '-¤', '', ' ', 'XXX'),
241241
);
242242

243243
/**
@@ -331,7 +331,8 @@ public function formatCurrency($value, $currency)
331331

332332
$value = $this->formatNumber($value, $fractionDigits);
333333

334-
$ret = $symbol.$value;
334+
// There's a non-breaking space after the currency code (i.e. CRC 100), but not if the currency has a symbol (i.e. £100).
335+
$ret = $symbol.(mb_strlen($symbol, 'UTF-8') > 2 ? "\xc2\xa0" : '').$value;
335336

336337
return $negative ? '-'.$ret : $ret;
337338
}
@@ -513,17 +514,20 @@ public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)
513514
return false;
514515
}
515516

516-
$groupSep = $this->getAttribute(self::GROUPING_USED) ? ',' : '';
517-
518-
// Any string before the numeric value causes error in the parsing
519-
if (preg_match("/^-?(?:\.\d++|([\d{$groupSep}]++)(?:\.\d*+)?)/", $value, $matches)) {
517+
// Any invalid number at the end of the string is removed.
518+
// Only numbers and the fraction separator is expected in the string.
519+
// If grouping is used, grouping separator also becomes a valid character.
520+
$groupingMatch = $this->getAttribute(self::GROUPING_USED) ? '|(?P<grouping>\d++(,{1}\d+)++(\.\d*+)?)' : '';
521+
if (preg_match("/^-?(?:\.\d++{$groupingMatch}|\d++(\.\d*+)?)/", $value, $matches)) {
520522
$value = $matches[0];
521523
$position = \strlen($value);
522-
if ($error = $groupSep && isset($matches[1]) && !preg_match('/^\d{1,3}+(?:(?:,\d{3})++|\d*+)$/', $matches[1])) {
523-
$position -= \strlen(preg_replace('/^\d{1,3}+(?:(?:,\d++)++|\d*+)/', '', $matches[1]));
524+
// value is not valid if grouping is used, but digits are not grouped in groups of three
525+
if ($error = isset($matches['grouping']) && !preg_match('/^-?(?:\d{1,3}+)?(?:(?:,\d{3})++|\d*+)(?:\.\d*+)?$/', $value)) {
526+
// the position on error is 0 for positive and 1 for negative numbers
527+
$position = 0 === strpos($value, '-') ? 1 : 0;
524528
}
525529
} else {
526-
$error = 1;
530+
$error = true;
527531
$position = 0;
528532
}
529533

@@ -585,6 +589,10 @@ public function setAttribute($attr, $value)
585589

586590
if (self::$supportedAttributes['FRACTION_DIGITS'] == $attr) {
587591
$value = $this->normalizeFractionDigitsValue($value);
592+
if ($value < 0) {
593+
// ignore negative values but do not raise an error
594+
return true;
595+
}
588596
}
589597

590598
$this->attributes[$attr] = $value;
@@ -868,17 +876,14 @@ private function normalizeGroupingUsedValue($value)
868876
}
869877

870878
/**
871-
* Returns the normalized value for the FRACTION_DIGITS attribute. The value is converted to int and if negative,
872-
* the returned value will be 0.
879+
* Returns the normalized value for the FRACTION_DIGITS attribute.
873880
*
874881
* @param mixed $value The value to be normalized
875882
*
876883
* @return int The normalized value for the attribute
877884
*/
878885
private function normalizeFractionDigitsValue($value)
879886
{
880-
$value = (int) $value;
881-
882-
return (0 > $value) ? 0 : $value;
887+
return (int) $value;
883888
}
884889
}

‎src/Symfony/Component/Intl/Resources/bin/common.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/bin/common.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function run($command)
5555

5656
function get_icu_version_from_genrb($genrb)
5757
{
58-
exec($genrb.' --version 2>&1', $output, $status);
58+
exec($genrb.' --version - 2>&1', $output, $status);
5959

6060
if (0 !== $status) {
6161
bailout($genrb.' failed.');

‎src/Symfony/Component/Intl/Resources/data/currencies/af.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/af.json
+6-2Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.41.97",
2+
"Version": "2.1.43.65",
33
"Names": {
44
"AED": [
55
"AED",
@@ -183,7 +183,7 @@
183183
],
184184
"EUR": [
185185
"€",
186-
"Euro"
186+
"euro"
187187
],
188188
"FJD": [
189189
"FJD",
@@ -629,6 +629,10 @@
629629
"VEF",
630630
"Venezolaanse bolivar"
631631
],
632+
"VES": [
633+
"VES",
634+
"Venezolaanse Bolívar"
635+
],
632636
"VND": [
633637
"₫",
634638
"Viëtnamese dong"

‎src/Symfony/Component/Intl/Resources/data/currencies/am.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/am.json
+8-4Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.41.97",
2+
"Version": "2.1.43.65",
33
"Names": {
44
"AED": [
55
"AED",
@@ -503,11 +503,11 @@
503503
],
504504
"SDG": [
505505
"SDG",
506-
"የሱዳን ዲናር"
506+
"የሱዳን ፓውንድ"
507507
],
508508
"SDP": [
509509
"SDP",
510-
"የሱዳን ፓውንድ"
510+
"የሱዳን ፓውንድ (1957–1998)"
511511
],
512512
"SEK": [
513513
"SEK",
@@ -611,7 +611,11 @@
611611
],
612612
"VEF": [
613613
"VEF",
614-
"የቬንዝዌላ ቦሊቫር"
614+
"የቬንዝዌላ ቦሊቫር (2008–2018)"
615+
],
616+
"VES": [
617+
"VES",
618+
"የቬንዝዌላ-ቦሊቫር"
615619
],
616620
"VND": [
617621
"₫",

‎src/Symfony/Component/Intl/Resources/data/currencies/ar.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/ar.json
+8-4Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.41.97",
2+
"Version": "2.1.43.50",
33
"Names": {
44
"ADP": [
55
"ADP",
@@ -235,7 +235,7 @@
235235
],
236236
"CVE": [
237237
"CVE",
238-
"اسكودو الرأس الخضراء"
238+
"اسكودو الرأس الأخضر"
239239
],
240240
"CYP": [
241241
"CYP",
@@ -566,11 +566,11 @@
566566
"باتاكا ماكاوي"
567567
],
568568
"MRO": [
569-
"أ.م.‏",
569+
"MRO",
570570
"أوقية موريتانية - 1973-2017"
571571
],
572572
"MRU": [
573-
"MRU",
573+
"أ.م.",
574574
"أوقية موريتانية"
575575
],
576576
"MTL": [
@@ -899,6 +899,10 @@
899899
],
900900
"VEF": [
901901
"VEF",
902+
"بوليفار فنزويلي - 2008–2018"
903+
],
904+
"VES": [
905+
"VES",
902906
"بوليفار فنزويلي"
903907
],
904908
"VND": [

‎src/Symfony/Component/Intl/Resources/data/currencies/as.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/as.json
+9-1Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.41.97",
2+
"Version": "2.1.43.94",
33
"Names": {
44
"AED": [
55
"AED",
@@ -585,8 +585,16 @@
585585
"UZS",
586586
"উজবেকিস্তানী ছোম"
587587
],
588+
"VEB": [
589+
"VEB",
590+
"ভেনিজুৱেলান বলিভাৰ (1871–2008)"
591+
],
588592
"VEF": [
589593
"VEF",
594+
"ভেনিজুৱেলান বলিভাৰ (2008–2018)"
595+
],
596+
"VES": [
597+
"VES",
590598
"ভেনিজুৱেলান বলিভাৰ"
591599
],
592600
"VND": [

‎src/Symfony/Component/Intl/Resources/data/currencies/az.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/az.json
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.41.97",
2+
"Version": "2.1.44.53",
33
"Names": {
44
"ADP": [
55
"ADP",
@@ -955,6 +955,10 @@
955955
],
956956
"VEF": [
957957
"VEF",
958+
"Venesuela Bolivarı (2008–2018)"
959+
],
960+
"VES": [
961+
"VES",
958962
"Venesuela Bolivarı"
959963
],
960964
"VND": [

‎src/Symfony/Component/Intl/Resources/data/currencies/az_Cyrl.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/az_Cyrl.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.38.69",
2+
"Version": "2.1.44.53",
33
"Names": {
44
"AZN": [
55
"₼",

‎src/Symfony/Component/Intl/Resources/data/currencies/be.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/be.json
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.41.97",
2+
"Version": "2.1.43.65",
33
"Names": {
44
"AED": [
55
"AED",
@@ -591,6 +591,10 @@
591591
],
592592
"VEF": [
593593
"VEF",
594+
"венесуальскі балівар (2008–2018)"
595+
],
596+
"VES": [
597+
"VES",
594598
"венесуальскі балівар"
595599
],
596600
"VND": [

‎src/Symfony/Component/Intl/Resources/data/currencies/bg.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/bg.json
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.41.97",
2+
"Version": "2.1.43.94",
33
"Names": {
44
"ADP": [
55
"ADP",
@@ -949,6 +949,10 @@
949949
"VEF",
950950
"Венецуелски боливар"
951951
],
952+
"VES": [
953+
"VES",
954+
"Венецуелски боливар (VES)"
955+
],
952956
"VND": [
953957
"VND",
954958
"Виетнамски донг"

‎src/Symfony/Component/Intl/Resources/data/currencies/bn.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/bn.json
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.41.97",
2+
"Version": "2.1.44.91",
33
"Names": {
44
"ADP": [
55
"ADP",
@@ -971,6 +971,10 @@
971971
],
972972
"VEF": [
973973
"VEF",
974+
"ভেনিজুয়েলীয় বলিভার (২০০৮–২০১৮)"
975+
],
976+
"VES": [
977+
"VES",
974978
"ভেনিজুয়েলীয় বলিভার"
975979
],
976980
"VND": [

‎src/Symfony/Component/Intl/Resources/data/currencies/br.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/br.json
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.41.97",
2+
"Version": "2.1.44.91",
33
"Names": {
44
"ADP": [
55
"ADP",
@@ -1039,6 +1039,10 @@
10391039
],
10401040
"VEF": [
10411041
"VEF",
1042+
"bolivar Venezuela (2008–2018)"
1043+
],
1044+
"VES": [
1045+
"VES",
10421046
"bolivar Venezuela"
10431047
],
10441048
"VND": [

‎src/Symfony/Component/Intl/Resources/data/currencies/bs.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/bs.json
+6-2Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.41.97",
2+
"Version": "2.1.44.88",
33
"Names": {
44
"ADP": [
55
"ADP",
@@ -1003,7 +1003,11 @@
10031003
],
10041004
"VEF": [
10051005
"VEF",
1006-
"Venecuelanski bolivar"
1006+
"venecuelanski bolivar (2008–2018)"
1007+
],
1008+
"VES": [
1009+
"VES",
1010+
"venecuelanski bolivar"
10071011
],
10081012
"VND": [
10091013
"₫",

‎src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.41.97",
2+
"Version": "2.1.41.34",
33
"Names": {
44
"ADP": [
55
"ADP",
@@ -971,6 +971,10 @@
971971
],
972972
"VEF": [
973973
"VEF",
974+
"Венецуелански боливар (2008–2018)"
975+
],
976+
"VES": [
977+
"VES",
974978
"Венецуелански боливар"
975979
],
976980
"VND": [

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.