Skip to content

Commit 6bf7839

Browse files
fabpotfabpot
committed
minor #31403 [Intl][4.3] Apply localeDisplayPattern and fix locale generation (ro0NL)
This PR was squashed before being merged into the 4.3-dev branch (closes #31403). Discussion ---------- [Intl][4.3] Apply localeDisplayPattern and fix locale generation | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | no | Tests pass? | yes <!-- please add some, will be required by reviewers --> | Fixed tickets | #... <!-- #-prefixed issue number(s), if any --> | License | MIT | Doc PR | symfony/symfony-docs#... <!-- required for new features --> Follow up of #31337 & #31402 for 4.3 / master Commits ------- ed04f242d2 recompile 504db27860 re-apply api changes for TimezoneDataGenerator c443e78dde re-apply translator parents.json generation bf50b61f2a [Intl] Apply localeDisplayPattern and fix locale generation
2 parents d4fdd13 + 11ca3d6 commit 6bf7839

File tree

14 files changed

+7
-51
lines changed

14 files changed

+7
-51
lines changed

‎Data/Generator/TimezoneDataGenerator.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Component\Intl\Data\Generator;
1313

14-
use Symfony\Component\Intl\Data\Bundle\Compiler\GenrbCompiler;
15-
use Symfony\Component\Intl\Data\Bundle\Reader\BundleReaderInterface;
14+
use Symfony\Component\Intl\Data\Bundle\Compiler\BundleCompilerInterface;
15+
use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
1616
use Symfony\Component\Intl\Data\Provider\RegionDataProvider;
1717
use Symfony\Component\Intl\Data\Util\ArrayAccessibleResourceBundle;
1818
use Symfony\Component\Intl\Data\Util\LocaleScanner;
@@ -36,7 +36,7 @@ class TimezoneDataGenerator extends AbstractDataGenerator
3636
private $zoneIds = [];
3737
private $regionDataProvider;
3838

39-
public function __construct(GenrbCompiler $compiler, string $dirName, RegionDataProvider $regionDataProvider)
39+
public function __construct(BundleCompilerInterface $compiler, string $dirName, RegionDataProvider $regionDataProvider)
4040
{
4141
parent::__construct($compiler, $dirName);
4242

@@ -54,7 +54,7 @@ protected function scanLocales(LocaleScanner $scanner, $sourceDir)
5454
/**
5555
* {@inheritdoc}
5656
*/
57-
protected function compileTemporaryBundles(GenrbCompiler $compiler, $sourceDir, $tempDir)
57+
protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $sourceDir, $tempDir)
5858
{
5959
$compiler->compile($sourceDir.'/zone', $tempDir);
6060
$compiler->compile($sourceDir.'/misc/timezoneTypes.txt', $tempDir);
@@ -73,7 +73,7 @@ protected function preGenerate()
7373
/**
7474
* {@inheritdoc}
7575
*/
76-
protected function generateDataForLocale(BundleReaderInterface $reader, $tempDir, $displayLocale)
76+
protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale)
7777
{
7878
$localeBundle = $reader->read($tempDir, $displayLocale);
7979

@@ -114,14 +114,14 @@ protected function generateDataForLocale(BundleReaderInterface $reader, $tempDir
114114
/**
115115
* {@inheritdoc}
116116
*/
117-
protected function generateDataForRoot(BundleReaderInterface $reader, $tempDir)
117+
protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir)
118118
{
119119
}
120120

121121
/**
122122
* {@inheritdoc}
123123
*/
124-
protected function generateDataForMeta(BundleReaderInterface $reader, $tempDir)
124+
protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir)
125125
{
126126
$rootBundle = $reader->read($tempDir, 'root');
127127

‎Resources/data/locales/am.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,12 +510,10 @@
510510
"sr_Cyrl_BA": "ሰርብያኛ (ሲይሪልክ፣ቦስኒያ እና ሄርዞጎቪኒያ)",
511511
"sr_Cyrl_ME": "ሰርብያኛ (ሲይሪልክ፣ሞንተኔግሮ)",
512512
"sr_Cyrl_RS": "ሰርብያኛ (ሲይሪልክ፣ሰርብያ)",
513-
"sr_Cyrl_XK": "ሰርብያኛ (ሲይሪልክ፣ኮሶቮ)",
514513
"sr_Latn": "ሰርብያኛ (ላቲን)",
515514
"sr_Latn_BA": "ሰርብያኛ (ላቲን፣ቦስኒያ እና ሄርዞጎቪኒያ)",
516515
"sr_Latn_ME": "ሰርብያኛ (ላቲን፣ሞንተኔግሮ)",
517516
"sr_Latn_RS": "ሰርብያኛ (ላቲን፣ሰርብያ)",
518-
"sr_Latn_XK": "ሰርብያኛ (ላቲን፣ኮሶቮ)",
519517
"sr_ME": "ሰርብያኛ (ሞንተኔግሮ)",
520518
"sr_RS": "ሰርብያኛ (ሰርብያ)",
521519
"sv": "ስዊድንኛ",

‎Resources/data/locales/ar.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,12 +510,10 @@
510510
"sr_Cyrl_BA": "الصربية (السيريلية، البوسنة والهرسك)",
511511
"sr_Cyrl_ME": "الصربية (السيريلية، الجبل الأسود)",
512512
"sr_Cyrl_RS": "الصربية (السيريلية، صربيا)",
513-
"sr_Cyrl_XK": "الصربية (السيريلية، كوسوفو)",
514513
"sr_Latn": "الصربية (اللاتينية)",
515514
"sr_Latn_BA": "الصربية (اللاتينية، البوسنة والهرسك)",
516515
"sr_Latn_ME": "الصربية (اللاتينية، الجبل الأسود)",
517516
"sr_Latn_RS": "الصربية (اللاتينية، صربيا)",
518-
"sr_Latn_XK": "الصربية (اللاتينية، كوسوفو)",
519517
"sr_ME": "الصربية (الجبل الأسود)",
520518
"sr_RS": "الصربية (صربيا)",
521519
"sv": "السويدية",

‎Resources/data/locales/dz.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@
104104
"en_CX": "ཨིང་ལིཤ་ཁ། (ཁི་རིསྟ་མེས་མཚོ་གླིང།)",
105105
"en_CY": "ཨིང་ལིཤ་ཁ། (སཱའི་པྲས།)",
106106
"en_DE": "ཨིང་ལིཤ་ཁ། (ཇཱར་མ་ནི།)",
107-
"en_DG": "ཨིང་ལིཤ་ཁ། (ཌི་ཡེ་གོ་གར་སིའོ།)",
108107
"en_DK": "ཨིང་ལིཤ་ཁ། (ཌེན་མཱཀ།)",
109108
"en_DM": "ཨིང་ལིཤ་ཁ། (ཌོ་མི་ནི་ཀ།)",
110109
"en_ER": "ཨིང་ལིཤ་ཁ། (ཨེ་རི་ཊྲེ་ཡ།)",
@@ -197,13 +196,11 @@
197196
"es_CR": "ཨིས་པེ་ནིཤ་ཁ། (ཀོས་ཊ་རི་ཀ།)",
198197
"es_CU": "ཨིས་པེ་ནིཤ་ཁ། (ཀིའུ་བྷ།)",
199198
"es_DO": "ཨིས་པེ་ནིཤ་ཁ། (ཌོ་མི་ནི་ཀཱན་ རི་པབ་ལིཀ།)",
200-
"es_EA": "ཨིས་པེ་ནིཤ་ཁ། (སེ་ཨུ་ཏ་ ཨེནཌ་ མེལ་ལི་ལ།)",
201199
"es_EC": "ཨིས་པེ་ནིཤ་ཁ། (ཨེ་ཁྭ་ཌོར།)",
202200
"es_ES": "ཨིས་པེ་ནིཤ་ཁ། (ཨིས་པེན།)",
203201
"es_GQ": "ཨིས་པེ་ནིཤ་ཁ། (ཨེ་ཀུ་ཊོ་རེལ་ གི་ནི།)",
204202
"es_GT": "ཨིས་པེ་ནིཤ་ཁ། (གྷོ་ཊ་མ་ལ།)",
205203
"es_HN": "ཨིས་པེ་ནིཤ་ཁ། (ཧཱན་ཌུ་རཱས྄།)",
206-
"es_IC": "ཨིས་པེ་ནིཤ་ཁ། (ཀ་ནེ་རི་གླིང་ཚོམ།)",
207204
"es_MX": "ཨིས་པེ་ནིཤ་ཁ། (མེཀ་སི་ཀོ།)",
208205
"es_NI": "ཨིས་པེ་ནིཤ་ཁ། (ནི་ཀྲ་ཝ་ག།)",
209206
"es_PA": "ཨིས་པེ་ནིཤ་ཁ། (པ་ན་མ།)",

‎Resources/data/locales/fa.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,12 +510,10 @@
510510
"sr_Cyrl_BA": "صربی (سیریلی، بوسنی و هرزگوین)",
511511
"sr_Cyrl_ME": "صربی (سیریلی، مونته‌نگرو)",
512512
"sr_Cyrl_RS": "صربی (سیریلی، صربستان)",
513-
"sr_Cyrl_XK": "صربی (سیریلی، کوزوو)",
514513
"sr_Latn": "صربی (لاتینی)",
515514
"sr_Latn_BA": "صربی (لاتینی، بوسنی و هرزگوین)",
516515
"sr_Latn_ME": "صربی (لاتینی، مونته‌نگرو)",
517516
"sr_Latn_RS": "صربی (لاتینی، صربستان)",
518-
"sr_Latn_XK": "صربی (لاتینی، کوزوو)",
519517
"sr_ME": "صربی (مونته‌نگرو)",
520518
"sr_RS": "صربی (صربستان)",
521519
"sv": "سوئدی",

‎Resources/data/locales/fa_AF.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,7 @@
208208
"sq_MK": "البانیایی (مقدونیهٔ شمالی)",
209209
"sr_BA": "صربی (بوسنیا و هرزه‌گوینا)",
210210
"sr_Cyrl_BA": "صربی (سیریلی، بوسنیا و هرزه‌گوینا)",
211-
"sr_Cyrl_XK": "صربی (سیریلی، کوسوا)",
212211
"sr_Latn_BA": "صربی (لاتینی، بوسنیا و هرزه‌گوینا)",
213-
"sr_Latn_XK": "صربی (لاتینی، کوسوا)",
214-
"sr_XK": "صربی (کوسوا)",
215212
"sv": "سویدنی",
216213
"sv_AX": "سویدنی (جزایر آلاند)",
217214
"sv_FI": "سویدنی (فنلند)",

‎Resources/data/locales/ja.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,12 +510,10 @@
510510
"sr_Cyrl_BA": "セルビア語 (キリル文字、ボスニア・ヘルツェゴビナ)",
511511
"sr_Cyrl_ME": "セルビア語 (キリル文字、モンテネグロ)",
512512
"sr_Cyrl_RS": "セルビア語 (キリル文字、セルビア)",
513-
"sr_Cyrl_XK": "セルビア語 (キリル文字、コソボ)",
514513
"sr_Latn": "セルビア語 (ラテン文字)",
515514
"sr_Latn_BA": "セルビア語 (ラテン文字、ボスニア・ヘルツェゴビナ)",
516515
"sr_Latn_ME": "セルビア語 (ラテン文字、モンテネグロ)",
517516
"sr_Latn_RS": "セルビア語 (ラテン文字、セルビア)",
518-
"sr_Latn_XK": "セルビア語 (ラテン文字、コソボ)",
519517
"sr_ME": "セルビア語 (モンテネグロ)",
520518
"sr_RS": "セルビア語 (セルビア)",
521519
"sv": "スウェーデン語",

‎Resources/data/locales/ko.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
"en_CX": "영어(크리스마스섬)",
116116
"en_CY": "영어(키프로스)",
117117
"en_DE": "영어(독일)",
118-
"en_DG": "영어(디에고 가르시아)",
119118
"en_DK": "영어(덴마크)",
120119
"en_DM": "영어(도미니카)",
121120
"en_ER": "영어(에리트리아)",
@@ -208,13 +207,11 @@
208207
"es_CR": "스페인어(코스타리카)",
209208
"es_CU": "스페인어(쿠바)",
210209
"es_DO": "스페인어(도미니카 공화국)",
211-
"es_EA": "스페인어(세우타 및 멜리야)",
212210
"es_EC": "스페인어(에콰도르)",
213211
"es_ES": "스페인어(스페인)",
214212
"es_GQ": "스페인어(적도 기니)",
215213
"es_GT": "스페인어(과테말라)",
216214
"es_HN": "스페인어(온두라스)",
217-
"es_IC": "스페인어(카나리아 제도)",
218215
"es_MX": "스페인어(멕시코)",
219216
"es_NI": "스페인어(니카라과)",
220217
"es_PA": "스페인어(파나마)",
@@ -507,22 +504,18 @@
507504
"sq": "알바니아어",
508505
"sq_AL": "알바니아어(알바니아)",
509506
"sq_MK": "알바니아어(북마케도니아)",
510-
"sq_XK": "알바니아어(코소보)",
511507
"sr": "세르비아어",
512508
"sr_BA": "세르비아어(보스니아 헤르체고비나)",
513509
"sr_Cyrl": "세르비아어(키릴 문자)",
514510
"sr_Cyrl_BA": "세르비아어(키릴 문자, 보스니아 헤르체고비나)",
515511
"sr_Cyrl_ME": "세르비아어(키릴 문자, 몬테네그로)",
516512
"sr_Cyrl_RS": "세르비아어(키릴 문자, 세르비아)",
517-
"sr_Cyrl_XK": "세르비아어(키릴 문자, 코소보)",
518513
"sr_Latn": "세르비아어(로마자)",
519514
"sr_Latn_BA": "세르비아어(로마자, 보스니아 헤르체고비나)",
520515
"sr_Latn_ME": "세르비아어(로마자, 몬테네그로)",
521516
"sr_Latn_RS": "세르비아어(로마자, 세르비아)",
522-
"sr_Latn_XK": "세르비아어(로마자, 코소보)",
523517
"sr_ME": "세르비아어(몬테네그로)",
524518
"sr_RS": "세르비아어(세르비아)",
525-
"sr_XK": "세르비아어(코소보)",
526519
"sv": "스웨덴어",
527520
"sv_AX": "스웨덴어(올란드 제도)",
528521
"sv_FI": "스웨덴어(핀란드)",

‎Resources/data/locales/my.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,12 +508,10 @@
508508
"sr_Cyrl_BA": "ဆားဘီးယား (စစ်ရိလစ်၊ ဘော့စနီးယားနှင့် ဟာဇီဂိုဗီနား)",
509509
"sr_Cyrl_ME": "ဆားဘီးယား (စစ်ရိလစ်၊ မွန်တီနိဂရိုး)",
510510
"sr_Cyrl_RS": "ဆားဘီးယား (စစ်ရိလစ်၊ ဆားဘီးယား)",
511-
"sr_Cyrl_XK": "ဆားဘီးယား (စစ်ရိလစ်၊ ကိုဆိုဗို)",
512511
"sr_Latn": "ဆားဘီးယား (လက်တင်)",
513512
"sr_Latn_BA": "ဆားဘီးယား (လက်တင်၊ ဘော့စနီးယားနှင့် ဟာဇီဂိုဗီနား)",
514513
"sr_Latn_ME": "ဆားဘီးယား (လက်တင်၊ မွန်တီနိဂရိုး)",
515514
"sr_Latn_RS": "ဆားဘီးယား (လက်တင်၊ ဆားဘီးယား)",
516-
"sr_Latn_XK": "ဆားဘီးယား (လက်တင်၊ ကိုဆိုဗို)",
517515
"sr_ME": "ဆားဘီးယား (မွန်တီနိဂရိုး)",
518516
"sr_RS": "ဆားဘီးယား (ဆားဘီးယား)",
519517
"sv": "ဆွီဒင်",

‎Resources/data/locales/ug.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,12 +510,10 @@
510510
"sr_Cyrl_BA": "سېربچە (كىرىل، بوسىنىيە ۋە گېرتسېگوۋىنا)",
511511
"sr_Cyrl_ME": "سېربچە (كىرىل، قارا تاغ)",
512512
"sr_Cyrl_RS": "سېربچە (كىرىل، سېربىيە)",
513-
"sr_Cyrl_XK": "سېربچە (كىرىل، كوسوۋو)",
514513
"sr_Latn": "سېربچە (لاتىنچە)",
515514
"sr_Latn_BA": "سېربچە (لاتىنچە، بوسىنىيە ۋە گېرتسېگوۋىنا)",
516515
"sr_Latn_ME": "سېربچە (لاتىنچە، قارا تاغ)",
517516
"sr_Latn_RS": "سېربچە (لاتىنچە، سېربىيە)",
518-
"sr_Latn_XK": "سېربچە (لاتىنچە، كوسوۋو)",
519517
"sr_ME": "سېربچە (قارا تاغ)",
520518
"sr_RS": "سېربچە (سېربىيە)",
521519
"sv": "شىۋېدچە",

0 commit comments

Comments
 (0)