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
This commit is contained in:
Fabien Potencier 2019-05-07 12:11:50 +02:00
commit e387854288
14 changed files with 7 additions and 51 deletions

View File

@ -11,8 +11,8 @@
namespace Symfony\Component\Intl\Data\Generator;
use Symfony\Component\Intl\Data\Bundle\Compiler\GenrbCompiler;
use Symfony\Component\Intl\Data\Bundle\Reader\BundleReaderInterface;
use Symfony\Component\Intl\Data\Bundle\Compiler\BundleCompilerInterface;
use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
use Symfony\Component\Intl\Data\Provider\RegionDataProvider;
use Symfony\Component\Intl\Data\Util\ArrayAccessibleResourceBundle;
use Symfony\Component\Intl\Data\Util\LocaleScanner;
@ -36,7 +36,7 @@ class TimezoneDataGenerator extends AbstractDataGenerator
private $zoneIds = [];
private $regionDataProvider;
public function __construct(GenrbCompiler $compiler, string $dirName, RegionDataProvider $regionDataProvider)
public function __construct(BundleCompilerInterface $compiler, string $dirName, RegionDataProvider $regionDataProvider)
{
parent::__construct($compiler, $dirName);
@ -54,7 +54,7 @@ class TimezoneDataGenerator extends AbstractDataGenerator
/**
* {@inheritdoc}
*/
protected function compileTemporaryBundles(GenrbCompiler $compiler, $sourceDir, $tempDir)
protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $sourceDir, $tempDir)
{
$compiler->compile($sourceDir.'/zone', $tempDir);
$compiler->compile($sourceDir.'/misc/timezoneTypes.txt', $tempDir);
@ -73,7 +73,7 @@ class TimezoneDataGenerator extends AbstractDataGenerator
/**
* {@inheritdoc}
*/
protected function generateDataForLocale(BundleReaderInterface $reader, $tempDir, $displayLocale)
protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale)
{
$localeBundle = $reader->read($tempDir, $displayLocale);
@ -114,14 +114,14 @@ class TimezoneDataGenerator extends AbstractDataGenerator
/**
* {@inheritdoc}
*/
protected function generateDataForRoot(BundleReaderInterface $reader, $tempDir)
protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir)
{
}
/**
* {@inheritdoc}
*/
protected function generateDataForMeta(BundleReaderInterface $reader, $tempDir)
protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir)
{
$rootBundle = $reader->read($tempDir, 'root');

View File

@ -510,12 +510,10 @@
"sr_Cyrl_BA": "ሰርብያኛ (ሲይሪልክ፣ቦስኒያ እና ሄርዞጎቪኒያ)",
"sr_Cyrl_ME": "ሰርብያኛ (ሲይሪልክ፣ሞንተኔግሮ)",
"sr_Cyrl_RS": "ሰርብያኛ (ሲይሪልክ፣ሰርብያ)",
"sr_Cyrl_XK": "ሰርብያኛ (ሲይሪልክ፣ኮሶቮ)",
"sr_Latn": "ሰርብያኛ (ላቲን)",
"sr_Latn_BA": "ሰርብያኛ (ላቲን፣ቦስኒያ እና ሄርዞጎቪኒያ)",
"sr_Latn_ME": "ሰርብያኛ (ላቲን፣ሞንተኔግሮ)",
"sr_Latn_RS": "ሰርብያኛ (ላቲን፣ሰርብያ)",
"sr_Latn_XK": "ሰርብያኛ (ላቲን፣ኮሶቮ)",
"sr_ME": "ሰርብያኛ (ሞንተኔግሮ)",
"sr_RS": "ሰርብያኛ (ሰርብያ)",
"sv": "ስዊድንኛ",

View File

@ -510,12 +510,10 @@
"sr_Cyrl_BA": "الصربية (السيريلية، البوسنة والهرسك)",
"sr_Cyrl_ME": "الصربية (السيريلية، الجبل الأسود)",
"sr_Cyrl_RS": "الصربية (السيريلية، صربيا)",
"sr_Cyrl_XK": "الصربية (السيريلية، كوسوفو)",
"sr_Latn": "الصربية (اللاتينية)",
"sr_Latn_BA": "الصربية (اللاتينية، البوسنة والهرسك)",
"sr_Latn_ME": "الصربية (اللاتينية، الجبل الأسود)",
"sr_Latn_RS": "الصربية (اللاتينية، صربيا)",
"sr_Latn_XK": "الصربية (اللاتينية، كوسوفو)",
"sr_ME": "الصربية (الجبل الأسود)",
"sr_RS": "الصربية (صربيا)",
"sv": "السويدية",

View File

@ -104,7 +104,6 @@
"en_CX": "ཨིང་ལིཤ་ཁ། (ཁི་རིསྟ་མེས་མཚོ་གླིང།)",
"en_CY": "ཨིང་ལིཤ་ཁ། (སཱའི་པྲས།)",
"en_DE": "ཨིང་ལིཤ་ཁ། (ཇཱར་མ་ནི།)",
"en_DG": "ཨིང་ལིཤ་ཁ། (ཌི་ཡེ་གོ་གར་སིའོ།)",
"en_DK": "ཨིང་ལིཤ་ཁ། (ཌེན་མཱཀ།)",
"en_DM": "ཨིང་ལིཤ་ཁ། (ཌོ་མི་ནི་ཀ།)",
"en_ER": "ཨིང་ལིཤ་ཁ། (ཨེ་རི་ཊྲེ་ཡ།)",
@ -197,13 +196,11 @@
"es_CR": "ཨིས་པེ་ནིཤ་ཁ། (ཀོས་ཊ་རི་ཀ།)",
"es_CU": "ཨིས་པེ་ནིཤ་ཁ། (ཀིའུ་བྷ།)",
"es_DO": "ཨིས་པེ་ནིཤ་ཁ། (ཌོ་མི་ནི་ཀཱན་ རི་པབ་ལིཀ།)",
"es_EA": "ཨིས་པེ་ནིཤ་ཁ། (སེ་ཨུ་ཏ་ ཨེནཌ་ མེལ་ལི་ལ།)",
"es_EC": "ཨིས་པེ་ནིཤ་ཁ། (ཨེ་ཁྭ་ཌོར།)",
"es_ES": "ཨིས་པེ་ནིཤ་ཁ། (ཨིས་པེན།)",
"es_GQ": "ཨིས་པེ་ནིཤ་ཁ། (ཨེ་ཀུ་ཊོ་རེལ་ གི་ནི།)",
"es_GT": "ཨིས་པེ་ནིཤ་ཁ། (གྷོ་ཊ་མ་ལ།)",
"es_HN": "ཨིས་པེ་ནིཤ་ཁ། (ཧཱན་ཌུ་རཱས྄།)",
"es_IC": "ཨིས་པེ་ནིཤ་ཁ། (ཀ་ནེ་རི་གླིང་ཚོམ།)",
"es_MX": "ཨིས་པེ་ནིཤ་ཁ། (མེཀ་སི་ཀོ།)",
"es_NI": "ཨིས་པེ་ནིཤ་ཁ། (ནི་ཀྲ་ཝ་ག།)",
"es_PA": "ཨིས་པེ་ནིཤ་ཁ། (པ་ན་མ།)",

View File

@ -510,12 +510,10 @@
"sr_Cyrl_BA": "صربی (سیریلی، بوسنی و هرزگوین)",
"sr_Cyrl_ME": "صربی (سیریلی، مونته‌نگرو)",
"sr_Cyrl_RS": "صربی (سیریلی، صربستان)",
"sr_Cyrl_XK": "صربی (سیریلی، کوزوو)",
"sr_Latn": "صربی (لاتینی)",
"sr_Latn_BA": "صربی (لاتینی، بوسنی و هرزگوین)",
"sr_Latn_ME": "صربی (لاتینی، مونته‌نگرو)",
"sr_Latn_RS": "صربی (لاتینی، صربستان)",
"sr_Latn_XK": "صربی (لاتینی، کوزوو)",
"sr_ME": "صربی (مونته‌نگرو)",
"sr_RS": "صربی (صربستان)",
"sv": "سوئدی",

View File

@ -208,10 +208,7 @@
"sq_MK": "البانیایی (مقدونیهٔ شمالی)",
"sr_BA": "صربی (بوسنیا و هرزه‌گوینا)",
"sr_Cyrl_BA": "صربی (سیریلی، بوسنیا و هرزه‌گوینا)",
"sr_Cyrl_XK": "صربی (سیریلی، کوسوا)",
"sr_Latn_BA": "صربی (لاتینی، بوسنیا و هرزه‌گوینا)",
"sr_Latn_XK": "صربی (لاتینی، کوسوا)",
"sr_XK": "صربی (کوسوا)",
"sv": "سویدنی",
"sv_AX": "سویدنی (جزایر آلاند)",
"sv_FI": "سویدنی (فنلند)",

View File

@ -510,12 +510,10 @@
"sr_Cyrl_BA": "セルビア語 (キリル文字、ボスニア・ヘルツェゴビナ)",
"sr_Cyrl_ME": "セルビア語 (キリル文字、モンテネグロ)",
"sr_Cyrl_RS": "セルビア語 (キリル文字、セルビア)",
"sr_Cyrl_XK": "セルビア語 (キリル文字、コソボ)",
"sr_Latn": "セルビア語 (ラテン文字)",
"sr_Latn_BA": "セルビア語 (ラテン文字、ボスニア・ヘルツェゴビナ)",
"sr_Latn_ME": "セルビア語 (ラテン文字、モンテネグロ)",
"sr_Latn_RS": "セルビア語 (ラテン文字、セルビア)",
"sr_Latn_XK": "セルビア語 (ラテン文字、コソボ)",
"sr_ME": "セルビア語 (モンテネグロ)",
"sr_RS": "セルビア語 (セルビア)",
"sv": "スウェーデン語",

View File

@ -115,7 +115,6 @@
"en_CX": "영어(크리스마스섬)",
"en_CY": "영어(키프로스)",
"en_DE": "영어(독일)",
"en_DG": "영어(디에고 가르시아)",
"en_DK": "영어(덴마크)",
"en_DM": "영어(도미니카)",
"en_ER": "영어(에리트리아)",
@ -208,13 +207,11 @@
"es_CR": "스페인어(코스타리카)",
"es_CU": "스페인어(쿠바)",
"es_DO": "스페인어(도미니카 공화국)",
"es_EA": "스페인어(세우타 및 멜리야)",
"es_EC": "스페인어(에콰도르)",
"es_ES": "스페인어(스페인)",
"es_GQ": "스페인어(적도 기니)",
"es_GT": "스페인어(과테말라)",
"es_HN": "스페인어(온두라스)",
"es_IC": "스페인어(카나리아 제도)",
"es_MX": "스페인어(멕시코)",
"es_NI": "스페인어(니카라과)",
"es_PA": "스페인어(파나마)",
@ -507,22 +504,18 @@
"sq": "알바니아어",
"sq_AL": "알바니아어(알바니아)",
"sq_MK": "알바니아어(북마케도니아)",
"sq_XK": "알바니아어(코소보)",
"sr": "세르비아어",
"sr_BA": "세르비아어(보스니아 헤르체고비나)",
"sr_Cyrl": "세르비아어(키릴 문자)",
"sr_Cyrl_BA": "세르비아어(키릴 문자, 보스니아 헤르체고비나)",
"sr_Cyrl_ME": "세르비아어(키릴 문자, 몬테네그로)",
"sr_Cyrl_RS": "세르비아어(키릴 문자, 세르비아)",
"sr_Cyrl_XK": "세르비아어(키릴 문자, 코소보)",
"sr_Latn": "세르비아어(로마자)",
"sr_Latn_BA": "세르비아어(로마자, 보스니아 헤르체고비나)",
"sr_Latn_ME": "세르비아어(로마자, 몬테네그로)",
"sr_Latn_RS": "세르비아어(로마자, 세르비아)",
"sr_Latn_XK": "세르비아어(로마자, 코소보)",
"sr_ME": "세르비아어(몬테네그로)",
"sr_RS": "세르비아어(세르비아)",
"sr_XK": "세르비아어(코소보)",
"sv": "스웨덴어",
"sv_AX": "스웨덴어(올란드 제도)",
"sv_FI": "스웨덴어(핀란드)",

View File

@ -508,12 +508,10 @@
"sr_Cyrl_BA": "ဆားဘီးယား (စစ်ရိလစ်၊ ဘော့စနီးယားနှင့် ဟာဇီဂိုဗီနား)",
"sr_Cyrl_ME": "ဆားဘီးယား (စစ်ရိလစ်၊ မွန်တီနိဂရိုး)",
"sr_Cyrl_RS": "ဆားဘီးယား (စစ်ရိလစ်၊ ဆားဘီးယား)",
"sr_Cyrl_XK": "ဆားဘီးယား (စစ်ရိလစ်၊ ကိုဆိုဗို)",
"sr_Latn": "ဆားဘီးယား (လက်တင်)",
"sr_Latn_BA": "ဆားဘီးယား (လက်တင်၊ ဘော့စနီးယားနှင့် ဟာဇီဂိုဗီနား)",
"sr_Latn_ME": "ဆားဘီးယား (လက်တင်၊ မွန်တီနိဂရိုး)",
"sr_Latn_RS": "ဆားဘီးယား (လက်တင်၊ ဆားဘီးယား)",
"sr_Latn_XK": "ဆားဘီးယား (လက်တင်၊ ကိုဆိုဗို)",
"sr_ME": "ဆားဘီးယား (မွန်တီနိဂရိုး)",
"sr_RS": "ဆားဘီးယား (ဆားဘီးယား)",
"sv": "ဆွီဒင်",

View File

@ -510,12 +510,10 @@
"sr_Cyrl_BA": "سېربچە (كىرىل، بوسىنىيە ۋە گېرتسېگوۋىنا)",
"sr_Cyrl_ME": "سېربچە (كىرىل، قارا تاغ)",
"sr_Cyrl_RS": "سېربچە (كىرىل، سېربىيە)",
"sr_Cyrl_XK": "سېربچە (كىرىل، كوسوۋو)",
"sr_Latn": "سېربچە (لاتىنچە)",
"sr_Latn_BA": "سېربچە (لاتىنچە، بوسىنىيە ۋە گېرتسېگوۋىنا)",
"sr_Latn_ME": "سېربچە (لاتىنچە، قارا تاغ)",
"sr_Latn_RS": "سېربچە (لاتىنچە، سېربىيە)",
"sr_Latn_XK": "سېربچە (لاتىنچە، كوسوۋو)",
"sr_ME": "سېربچە (قارا تاغ)",
"sr_RS": "سېربچە (سېربىيە)",
"sv": "شىۋېدچە",

View File

@ -510,12 +510,10 @@
"sr_Cyrl_BA": "سربین (سیریلک،بوسنیا اور ہرزیگووینا)",
"sr_Cyrl_ME": "سربین (سیریلک،مونٹے نیگرو)",
"sr_Cyrl_RS": "سربین (سیریلک،سربیا)",
"sr_Cyrl_XK": "سربین (سیریلک،کوسووو)",
"sr_Latn": "سربین (لاطینی)",
"sr_Latn_BA": "سربین (لاطینی،بوسنیا اور ہرزیگووینا)",
"sr_Latn_ME": "سربین (لاطینی،مونٹے نیگرو)",
"sr_Latn_RS": "سربین (لاطینی،سربیا)",
"sr_Latn_XK": "سربین (لاطینی،کوسووو)",
"sr_ME": "سربین (مونٹے نیگرو)",
"sr_RS": "سربین (سربیا)",
"sv": "سویڈش",

View File

@ -115,7 +115,6 @@
"en_CX": "英语(圣诞岛)",
"en_CY": "英语(塞浦路斯)",
"en_DE": "英语(德国)",
"en_DG": "英语(迪戈加西亚岛)",
"en_DK": "英语(丹麦)",
"en_DM": "英语(多米尼克)",
"en_ER": "英语(厄立特里亚)",
@ -208,13 +207,11 @@
"es_CR": "西班牙语(哥斯达黎加)",
"es_CU": "西班牙语(古巴)",
"es_DO": "西班牙语(多米尼加共和国)",
"es_EA": "西班牙语(休达及梅利利亚)",
"es_EC": "西班牙语(厄瓜多尔)",
"es_ES": "西班牙语(西班牙)",
"es_GQ": "西班牙语(赤道几内亚)",
"es_GT": "西班牙语(危地马拉)",
"es_HN": "西班牙语(洪都拉斯)",
"es_IC": "西班牙语(加纳利群岛)",
"es_MX": "西班牙语(墨西哥)",
"es_NI": "西班牙语(尼加拉瓜)",
"es_PA": "西班牙语(巴拿马)",
@ -507,14 +504,12 @@
"sq": "阿尔巴尼亚语",
"sq_AL": "阿尔巴尼亚语(阿尔巴尼亚)",
"sq_MK": "阿尔巴尼亚语(北马其顿)",
"sq_XK": "阿尔巴尼亚语(科索沃)",
"sr": "塞尔维亚语",
"sr_BA": "塞尔维亚语(波斯尼亚和黑塞哥维那)",
"sr_Cyrl": "塞尔维亚语(西里尔文)",
"sr_Cyrl_BA": "塞尔维亚语(西里尔文,波斯尼亚和黑塞哥维那)",
"sr_Cyrl_ME": "塞尔维亚语(西里尔文,黑山)",
"sr_Cyrl_RS": "塞尔维亚语(西里尔文,塞尔维亚)",
"sr_Cyrl_XK": "塞尔维亚语(西里尔文,科索沃)",
"sr_Latn": "塞尔维亚语(拉丁文)",
"sr_Latn_BA": "塞尔维亚语(拉丁文,波斯尼亚和黑塞哥维那)",
"sr_Latn_ME": "塞尔维亚语(拉丁文,黑山)",
@ -522,11 +517,8 @@
"sr_Latn_XK": "塞尔维亚语(拉丁文,科索沃)",
"sr_ME": "塞尔维亚语(黑山)",
"sr_RS": "塞尔维亚语(塞尔维亚)",
"sr_XK": "塞尔维亚语(科索沃)",
"sv": "瑞典语",
"sv_AX": "瑞典语(奥兰群岛)",
"sv_FI": "瑞典语(芬兰)",
"sv_SE": "瑞典语(瑞典)",
"sw": "斯瓦希里语",
"sw_CD": "斯瓦希里语(刚果(金))",
"sw_KE": "斯瓦希里语(肯尼亚)",

View File

@ -115,7 +115,6 @@
"en_CX": "英文(聖誕島)",
"en_CY": "英文(賽普勒斯)",
"en_DE": "英文(德國)",
"en_DG": "英文(迪亞哥加西亞島)",
"en_DK": "英文(丹麥)",
"en_DM": "英文(多米尼克)",
"en_ER": "英文(厄利垂亞)",
@ -208,13 +207,11 @@
"es_CR": "西班牙文(哥斯大黎加)",
"es_CU": "西班牙文(古巴)",
"es_DO": "西班牙文(多明尼加共和國)",
"es_EA": "西班牙文(休達與梅利利亞)",
"es_EC": "西班牙文(厄瓜多)",
"es_ES": "西班牙文(西班牙)",
"es_GQ": "西班牙文(赤道幾內亞)",
"es_GT": "西班牙文(瓜地馬拉)",
"es_HN": "西班牙文(宏都拉斯)",
"es_IC": "西班牙文(加那利群島)",
"es_MX": "西班牙文(墨西哥)",
"es_NI": "西班牙文(尼加拉瓜)",
"es_PA": "西班牙文(巴拿馬)",
@ -507,22 +504,18 @@
"sq": "阿爾巴尼亞文",
"sq_AL": "阿爾巴尼亞文(阿爾巴尼亞)",
"sq_MK": "阿爾巴尼亞文(北馬其頓)",
"sq_XK": "阿爾巴尼亞文(科索沃)",
"sr": "塞爾維亞文",
"sr_BA": "塞爾維亞文(波士尼亞與赫塞哥維納)",
"sr_Cyrl": "塞爾維亞文(斯拉夫文)",
"sr_Cyrl_BA": "塞爾維亞文(斯拉夫文,波士尼亞與赫塞哥維納)",
"sr_Cyrl_ME": "塞爾維亞文(斯拉夫文,蒙特內哥羅)",
"sr_Cyrl_RS": "塞爾維亞文(斯拉夫文,塞爾維亞)",
"sr_Cyrl_XK": "塞爾維亞文(斯拉夫文,科索沃)",
"sr_Latn": "塞爾維亞文(拉丁文)",
"sr_Latn_BA": "塞爾維亞文(拉丁文,波士尼亞與赫塞哥維納)",
"sr_Latn_ME": "塞爾維亞文(拉丁文,蒙特內哥羅)",
"sr_Latn_RS": "塞爾維亞文(拉丁文,塞爾維亞)",
"sr_Latn_XK": "塞爾維亞文(拉丁文,科索沃)",
"sr_ME": "塞爾維亞文(蒙特內哥羅)",
"sr_RS": "塞爾維亞文(塞爾維亞)",
"sr_XK": "塞爾維亞文(科索沃)",
"sv": "瑞典文",
"sv_AX": "瑞典文(奧蘭群島)",
"sv_FI": "瑞典文(芬蘭)",

View File

@ -185,12 +185,10 @@
"sr_Cyrl_BA": "塞爾維亞文(西里爾文,波斯尼亞和黑塞哥維那)",
"sr_Cyrl_ME": "塞爾維亞文(西里爾文,黑山)",
"sr_Cyrl_RS": "塞爾維亞文(西里爾文,塞爾維亞)",
"sr_Cyrl_XK": "塞爾維亞文(西里爾文,科索沃)",
"sr_Latn": "塞爾維亞文(拉丁字母)",
"sr_Latn_BA": "塞爾維亞文(拉丁字母,波斯尼亞和黑塞哥維那)",
"sr_Latn_ME": "塞爾維亞文(拉丁字母,黑山)",
"sr_Latn_RS": "塞爾維亞文(拉丁字母,塞爾維亞)",
"sr_Latn_XK": "塞爾維亞文(拉丁字母,科索沃)",
"sr_ME": "塞爾維亞文(黑山)",
"sw_KE": "史瓦希里文(肯尼亞)",
"sw_TZ": "史瓦希里文(坦桑尼亞)",