diff --git a/.travis.yml b/.travis.yml index bad1141e6833f..29e9da2cc5224 100644 --- a/.travis.yml +++ b/.travis.yml @@ -171,15 +171,15 @@ before_install: fi tfold ext.apcu tpecl apcu-5.1.17 apcu.so $INI - tfold ext.mongodb tpecl mongodb-1.6.0alpha1 mongodb.so $INI - tfold ext.igbinary tpecl igbinary-2.0.8 igbinary.so $INI + tfold ext.mongodb tpecl mongodb-1.6.0 mongodb.so $INI + tfold ext.igbinary tpecl igbinary-3.1.2 igbinary.so $INI tfold ext.zookeeper tpecl zookeeper-0.7.1 zookeeper.so $INI tfold ext.amqp tpecl amqp-1.9.4 amqp.so $INI tfold ext.redis tpecl redis-4.3.0 redis.so $INI "no" done - | # List all php extensions with versions - - php -r 'foreach (get_loaded_extensions() as $extension) echo $extension . " " . phpversion($extension) . PHP_EOL;' + php -r 'foreach (get_loaded_extensions() as $extension) echo $extension . " " . phpversion($extension) . PHP_EOL;' - | # Load fixtures @@ -277,7 +277,7 @@ install: return fi phpenv global $PHP - ([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb) + ([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb ~1.5.0) tfold 'composer update' $COMPOSER_UP tfold 'phpunit install' ./phpunit install if [[ $deps = high ]]; then diff --git a/CHANGELOG-4.3.md b/CHANGELOG-4.3.md index 3695556e82fad..9c95e7e327a31 100644 --- a/CHANGELOG-4.3.md +++ b/CHANGELOG-4.3.md @@ -7,6 +7,84 @@ in 4.3 minor versions. To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v4.3.0...v4.3.1 +* 4.3.10 (2020-01-21) + + * bug #35364 [Yaml] Throw on unquoted exclamation mark (fancyweb) + * bug #35065 [Security] Use supportsClass in addition to UnsupportedUserException (linaori) + * bug #35343 [Security] Fix RememberMe with null password (jderusse) + * bug #34223 [DI] Suggest typed argument when binding fails with untyped argument (gudfar) + * bug #35324 [HttpClient] Fix strict parsing of response status codes (Armando-Walmeric) + * bug #35318 [Yaml] fix PHP const mapping keys using the inline notation (xabbuh) + * bug #35304 [HttpKernel] Fix that no-cache MUST revalidate with the origin (mpdude) + * bug #35299 Avoid `stale-if-error` in FrameworkBundle's HttpCache if kernel.debug = true (mpdude) + * bug #35151 [DI] deferred exceptions in ResolveParameterPlaceHoldersPass (Islam93) + * bug #35278 [EventDispatcher] expand listener in place (xabbuh) + * bug #35254 [PHPUnit-Bridge] Fail-fast in simple-phpunit if one of the passthru() commands fails (mpdude) + * bug #35261 [Routing] Fix using a custom matcher & generator dumper class (fancyweb) + * bug #34643 [Dotenv] Fixed infinite loop with missing quote followed by quoted value (naitsirch) + * bug #35239 [Security\Http] Prevent canceled remember-me cookie from being accepted (chalasr) + * bug #35267 [Debug] fix ClassNotFoundFatalErrorHandler (nicolas-grekas) + * bug #35193 [TwigBridge] button_widget now has its title attr translated even if its label = null or false (stephen-lewis) + * bug #35219 [PhpUnitBridge] When using phpenv + phpenv-composer plugin, composer executable is wrapped into a bash script (oleg-andreyev) + * bug #35150 [Messenger] Added check if json_encode succeeded (toooni) + * bug #35170 [FrameworkBundle][TranslationUpdateCommand] Do not output positive feedback on stderr (fancyweb) + * bug #35223 [HttpClient] Don't read from the network faster than the CPU can deal with (nicolas-grekas) + * bug #35214 [DI] DecoratorServicePass should keep container.service_locator on the decorated definition (malarzm) + * bug #35210 [HttpClient] NativeHttpClient should not send >1.1 protocol version (nicolas-grekas) + * bug #33672 [Mailer] Remove line breaks in email attachment content (Stuart Fyfe) + * bug #35101 [Routing] Fix i18n routing when the url contains the locale (fancyweb) + * bug #35124 [TwigBridge][Form] Added missing help messages in form themes (cmen) + * bug #35168 [HttpClient] fix capturing SSL certificates with NativeHttpClient (nicolas-grekas) + * bug #35134 [PropertyInfo] Fix BC issue in phpDoc Reflection library (jaapio) + * bug #35173 [Mailer][MailchimpBridge] Fix missing attachments when sending via Mandrill API (vilius-g) + * bug #35172 [Mailer][MailchimpBridge] Fix incorrect sender address when sender has name (vilius-g) + * bug #35125 [Translator] fix performance issue in MessageCatalogue and catalogue operations (ArtemBrovko) + * bug #35120 [HttpClient] fix scheduling pending NativeResponse (nicolas-grekas) + * bug #35117 [Cache] do not overwrite variable value (xabbuh) + * bug #35113 [VarDumper] Fix "Undefined index: argv" when using CliContextProvider (xepozz) + * bug #35103 [Translation] Use `locale_parse` for computing fallback locales (alanpoulain) + * bug #35094 [Console] Fix filtering out identical alternatives when there is a command loader (fancyweb) + * bug #35039 [DI] skip looking for config class when the extension class is anonymous (nicolas-grekas) + * bug #35049 [ProxyManager] fix generating proxies for root-namespaced classes (nicolas-grekas) + * bug #35022 [Dotenv] FIX missing getenv (mccullagh) + * bug #35025 [HttpClient][Psr18Client] Remove Psr18ExceptionTrait (fancyweb) + * bug #35014 [HttpClient] make pushed responses retry-able (nicolas-grekas) + * bug #35010 [VarDumper] ignore failing __debugInfo() (nicolas-grekas) + * bug #34998 [DI] fix auto-binding service providers to their service subscribers (nicolas-grekas) + * bug #33670 [DI] Service locators can't be decorated (malarzm) + * bug #35000 [Console][SymfonyQuestionHelper] Handle multibytes question choices keys and custom prompt (fancyweb) + * bug #34996 Fix displaying anonymous classes on PHP 7.4 (nicolas-grekas) + * bug #29839 [Validator] fix comparisons with null values at property paths (xabbuh) + * bug #34900 [DoctrineBridge] Fixed submitting invalid ids when using queries with limit (HeahDude) + * bug #34791 [Serializer] Skip uninitialized (PHP 7.4) properties in PropertyNormalizer and ObjectNormalizer (vudaltsov) + * bug #34956 [Messenger][AMQP] Use delivery_mode=2 by default (lyrixx) + * bug #34915 [FrameworkBundle] Fix invalid Windows path normalization in TemplateNameParser (mvorisek) + * bug #34981 stop using deprecated Doctrine persistence classes (xabbuh) + * bug #34904 [Validator][ConstraintValidator] Safe fail on invalid timezones (fancyweb) + * bug #34955 Require doctrine/persistence ^1.3 (nicolas-grekas) + * bug #34923 [DI] Fix support for immutable setters in CallTrait (Lctrs) + * bug #34918 [Translation] fix memoryleak in PhpFileLoader (nicolas-grekas) + * bug #34920 [Routing] fix memoryleak when loading compiled routes (nicolas-grekas) + * bug #34787 [Cache] Propagate expiry when syncing items in ChainAdapter (trvrnrth) + * bug #34896 [Cache] fix memory leak when using PhpFilesAdapter (nicolas-grekas) + * bug #34438 [HttpFoundation] Use `Cache-Control: must-revalidate` only if explicit lifetime has been given (mpdude) + * bug #34449 [Yaml] Implement multiline string as scalar block for tagged values (natepage) + * bug #34601 [MonologBridge] Fix debug processor datetime type (mRoca) + * bug #34842 [ExpressionLanguage] Process division by zero (tigr1991) + * bug #34902 [PropertyAccess] forward caught exception (xabbuh) + * bug #34888 [TwigBundle] add tags before processing them (xabbuh) + * bug #34762 [Config] never try loading failed classes twice with ClassExistenceResource (nicolas-grekas) + * bug #34839 [Cache] fix memory leak when using PhpArrayAdapter (nicolas-grekas) + * bug #34812 [Yaml] fix parsing negative octal numbers (xabbuh) + * bug #34854 [Messenger] gracefully handle missing event dispatchers (xabbuh) + * bug #34788 [SecurityBundle] Properly escape regex in AddSessionDomainConstraintPass (fancyweb) + * bug #34755 [FrameworkBundle] resolve service locators in `debug:*` commands (nicolas-grekas) + * bug #34832 [Validator] Allow underscore character "_" in URL username and password (romainneutron) + * bug #34776 [DI] fix resolving bindings for named TypedReference (nicolas-grekas) + * bug #34738 [SecurityBundle] Passwords are not encoded when algorithm set to "true" (nieuwenhuisen) + * bug #34779 [Security] do not validate passwords when the hash is null (xabbuh) + * bug #34757 [DI] Fix making the container path-independent when the app is in /app (nicolas-grekas) + * 4.3.9 (2019-12-01) * bug #34649 more robust initialization from request (dbu) diff --git a/CHANGELOG-4.4.md b/CHANGELOG-4.4.md index ada0c8529e0f5..e5f07b9d13dab 100644 --- a/CHANGELOG-4.4.md +++ b/CHANGELOG-4.4.md @@ -7,6 +7,24 @@ in 4.4 minor versions. To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v4.4.0...v4.4.1 +* 4.4.4 (2020-01-31) + + * bug #35530 [HttpClient] Fix regex bearer (noniagriconomie) + * bug #35532 [Validator] fix access to uninitialized property when getting value (greedyivan) + * bug #35486 [Translator] Default value for 'sort' option in translation:update should be 'asc' (versgui) + * bug #35305 [HttpKernel] Fix stale-if-error behavior, add tests (mpdude) + * bug #34808 [PhpUnitBridge] Properly handle phpunit arguments for configuration file (biozshock) + * bug #35517 [Intl] Provide more locale translations (ro0NL) + * bug #35518 [Mailer] Fix STARTTLS support for Postmark and Mandrill (fabpot) + * bug #35480 [Messenger] Check for all serialization exceptions during message dec… (Patrick Berenschot) + * bug #35502 [Messenger] Fix bug when using single route with XML config (Nyholm) + * bug #35438 [SecurityBundle] fix ldap_bind service arguments (Ioni14) + * bug #35429 [DI] CheckTypeDeclarationsPass now checks if value is type of parameter type (pfazzi) + * bug #35464 [ErrorHandler] Add debug argument to decide whether debug page is shown or not (yceruto) + * bug #35423 Fixes a runtime error when accessing the cache panel (DamienHarper) + * bug #35428 [Cache] fix checking for igbinary availability (nicolas-grekas) + * bug #35424 [HttpKernel] Check if lock can be released (sjadema) + * 4.4.3 (2020-01-21) * bug #35364 [Yaml] Throw on unquoted exclamation mark (fancyweb) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 9a6707977b3ec..aea14fb7e6c5d 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -16,8 +16,8 @@ Symfony is the result of the work of many people who made the code better - Victor Berchet (victor) - Maxime Steinhausser (ogizanagi) - Ryan Weaver (weaverryan) - - Jakub Zalas (jakubzalas) - Javier Eguiluz (javier.eguiluz) + - Jakub Zalas (jakubzalas) - Roland Franssen (ro0) - Grégoire Pineau (lyrixx) - Johannes S (johannes) @@ -32,16 +32,16 @@ Symfony is the result of the work of many people who made the code better - Joseph Bielawski (stloyd) - Alexander M. Turek (derrabus) - Karma Dordrak (drak) + - Thomas Calvet (fancyweb) - Lukas Kahwe Smith (lsmith) - Martin Hasoň (hason) - Hamza Amrouche (simperfit) - Jeremy Mikola (jmikola) - Jules Pietri (heah) - Jean-François Simon (jfsimon) + - Jérémy DERUSSÉ (jderusse) - Benjamin Eberlei (beberlei) - Igor Wiedler (igorw) - - Jérémy DERUSSÉ (jderusse) - - Thomas Calvet (fancyweb) - Eriksen Costa (eriksencosta) - Guilhem Niot (energetick) - Sarah Khalil (saro0h) @@ -51,13 +51,13 @@ Symfony is the result of the work of many people who made the code better - Diego Saint Esteben (dosten) - Alexandre Salomé (alexandresalome) - William Durand (couac) - - ornicar + - Matthias Pigulla (mpdude) - Pierre du Plessis (pierredup) + - ornicar - Dany Maillard (maidmaid) - Francis Besset (francisbesset) - stealth35 ‏ (stealth35) - Alexander Mols (asm89) - - Matthias Pigulla (mpdude) - Konstantin Myakshin (koc) - Bulat Shakirzyanov (avalanche123) - Valentin Udaltsov (vudaltsov) @@ -81,12 +81,12 @@ Symfony is the result of the work of many people who made the code better - Andrej Hudec (pulzarraider) - Michel Weimerskirch (mweimerskirch) - Issei Murasawa (issei_m) + - Jan Schädlich (jschaedl) - Eric Clemmons (ericclemmons) - Charles Sarrazin (csarrazi) - - Jan Schädlich (jschaedl) - Christian Raue - - Arnout Boks (aboks) - Douglas Greenshields (shieldo) + - Arnout Boks (aboks) - Deni - Henrik Westphal (snc) - Dariusz Górecki (canni) @@ -130,9 +130,9 @@ Symfony is the result of the work of many people who made the code better - Joshua Thijssen - Alex Pott - Daniel Wehner (dawehner) + - Tugdual Saunier (tucksaun) - excelwebzone - Gordon Franke (gimler) - - Tugdual Saunier (tucksaun) - Fabien Pennequin (fabienpennequin) - Théo FIDRY (theofidry) - Eric GELOEN (gelo) @@ -154,6 +154,7 @@ Symfony is the result of the work of many people who made the code better - Daniel Gomes (danielcsgomes) - Hidenori Goto (hidenorigoto) - Andréia Bohner (andreia) + - Yanick Witschi (toflar) - Julien Falque (julienfalque) - Arnaud Kleinpeter (nanocom) - Guilherme Blanco (guilhermeblanco) @@ -168,7 +169,6 @@ Symfony is the result of the work of many people who made the code better - jwdeitch - Mikael Pajunen - Alessandro Chitolina (alekitto) - - Yanick Witschi (toflar) - Niels Keurentjes (curry684) - Vyacheslav Pavlov - Richard van Laak (rvanlaak) @@ -177,8 +177,10 @@ Symfony is the result of the work of many people who made the code better - Vincent Touzet (vincenttouzet) - jeremyFreeAgent (jeremyfreeagent) - Rouven Weßling (realityking) + - Jérôme Parmentier (lctrs) - Clemens Tolboom - Helmer Aaviksoo + - Arman Hosseini (arman) - Hiromi Hishida (77web) - Matthieu Ouellette-Vachon (maoueh) - Michał Pipa (michal.pipa) @@ -190,11 +192,11 @@ Symfony is the result of the work of many people who made the code better - Tyson Andre - GDIBass - Samuel NELA (snela) - - Jérôme Parmentier (lctrs) + - Ben Davies (bendavies) + - Andreas Schempp (aschempp) - James Halsall (jaitsu) - Matthieu Napoli (mnapoli) - Florent Mata (fmata) - - Arman Hosseini - Warnar Boekkooi (boekkooi) - Dmitrii Chekaliuk (lazyhammer) - Clément JOBEILI (dator) @@ -211,7 +213,6 @@ Symfony is the result of the work of many people who made the code better - DQNEO - Andre Rømcke (andrerom) - mcfedr (mcfedr) - - Ben Davies (bendavies) - Gary PEGEOT (gary-p) - Ruben Gonzalez (rubenrua) - Benjamin Dulau (dbenjamin) @@ -221,6 +222,7 @@ Symfony is the result of the work of many people who made the code better - Andreas Hucks (meandmymonkey) - Tom Van Looy (tvlooy) - Noel Guilbert (noel) + - Anthony GRASSIOT (antograssiot) - Stadly - Stepan Anchugov (kix) - bronze1man @@ -243,21 +245,24 @@ Symfony is the result of the work of many people who made the code better - Dustin Whittle (dustinwhittle) - jeff - John Kary (johnkary) - - Andreas Schempp (aschempp) + - Jan Rosier (rosier) - Justin Hileman (bobthecow) - Blanchon Vincent (blanchonvincent) - Michele Orselli (orso) - Sven Paulus (subsven) - Maxime Veber (nek-) - - Anthony GRASSIOT (antograssiot) - Rui Marinho (ruimarinho) - Eugene Wissner + - Edi Modrić (emodric) - Pascal Montoya - Julien Brochet (mewt) - Leo Feyer - Tristan Darricau (nicofuma) - Victor Bocharsky (bocharsky_bw) + - Tomas Norkūnas (norkunas) - Marcel Beerta (mazen) + - Ruud Kamphuis (ruudk) + - Antoine Makdessi (amakdessi) - Maxime Helias (maxhelias) - Pavel Batanov (scaytrase) - Mantis Development @@ -271,6 +276,7 @@ Symfony is the result of the work of many people who made the code better - Lorenz Schori - Sébastien Lavoie (lavoiesl) - Dariusz + - Dmitrii Poddubnyi (karser) - Michael Babker (mbabker) - Francois Zaninotto - Alexander Kotynia (olden) @@ -279,11 +285,13 @@ Symfony is the result of the work of many people who made the code better - Marcos Sánchez - Elnur Abdurrakhimov (elnur) - Manuel Reinhard (sprain) + - Tien Vo (tienvx) - Danny Berger (dpb587) - Antonio J. García Lagar (ajgarlag) - Adam Prager (padam87) - Przemysław Bogusz (przemyslaw-bogusz) - Benoît Burnichon (bburnichon) + - Maciej Malarz (malarzm) - Roman Marintšenko (inori) - Xavier Montaña Carreras (xmontana) - Rémon van de Kamp (rpkamp) @@ -299,14 +307,12 @@ Symfony is the result of the work of many people who made the code better - Jordan Samouh (jordansamouh) - Baptiste Lafontaine (magnetik) - Jakub Kucharovic (jkucharovic) - - Edi Modrić (emodric) - Uwe Jäger (uwej711) - Eugene Leonovich (rybakit) - Filippo Tessarotto - Joseph Rouff (rouffj) - Félix Labrecque (woodspire) - GordonsLondon - - Tomas Norkūnas (norkunas) - Quynh Xuan Nguyen (xuanquynh) - Jan Sorgalla (jsor) - Ray @@ -314,7 +320,6 @@ Symfony is the result of the work of many people who made the code better - Chekote - François Pluchino (francoispluchino) - Christopher Hertel (chertel) - - Antoine Makdessi (amakdessi) - Thomas Adam - Jhonny Lidfors (jhonne) - Diego Agulló (aeoris) @@ -335,7 +340,6 @@ Symfony is the result of the work of many people who made the code better - Zan Baldwin (zanderbaldwin) - Roumen Damianoff (roumen) - Kim Hemsø Rasmussen (kimhemsoe) - - Dmitrii Poddubnyi (karser) - Pascal Luna (skalpa) - Wouter Van Hecke - Peter Kruithof (pkruithof) @@ -348,6 +352,7 @@ Symfony is the result of the work of many people who made the code better - Christian Schmidt - Patrick Landolt (scube) - MatTheCat + - Loick Piera (pyrech) - David Badura (davidbadura) - Chad Sikorra (chadsikorra) - Chris Smith (cs278) @@ -368,7 +373,6 @@ Symfony is the result of the work of many people who made the code better - Jerzy Zawadzki (jzawadzki) - Wouter J - Ismael Ambrosi (iambrosi) - - Ruud Kamphuis (ruudk) - Emmanuel BORGES (eborges78) - Aurelijus Valeiša (aurelijus) - Jan Decavele (jandc) @@ -390,6 +394,7 @@ Symfony is the result of the work of many people who made the code better - Thierry Thuon (lepiaf) - Ricard Clau (ricardclau) - Mark Challoner (markchalloner) + - Philippe Segatori - Gennady Telegin (gtelegin) - Erin Millard - Artur Melo (restless) @@ -398,12 +403,12 @@ Symfony is the result of the work of many people who made the code better - Thomas Royer (cydonia7) - Nicolas LEFEVRE (nicoweb) - alquerci + - Olivier Dolbeau (odolbeau) - Mateusz Sip (mateusz_sip) - Francesco Levorato - Vitaliy Zakharov (zakharovvi) - Tobias Sjösten (tobiassjosten) - Gyula Sallai (salla) - - Maciej Malarz (malarzm) - Inal DJAFAR (inalgnu) - Christian Gärtner (dagardner) - Dmytro Borysovskyi (dmytr0) @@ -415,13 +420,14 @@ Symfony is the result of the work of many people who made the code better - Felix Labrecque - Yaroslav Kiliba - Terje Bråten - - Tien Vo (tienvx) - Robbert Klarenbeek (robbertkl) - Eric Masoero (eric-masoero) - JhonnyL - hossein zolfi (ocean) - Clément Gautier (clementgautier) + - Bastien Jaillot (bastnic) - Dāvis Zālītis (k0d3r1s) + - Emanuele Panzeri (thepanz) - Sanpi - Eduardo Gulias (egulias) - giulio de donato (liuggio) @@ -437,6 +443,7 @@ Symfony is the result of the work of many people who made the code better - Alex Bowers - Philipp Cordes - Costin Bereveanu (schniper) + - Vilius Grigaliūnas - Loïc Chardonnet (gnusat) - Marek Kalnik (marekkalnik) - Vyacheslav Salakhutdinov (megazoll) @@ -446,9 +453,11 @@ Symfony is the result of the work of many people who made the code better - Michele Locati - Pavel Volokitin (pvolok) - Valentine Boineau (valentineboineau) + - Benjamin Leveque (benji07) - Arthur de Moulins (4rthem) - Matthias Althaus (althaus) - Nicolas Dewez (nicolas_dewez) + - Saif Eddin G - Endre Fejes - Tobias Naumann (tna) - Daniel Beyer @@ -461,7 +470,6 @@ Symfony is the result of the work of many people who made the code better - Lee Rowlands - Krzysztof Piasecki (krzysztek) - Maximilian Reichel (phramz) - - Loick Piera (pyrech) - Alain Hippolyte (aloneh) - Grenier Kévin (mcsky_biig) - Karoly Negyesi (chx) @@ -484,6 +492,7 @@ Symfony is the result of the work of many people who made the code better - Sébastien Santoro (dereckson) - Brian King - Michel Salib (michelsalib) + - Chris Tanaskoski - geoffrey - Steffen Roßkamp - Alexandru Furculita (afurculita) @@ -494,6 +503,7 @@ Symfony is the result of the work of many people who made the code better - Christopher Davis (chrisguitarguy) - Webnet team (webnet) - Farhad Safarov + - Jeroen Spee (jeroens) - Jan Schumann - Niklas Fiekas - Markus Bachmann (baachi) @@ -502,8 +512,7 @@ Symfony is the result of the work of many people who made the code better - Mihai Stancu - Ivan Nikolaev (destillat) - Gildas Quéméner (gquemener) - - Olivier Dolbeau (odolbeau) - - Jan Rosier (rosier) + - Oleg Andreyev - Alessandro Lai (jean85) - Desjardins Jérôme (jewome62) - Arturs Vonda @@ -543,7 +552,7 @@ Symfony is the result of the work of many people who made the code better - Gintautas Miselis - Rob Bast - Roberto Espinoza (respinoza) - - Emanuele Panzeri (thepanz) + - Alan Poulain - Soufian EZ-ZANTAR (soezz) - Zander Baldwin - Gocha Ossinkine (ossinkine) @@ -602,7 +611,6 @@ Symfony is the result of the work of many people who made the code better - Jakub Škvára (jskvara) - Andrew Udvare (audvare) - alexpods - - Saif Eddin G - Johann Pardanaud - Adam Szaraniec (mimol) - Dariusz Ruminski @@ -620,7 +628,6 @@ Symfony is the result of the work of many people who made the code better - Nils Adermann (naderman) - Gábor Fási - DUPUCH (bdupuch) - - Benjamin Leveque (benji07) - Nate (frickenate) - Timothée Barray (tyx) - jhonnyL @@ -661,20 +668,22 @@ Symfony is the result of the work of many people who made the code better - Disquedur - Michiel Boeckaert (milio) - Geoffrey Tran (geoff) + - Pablo Lozano (arkadis) - Kyle - Jan Behrens - Mantas Var (mvar) - - Chris Tanaskoski - Terje Bråten - Sebastian Krebs - Piotr Stankowski - Baptiste Leduc (bleduc) - Julien Maulny + - Sebastien Morel (plopix) - Jean-Christophe Cuvelier [Artack] - Julien Montel (julienmgel) - - Philippe Segatori - Simon DELICATA + - Artem Henvald (artemgenvald) - Dmitry Simushev + - Joe Bennett (kralos) - alcaeus - Fred Cox - vitaliytv @@ -690,7 +699,6 @@ Symfony is the result of the work of many people who made the code better - Kyle Evans (kevans91) - Charles-Henri Bruyand - Max Rath (drak3) - - Oleg Andreyev - Stéphane Escandell (sescandell) - Konstantin S. M. Möllers (ksmmoellers) - James Johnston @@ -754,6 +762,7 @@ Symfony is the result of the work of many people who made the code better - M. Vondano - Quentin de Longraye (quentinus95) - Chris Heng (gigablah) + - Islam93 - Shaun Simmons (simshaun) - Richard Bradley - Ulumuddin Yunus (joenoez) @@ -766,6 +775,7 @@ Symfony is the result of the work of many people who made the code better - Antoine Corcy - Ahmed Ashraf (ahmedash95) - Sascha Grossenbacher + - Alexander Menshchikov (zmey_kk) - Szijarto Tamas - Robin Lehrmann (robinlehrmann) - Catalin Dan @@ -818,7 +828,6 @@ Symfony is the result of the work of many people who made the code better - Michael Piecko - Toni Peric (tperic) - yclian - - Alan Poulain - Aleksey Prilipko - Andrew Berry - twifty @@ -830,11 +839,11 @@ Symfony is the result of the work of many people who made the code better - Dominik Ritter (dritter) - Dimitri Gritsajuk (ottaviano) - Sebastian Grodzicki (sgrodzicki) + - Mohamed Gamal - Jeroen van den Enden (stoefke) - Pascal Helfenstein - Baldur Rensch (brensch) - Pierre Rineau - - Vilius Grigaliūnas - Vladyslav Petrovych - Alex Xandra Albert Sim - Carson Full @@ -843,6 +852,7 @@ Symfony is the result of the work of many people who made the code better - Yuen-Chi Lian - Tarjei Huse (tarjei) - Besnik Br + - Toni Rudolf (toooni) - Jose Gonzalez - Jonathan (jls-esokia) - Oleksii Zhurbytskyi @@ -851,6 +861,7 @@ Symfony is the result of the work of many people who made the code better - Claudio Zizza - Dave Marshall (davedevelopment) - Jakub Kulhan (jakubkulhan) + - Shaharia Azam - avorobiev - Grégoire Penverne (gpenverne) - Venu @@ -896,6 +907,7 @@ Symfony is the result of the work of many people who made the code better - Franco Traversaro (belinde) - Francis Turmel (fturmel) - Nikita Nefedov (nikita2206) + - Alex Bacart - cgonzalez - Ben - Vincent Composieux (eko) @@ -919,6 +931,7 @@ Symfony is the result of the work of many people who made the code better - Reen Lokum - Andreas Möller (localheinz) - Martin Parsiegla (spea) + - Ivan - Quentin Schuler - Pierre Vanliefland (pvanliefland) - Roy Klutman (royklutman) @@ -969,6 +982,7 @@ Symfony is the result of the work of many people who made the code better - Derek ROTH - Ben Johnson - mweimerskirch + - Lctrs - Dmytro Boiko (eagle) - Shin Ohno (ganchiku) - Geert De Deckere (geertdd) @@ -1009,6 +1023,7 @@ Symfony is the result of the work of many people who made the code better - Marcos Gómez Vilches (markitosgv) - Matthew Davis (mdavis1982) - Markus S. (staabm) + - Guilliam Xavier - Maks - Antoine LA - den @@ -1030,14 +1045,12 @@ Symfony is the result of the work of many people who made the code better - Benoît Merlet (trompette) - Koen Kuipers - datibbaw - - Pablo Lozano (arkadis) - Erik Saunier (snickers) - Rootie - Daniel Alejandro Castro Arellano (lexcast) - sensio - Thomas Jarrand - Antoine Bluchet (soyuka) - - Sebastien Morel (plopix) - Patrick Kaufmann - Anton Dyshkant - Reece Fowell (reecefowell) @@ -1152,6 +1165,7 @@ Symfony is the result of the work of many people who made the code better - AKeeman (akeeman) - Mert Simsek (mrtsmsk0) - Lin Clark + - Meneses (c77men) - Jeremy David (jeremy.david) - Jordi Rejas - Troy McCabe @@ -1185,6 +1199,7 @@ Symfony is the result of the work of many people who made the code better - HypeMC - jfcixmedia - Dominic Tubach + - Nicolas Philippe (nikophil) - Nikita Konstantinov - Martijn Evers - Vitaliy Ryaboy (vitaliy) @@ -1241,7 +1256,9 @@ Symfony is the result of the work of many people who made the code better - e-ivanov - Michał (bambucha15) - Einenlum + - Jérémy Jarrié (gagnar) - Jochen Bayer (jocl) + - Michel Roca (mroca) - Patrick Carlo-Hickman - Bruno MATEU - Jeremy Bush @@ -1274,14 +1291,17 @@ Symfony is the result of the work of many people who made the code better - rchoquet - gitlost - Taras Girnyk + - Rémi Leclerc - Jan Vernarsky - Amine Yakoubi - Eduardo García Sanz (coma) - Sergio (deverad) - James Gilliland - fduch (fduch) + - Stuart Fyfe - David de Boer (ddeboer) - Eno Mullaraj (emullaraj) + - Nathan PAGE (nathix) - Ryan Rogers - Klaus Purer - arnaud (arnooo999) @@ -1404,6 +1424,7 @@ Symfony is the result of the work of many people who made the code better - Walter Dal Mut (wdalmut) - abluchet - Ruud Arentsen + - Ahmed Raafat - Harald Tollefsen - Matthieu - Albin Kerouaton @@ -1431,6 +1452,7 @@ Symfony is the result of the work of many people who made the code better - Constantine Shtompel - Jules Lamur - Renato Mendes Figueiredo + - Benjamin RICHARD - pdommelen - Eric Stern - ShiraNai7 @@ -1453,8 +1475,9 @@ Symfony is the result of the work of many people who made the code better - m.chwedziak - Andreas Frömer - Philip Frank + - David Brooks - Lance McNearney - - Jeroen Spee (jeroens) + - Guillaume Verstraete - Giorgio Premi - ncou - Ian Carroll @@ -1466,7 +1489,6 @@ Symfony is the result of the work of many people who made the code better - Tom Corrigan (tomcorrigan) - Luis Galeas - Martin Pärtel - - Bastien Jaillot (bastnic) - Daniel Rotter (danrot) - Frédéric Bouchery (fbouchery) - Patrick Daley (padrig) @@ -1475,7 +1497,6 @@ Symfony is the result of the work of many people who made the code better - WedgeSama - Felds Liscia - Chihiro Adachi (chihiro-adachi) - - Alex Bacart - Raphaëll Roussel - Tadcka - Beth Binkovitz @@ -1504,6 +1525,7 @@ Symfony is the result of the work of many people who made the code better - Mathieu Morlon - Daniel Tschinder - Arnaud CHASSEUX + - tuqqu - Wojciech Gorczyca - Rafał Muszyński (rafmus90) - Sébastien Decrême (sebdec) @@ -1563,8 +1585,10 @@ Symfony is the result of the work of many people who made the code better - Patrik Gmitter (patie) - Peter Schultz - Jonathan Gough + - Benhssaein Youssef - Benjamin Bender - Jared Farrish + - Trevor North - karl.rixon - raplider - Konrad Mohrfeldt @@ -1636,6 +1660,7 @@ Symfony is the result of the work of many people who made the code better - Francisco Facioni (fran6co) - Stanislav Gamayunov (happyproff) - Iwan van Staveren (istaveren) + - Alexander McCullagh (mccullagh) - Povilas S. (povilas) - Laurent Negre (raulnet) - Evrard Boulou @@ -1772,6 +1797,7 @@ Symfony is the result of the work of many people who made the code better - JakeFr - Simon Sargeant - efeen + - Jan Christoph Beyer - Nicolas Pion - Muhammed Akbulut - Roy-Orbison @@ -1785,6 +1811,7 @@ Symfony is the result of the work of many people who made the code better - Johannes Müller (johmue) - Jordi Llonch (jordillonch) - Nicholas Ruunu (nicholasruunu) + - Jeroen van den Nieuwenhuisen (nieuwenhuisen) - Cyril Pascal (paxal) - Cédric Dugat (ph3nol) - Philip Dahlstrøm (phidah) @@ -1825,10 +1852,10 @@ Symfony is the result of the work of many people who made the code better - Dmitry Korotovsky - mcorteel - Michael van Tricht - - Ivan - ReScO - Tim Strehle - Sam Ward + - Michael Voříšek - Walther Lalk - Adam - Ivo @@ -1840,7 +1867,6 @@ Symfony is the result of the work of many people who made the code better - gedrox - Bohan Yang - Alan Bondarchuk - - Joe Bennett - dropfen - Andrey Chernykh - Edvinas Klovas @@ -1858,6 +1884,7 @@ Symfony is the result of the work of many people who made the code better - thib92 - Rudolf Ratusiński - Bertalan Attila + - Rafael Tovar - Amin Hosseini (aminh) - AmsTaFF (amstaff) - Simon Müller (boscho) @@ -1872,10 +1899,13 @@ Symfony is the result of the work of many people who made the code better - Jan Marek (janmarek) - Mark de Haan (markdehaan) - Dan Patrick (mdpatrick) + - naitsirch (naitsirch) - Geoffrey Monte (numerogeek) + - Martijn Boers (plebian) - Pedro Magalhães (pmmaga) - Rares Vlaseanu (raresvla) - tante kinast (tante) + - Stephen Lewis (tehanomalousone) - Ahmed Hannachi (tiecoders) - Vincent LEFORT (vlefort) - Walid BOUGHDIRI (walidboughdiri) @@ -1982,7 +2012,6 @@ Symfony is the result of the work of many people who made the code better - Klaas Naaijkens - Daniel González Cerviño - Rafał - - Lctrs - Achilles Kaloeridis (achilles) - Adria Lopez (adlpz) - Aaron Scherer (aequasi) @@ -1993,8 +2022,10 @@ Symfony is the result of the work of many people who made the code better - Masao Maeda (brtriver) - Darius Leskauskas (darles) - david perez (davidpv) + - Daniël Brekelmans (dbrekelmans) - David Joos (djoos) - Denis Klementjev (dklementjev) + - Dominik Pesch (dombn) - Dominik Hajduk (dominikalp) - Tomáš Polívka (draczris) - Dennis Smink (dsmink) @@ -2005,6 +2036,7 @@ Symfony is the result of the work of many people who made the code better - Gusakov Nikita (hell0w0rd) - Yannick Ihmels (ihmels) - Osman Üngür (import) + - Jaap van Otterdijk (jaapio) - Javier Núñez Berrocoso (javiernuber) - Jelle Bekker (jbekker) - Giovanni Albero (johntree) @@ -2021,6 +2053,7 @@ Symfony is the result of the work of many people who made the code better - Marek Šimeček (mssimi) - Dmitriy Tkachenko (neka) - Cayetano Soriano Gallego (neoshadybeat) + - Artem (nexim) - Olivier Laviale (olvlvl) - Ondrej Machulda (ondram) - Pierre Gasté (pierre_g) @@ -2036,6 +2069,7 @@ Symfony is the result of the work of many people who made the code better - Angel Fernando Quiroz Campos - Ondrej Mirtes - akimsko + - Stefan Kruppa - Youpie - srsbiz - Taylan Kasap @@ -2075,6 +2109,7 @@ Symfony is the result of the work of many people who made the code better - Till Klampaeckel (till) - Tobias Weinert (tweini) - Ulf Reimers (ureimers) + - Morten Wulff (wulff) - Wotre - goohib - Tom Counsell @@ -2095,7 +2130,6 @@ Symfony is the result of the work of many people who made the code better - Benjamin Morel - Eric Grimois - Piers Warmers - - Guilliam Xavier - Sylvain Lorinet - klyk50 - Andreas Lutro @@ -2235,10 +2269,12 @@ Symfony is the result of the work of many people who made the code better - Oussama Elgoumri - Dawid Nowak - Lesnykh Ilia + - sabruss - darnel - Karolis Daužickas - Nicolas - Sergio Santoro + - Dmitriy Derepko - tirnanog06 - phc - Дмитрий Пацура @@ -2283,6 +2319,7 @@ Symfony is the result of the work of many people who made the code better - Carsten Eilers (fnc) - Sorin Gitlan (forapathy) - Yohan Giarelli (frequence-web) + - Jesse Rushlow (geeshoe) - Gerry Vandermaesen (gerryvdm) - Ghazy Ben Ahmed (ghazy) - Arash Tabriziyan (ghost098) @@ -2317,6 +2354,7 @@ Symfony is the result of the work of many people who made the code better - Michal Čihař (mcihar) - Matt Drollette (mdrollette) - Adam Monsen (meonkeys) + - diego aguiar (mollokhan) - Hugo Monteiro (monteiro) - Ala Eddine Khefifi (nayzo) - emilienbouard (neime) @@ -2332,6 +2370,7 @@ Symfony is the result of the work of many people who made the code better - Philipp Hoffmann (philipphoffmann) - Alex Carol (picard89) - Daniel Perez Pinazo (pitiflautico) + - Igor Tarasov (polosatus) - Phil Taylor (prazgod) - Maxim Pustynnikov (pustynnikov) - Ralf Kuehnel (ralfkuehnel) @@ -2365,7 +2404,6 @@ Symfony is the result of the work of many people who made the code better - Wouter Sioen (wouter_sioen) - Xavier Amado (xamado) - Jesper Søndergaard Pedersen (zerrvox) - - Alexander Menshchikov (zmey_kk) - Florent Cailhol - szymek - Ryan Linnit @@ -2377,6 +2415,7 @@ Symfony is the result of the work of many people who made the code better - MaPePeR - Andreas Streichardt - Alexandre Segura + - Vivien - Pascal Hofmann - david-binda - smokeybear87 @@ -2389,6 +2428,7 @@ Symfony is the result of the work of many people who made the code better - Sergey Fedotov - Konstantin Scheumann - Michael + - Nate Wiebe - fh-github@fholzhauer.de - AbdElKader Bouadjadja - DSeemiller @@ -2400,6 +2440,7 @@ Symfony is the result of the work of many people who made the code better - max - Alexander Bauer (abauer) - Ahmad Mayahi (ahmadmayahi) + - Alireza Mirsepassi (alirezamirsepassi) - Mohamed Karnichi (amiral) - Andrew Carter (andrewcarteruk) - Adam Elsodaney (archfizz) diff --git a/phpunit b/phpunit index 200a9c28b4c34..c89d2e400b602 100755 --- a/phpunit +++ b/phpunit @@ -1,7 +1,7 @@ #!/usr/bin/env php container->get($name); if (!$manager instanceof LazyLoadingInterface) { - throw new \LogicException('Resetting a non-lazy manager service is not supported. '.(interface_exists(LazyLoadingInterface::class) ? sprintf('Declare the "%s" service as lazy.', $name) : 'Try running "composer require symfony/proxy-manager-bridge".')); + throw new \LogicException('Resetting a non-lazy manager service is not supported. '.(interface_exists(LazyLoadingInterface::class) && class_exists(RuntimeInstantiator::class) ? sprintf('Declare the "%s" service as lazy.', $name) : 'Try running "composer require symfony/proxy-manager-bridge".')); } $manager->setProxyInitializer(\Closure::bind( function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) { diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php index 3c98499fb42f9..6bb2c292e7777 100644 --- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php +++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php @@ -10,7 +10,7 @@ */ // Please update when phpunit needs to be reinstalled with fresh deps: -// Cache-Id: 2019-09-19 17:00 UTC +// Cache-Id: 2020-01-31 10:00 UTC error_reporting(-1); @@ -24,15 +24,47 @@ static $phpunitConfig = null; if (null === $phpunitConfig) { - $opt = min(array_search('-c', $opts = array_reverse($argv), true) ?: INF, array_search('--configuration', $opts, true) ?: INF); $phpunitConfigFilename = null; - if (INF !== $opt && isset($opts[$opt - 1])) { - $phpunitConfigFilename = $opts[$opt - 1]; - } elseif (file_exists('phpunit.xml')) { - $phpunitConfigFilename = 'phpunit.xml'; - } elseif (file_exists('phpunit.xml.dist')) { - $phpunitConfigFilename = 'phpunit.xml.dist'; + $getPhpUnitConfig = function ($probableConfig) use (&$getPhpUnitConfig) { + if (!$probableConfig) { + return null; + } + if (is_dir($probableConfig)) { + return $getPhpUnitConfig($probableConfig.DIRECTORY_SEPARATOR.'phpunit.xml'); + } + + if (file_exists($probableConfig)) { + return $probableConfig; + } + if (file_exists($probableConfig.'.dist')) { + return $probableConfig.'.dist'; + } + + return null; + }; + + foreach ($argv as $cliArgumentIndex => $cliArgument) { + if ('--' === $cliArgument) { + break; + } + // long option + if ('--configuration' === $cliArgument && array_key_exists($cliArgumentIndex + 1, $argv)) { + $phpunitConfigFilename = $getPhpUnitConfig($argv[$cliArgumentIndex + 1]); + break; + } + // short option + if (0 === strpos($cliArgument, '-c')) { + if ('-c' === $cliArgument && array_key_exists($cliArgumentIndex + 1, $argv)) { + $phpunitConfigFilename = $getPhpUnitConfig($argv[$cliArgumentIndex + 1]); + } else { + $phpunitConfigFilename = $getPhpUnitConfig(substr($cliArgument, 2)); + } + break; + } } + + $phpunitConfigFilename = $phpunitConfigFilename ?: $getPhpUnitConfig('phpunit.xml'); + if ($phpunitConfigFilename) { $phpunitConfig = new DomDocument(); $phpunitConfig->load($phpunitConfigFilename); diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php index d0ada81b0aa9e..9922a266fdb29 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php @@ -74,6 +74,10 @@ protected function configure() php %command.full_name% validator +To get specific information about a service including all its arguments, use the --show-arguments flag: + + php %command.full_name% validator --show-arguments + To see available types that can be used for autowiring, use the --types flag: php %command.full_name% --types diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php index 65b8013450e2d..ed871a5410b15 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php @@ -83,7 +83,7 @@ protected function configure() new InputOption('clean', null, InputOption::VALUE_NONE, 'Should clean not found messages'), new InputOption('domain', null, InputOption::VALUE_OPTIONAL, 'Specify the domain to update'), new InputOption('xliff-version', null, InputOption::VALUE_OPTIONAL, 'Override the default xliff version', '1.2'), - new InputOption('sort', null, InputOption::VALUE_OPTIONAL, 'Return list of messages sorted alphabetically'), + new InputOption('sort', null, InputOption::VALUE_OPTIONAL, 'Return list of messages sorted alphabetically', 'asc'), ]) ->setDescription('Updates the translation file') ->setHelp(<<<'EOF' diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index 2b4ddb9ba5e96..4263acc5dd19c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -1193,6 +1193,10 @@ private function addMessengerSection(ArrayNodeDefinition $rootNode) if (!\is_array($config)) { return []; } + // If XML config with only one routing attribute + if (2 === \count($config) && isset($config['message-class']) && isset($config['sender'])) { + $config = [0 => $config]; + } $newConfig = []; foreach ($config as $k => $v) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php index 856ba6408e8ab..2e33e2cc3fbeb 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php @@ -48,6 +48,14 @@ public function testDumpReverseSortedMessagesAndClean() $this->assertRegExp('/3 messages were successfully extracted/', $tester->getDisplay()); } + public function testDumpSortWithoutValueAndClean() + { + $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']]); + $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--sort']); + $this->assertRegExp("/\*bar\*foo\*test/", preg_replace('/\s+/', '', $tester->getDisplay())); + $this->assertRegExp('/3 messages were successfully extracted/', $tester->getDisplay()); + } + public function testDumpWrongSortAndClean() { $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']]); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_single.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_single.php new file mode 100644 index 0000000000000..e58814589b870 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_single.php @@ -0,0 +1,12 @@ +loadFromExtension('framework', [ + 'messenger' => [ + 'routing' => [ + 'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage' => ['amqp'], + ], + 'transports' => [ + 'amqp' => 'amqp://localhost/%2f/messages', + ], + ], +]); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing_single.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing_single.xml new file mode 100644 index 0000000000000..349a3728d3935 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing_single.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing_single.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing_single.yml new file mode 100644 index 0000000000000..caa88641887c7 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing_single.yml @@ -0,0 +1,7 @@ +framework: + messenger: + routing: + 'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage': [amqp] + + transports: + amqp: 'amqp://localhost/%2f/messages' diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index e80b52a0c23d4..2d494932dfd42 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -740,6 +740,15 @@ public function testMessengerRouting() $this->assertEquals(new Reference('messenger.transport.audit'), $sendersLocator->getArgument(0)['messenger.transport.audit']->getValues()[0]); } + public function testMessengerRoutingSingle() + { + $container = $this->createContainerFromFile('messenger_routing_single'); + $senderLocatorDefinition = $container->getDefinition('messenger.senders_locator'); + + $sendersMapping = $senderLocatorDefinition->getArgument(0); + $this->assertEquals(['amqp'], $sendersMapping[DummyMessage::class]); + } + public function testMessengerTransportConfiguration() { $container = $this->createContainerFromFile('messenger_transport'); diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml index e1a9ce5c038e1..503bd10bed4ed 100644 --- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml +++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml @@ -195,10 +195,10 @@ - - %security.authentication.hide_user_not_found% + + diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/cache.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/cache.html.twig index cbc705f51cb0e..0c406e9442c1e 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/cache.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/cache.html.twig @@ -108,9 +108,9 @@
{% if key == 'time' %} - {{ '%0.2f'|format(1000 * value.value) }} ms + {{ '%0.2f'|format(1000 * value) }} ms {% elseif key == 'hit_read_ratio' %} - {{ value.value ?? 0 }} % + {{ value ?? 0 }} % {% else %} {{ value }} {% endif %} diff --git a/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php b/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php index 8056090110c41..f4cad03fe18f1 100644 --- a/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php +++ b/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php @@ -25,9 +25,9 @@ class DefaultMarshaller implements MarshallerInterface public function __construct(bool $useIgbinarySerialize = null) { if (null === $useIgbinarySerialize) { - $useIgbinarySerialize = \extension_loaded('igbinary') && \PHP_VERSION_ID < 70400; - } elseif ($useIgbinarySerialize && (!\extension_loaded('igbinary') || \PHP_VERSION_ID >= 70400)) { - throw new CacheException('The "igbinary" PHP extension is not '.(\PHP_VERSION_ID >= 70400 ? 'compatible with PHP 7.4.' : 'loaded.')); + $useIgbinarySerialize = \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 || version_compare('3.1.0', phpversion('igbinary'), '<=')); + } elseif ($useIgbinarySerialize && (!\extension_loaded('igbinary') || (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')))) { + throw new CacheException(\extension_loaded('igbinary') && \PHP_VERSION_ID >= 70400 ? 'Please upgrade the "igbinary" PHP extension to v3.1 or higher.' : 'The "igbinary" PHP extension is not loaded.'); } $this->useIgbinarySerialize = $useIgbinarySerialize; } @@ -66,7 +66,7 @@ public function unmarshall(string $value) return null; } static $igbinaryNull; - if ($value === ($igbinaryNull ?? $igbinaryNull = \extension_loaded('igbinary') && \PHP_VERSION_ID < 70400 ? igbinary_serialize(null) : false)) { + if ($value === ($igbinaryNull ?? $igbinaryNull = \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 || version_compare('3.1.0', phpversion('igbinary'), '<=')) ? igbinary_serialize(null) : false)) { return null; } $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback'); diff --git a/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php b/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php index cc94ad15237a0..aaef04610e457 100644 --- a/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php +++ b/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php @@ -24,7 +24,7 @@ public function testSerialize() 'b' => function () {}, ]; - $expected = ['a' => \extension_loaded('igbinary') && \PHP_VERSION_ID < 70400 ? igbinary_serialize(123) : serialize(123)]; + $expected = ['a' => \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 || version_compare('3.1.0', phpversion('igbinary'), '<=')) ? igbinary_serialize(123) : serialize(123)]; $this->assertSame($expected, $marshaller->marshall($values, $failed)); $this->assertSame(['b'], $failed); } @@ -43,7 +43,7 @@ public function testNativeUnserialize() */ public function testIgbinaryUnserialize() { - if (\PHP_VERSION_ID >= 70400) { + if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) { $this->markTestSkipped('igbinary is not compatible with PHP 7.4.'); } @@ -67,7 +67,7 @@ public function testNativeUnserializeNotFoundClass() */ public function testIgbinaryUnserializeNotFoundClass() { - if (\PHP_VERSION_ID >= 70400) { + if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) { $this->markTestSkipped('igbinary is not compatible with PHP 7.4.'); } @@ -95,7 +95,7 @@ public function testNativeUnserializeInvalid() */ public function testIgbinaryUnserializeInvalid() { - if (\PHP_VERSION_ID >= 70400) { + if (\PHP_VERSION_ID >= 70400 && version_compare('3.1.0', phpversion('igbinary'), '>')) { $this->markTestSkipped('igbinary is not compatible with PHP 7.4.'); } diff --git a/src/Symfony/Component/Cache/Traits/PdoTrait.php b/src/Symfony/Component/Cache/Traits/PdoTrait.php index 3ee1f8cf60331..73f8c6465e3bf 100644 --- a/src/Symfony/Component/Cache/Traits/PdoTrait.php +++ b/src/Symfony/Component/Cache/Traits/PdoTrait.php @@ -403,6 +403,7 @@ private function getConnection() } else { switch ($this->driver = $this->conn->getDriver()->getName()) { case 'mysqli': + throw new \LogicException(sprintf('The adapter "%s" does not support the mysqli driver, use pdo_mysql instead.', \get_class($this))); case 'pdo_mysql': case 'drizzle_pdo_mysql': $this->driver = 'mysql'; diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index d3e8186dad85a..1b15e7941dab3 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -873,7 +873,7 @@ private function doActuallyRenderThrowable(\Throwable $e, OutputInterface $outpu } if (false !== strpos($message, "class@anonymous\0")) { - $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[0-9a-fA-F]++/', function ($m) { + $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) { return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0]; }, $message); } diff --git a/src/Symfony/Component/Debug/Exception/FlattenException.php b/src/Symfony/Component/Debug/Exception/FlattenException.php index e4016572965ed..a4cb517cb20fb 100644 --- a/src/Symfony/Component/Debug/Exception/FlattenException.php +++ b/src/Symfony/Component/Debug/Exception/FlattenException.php @@ -180,7 +180,7 @@ public function getMessage() public function setMessage($message) { if (false !== strpos($message, "class@anonymous\0")) { - $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[0-9a-fA-F]++/', function ($m) { + $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) { return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0]; }, $message); } diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php index 7c414258b79f2..b132174932dc7 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php @@ -12,7 +12,9 @@ namespace Symfony\Component\DependencyInjection\Compiler; use Symfony\Component\DependencyInjection\Argument\IteratorArgument; +use Symfony\Component\DependencyInjection\Argument\RewindableGenerator; use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument; +use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument; use Symfony\Component\DependencyInjection\Container; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Exception\EnvNotFoundException; @@ -40,7 +42,23 @@ */ final class CheckTypeDeclarationsPass extends AbstractRecursivePass { - private const SCALAR_TYPES = ['int', 'float', 'bool', 'string']; + private const SCALAR_TYPES = [ + 'int' => true, + 'float' => true, + 'bool' => true, + 'string' => true, + ]; + + private const BUILTIN_TYPES = [ + 'array' => true, + 'bool' => true, + 'callable' => true, + 'float' => true, + 'int' => true, + 'iterable' => true, + 'object' => true, + 'string' => true, + ]; private $autoload; private $skippedIds; @@ -160,33 +178,17 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar $type = $checkedDefinition->getClass(); } + $class = null; + if ($value instanceof Definition) { $class = $value->getClass(); - if (!$class || (!$this->autoload && !class_exists($class, false) && !interface_exists($class, false))) { - return; - } - - if ('callable' === $type && (\Closure::class === $class || method_exists($class, '__invoke'))) { - return; - } - - if ('iterable' === $type && is_subclass_of($class, 'Traversable')) { - return; - } - - if ('object' === $type) { - return; - } - - if (is_a($class, $type, true)) { + if (isset(self::BUILTIN_TYPES[strtolower($class)])) { + $class = strtolower($class); + } elseif (!$class || (!$this->autoload && !class_exists($class, false) && !interface_exists($class, false))) { return; } - - throw new InvalidParameterTypeException($this->currentId, $class, $parameter); - } - - if ($value instanceof Parameter) { + } elseif ($value instanceof Parameter) { $value = $this->container->getParameter($value); } elseif ($value instanceof Expression) { $value = $this->getExpressionLanguage()->evaluate($value, ['container' => $this->container]); @@ -212,30 +214,53 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar return; } - if (\in_array($type, self::SCALAR_TYPES, true) && is_scalar($value)) { + if (null === $class) { + if ($value instanceof IteratorArgument) { + $class = RewindableGenerator::class; + } elseif ($value instanceof ServiceClosureArgument) { + $class = \Closure::class; + } elseif ($value instanceof ServiceLocatorArgument) { + $class = ServiceLocator::class; + } elseif (\is_object($value)) { + $class = \get_class($value); + } else { + $class = \gettype($value); + $class = ['integer' => 'int', 'double' => 'float', 'boolean' => 'bool'][$class] ?? $class; + } + } + + if (isset(self::SCALAR_TYPES[$type]) && isset(self::SCALAR_TYPES[$class])) { + return; + } + + if ('string' === $type && method_exists($class, '__toString')) { + return; + } + + if ('callable' === $type && (\Closure::class === $class || method_exists($class, '__invoke'))) { return; } - if ('callable' === $type && \is_array($value) && isset($value[0]) && ($value[0] instanceof Reference || $value[0] instanceof Definition)) { + if ('callable' === $type && \is_array($value) && isset($value[0]) && ($value[0] instanceof Reference || $value[0] instanceof Definition || \is_string($value[0]))) { return; } - if (\in_array($type, ['callable', 'Closure'], true) && $value instanceof ServiceClosureArgument) { + if ('iterable' === $type && (\is_array($value) || is_subclass_of($class, \Traversable::class))) { return; } - if ('iterable' === $type && (\is_array($value) || $value instanceof \Traversable || $value instanceof IteratorArgument)) { + if ('object' === $type && !isset(self::BUILTIN_TYPES[$class])) { return; } - if ('Traversable' === $type && ($value instanceof \Traversable || $value instanceof IteratorArgument)) { + if (is_a($class, $type, true)) { return; } $checkFunction = sprintf('is_%s', $parameter->getType()->getName()); if (!$parameter->getType()->isBuiltin() || !$checkFunction($value)) { - throw new InvalidParameterTypeException($this->currentId, \is_object($value) ? \get_class($value) : \gettype($value), $parameter); + throw new InvalidParameterTypeException($this->currentId, \is_object($value) ? $class : \gettype($value), $parameter); } } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php index 350f85296a09c..79cbacecfc5b6 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php @@ -26,6 +26,8 @@ use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\BarOptionalArgumentNotNull; use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Foo; use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\FooObject; +use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Waldo; +use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Wobble; use Symfony\Component\ExpressionLanguage\Expression; /** @@ -602,6 +604,21 @@ public function testProcessResolveExpressions() $this->addToAssertionCount(1); } + public function testProcessSuccessWhenExpressionReturnsObject() + { + $container = new ContainerBuilder(); + + $container->register('waldo', Waldo::class); + + $container + ->register('wobble', Wobble::class) + ->setArguments([new Expression("service('waldo')")]); + + (new CheckTypeDeclarationsPass(true))->process($container); + + $this->addToAssertionCount(1); + } + public function testProcessHandleMixedEnvPlaceholder() { $this->expectException(\Symfony\Component\DependencyInjection\Exception\InvalidArgumentException::class); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/Waldo.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/Waldo.php new file mode 100644 index 0000000000000..321cc81858233 --- /dev/null +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/Waldo.php @@ -0,0 +1,7 @@ +waldo = $waldo; + } +} diff --git a/src/Symfony/Component/ErrorHandler/Debug.php b/src/Symfony/Component/ErrorHandler/Debug.php index f95334e01ab58..50d1789f09243 100644 --- a/src/Symfony/Component/ErrorHandler/Debug.php +++ b/src/Symfony/Component/ErrorHandler/Debug.php @@ -31,6 +31,6 @@ public static function enable(): ErrorHandler DebugClassLoader::enable(); - return ErrorHandler::register(new ErrorHandler(new BufferingLogger())); + return ErrorHandler::register(new ErrorHandler(new BufferingLogger(), true)); } } diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php index f4dcfb10942ea..b3afb53c9efb0 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorHandler.php +++ b/src/Symfony/Component/ErrorHandler/ErrorHandler.php @@ -92,6 +92,7 @@ class ErrorHandler private $screamedErrors = 0x55; // E_ERROR + E_CORE_ERROR + E_COMPILE_ERROR + E_PARSE private $loggedErrors = 0; private $traceReflector; + private $debug; private $isRecursive = 0; private $isRoot = false; @@ -180,7 +181,7 @@ public static function call(callable $function, ...$arguments) } } - public function __construct(BufferingLogger $bootstrappingLogger = null) + public function __construct(BufferingLogger $bootstrappingLogger = null, bool $debug = false) { if ($bootstrappingLogger) { $this->bootstrappingLogger = $bootstrappingLogger; @@ -188,6 +189,7 @@ public function __construct(BufferingLogger $bootstrappingLogger = null) } $this->traceReflector = new \ReflectionProperty('Exception', 'trace'); $this->traceReflector->setAccessible(true); + $this->debug = $debug; } /** @@ -697,7 +699,7 @@ public static function handleFatalError(array $error = null): void */ private function renderException(\Throwable $exception): void { - $renderer = \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? new CliErrorRenderer() : new HtmlErrorRenderer(0 !== $this->scopedErrors); + $renderer = \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? new CliErrorRenderer() : new HtmlErrorRenderer($this->debug); $exception = $renderer->render($exception); @@ -761,7 +763,7 @@ private function cleanTrace(array $backtrace, int $type, string $file, int $line */ private function parseAnonymousClass(string $message): string { - return preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[0-9a-fA-F]++/', static function ($m) { + return preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', static function ($m) { return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0]; }, $message); } diff --git a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php index 3f7903285c924..07c3d49db05d1 100644 --- a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php +++ b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php @@ -196,7 +196,7 @@ public function getMessage(): string public function setMessage($message): self { if (false !== strpos($message, "class@anonymous\0")) { - $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[0-9a-fA-F]++/', function ($m) { + $message = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) { return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0]; }, $message); } diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php index 7cb82c73e5507..2486f04bc8c8c 100644 --- a/src/Symfony/Component/HttpClient/HttpClientTrait.php +++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php @@ -110,7 +110,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt throw new InvalidArgumentException(sprintf('Option "auth_basic" must be string or an array, %s given.', \gettype($options['auth_basic']))); } - if (isset($options['auth_bearer']) && (!\is_string($options['auth_bearer']) || !preg_match('{^[-._~+/0-9a-zA-Z]++=*+$}', $options['auth_bearer']))) { + if (isset($options['auth_bearer']) && (!\is_string($options['auth_bearer']) || !preg_match('{^[-._=~+/0-9a-zA-Z]++$}', $options['auth_bearer']))) { throw new InvalidArgumentException(sprintf('Option "auth_bearer" must be a string containing only characters from the base 64 alphabet, %s given.', \is_string($options['auth_bearer']) ? 'invalid string' : \gettype($options['auth_bearer']))); } diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index c1a2e14887cda..05f740b6ad425 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -628,7 +628,7 @@ public function isImmutable(): bool } /** - * Returns true if the response must be revalidated by caches. + * Returns true if the response must be revalidated by shared caches once it has become stale. * * This method indicates that the response must not be served stale by a * cache in any circumstance without first revalidating with the origin. diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php index 21e6c3df2d893..6c4715802efda 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php @@ -476,13 +476,37 @@ protected function forward(Request $request, $catch = false, Response $entry = n // always a "master" request (as the real master request can be in cache) $response = SubRequestHandler::handle($this->kernel, $request, HttpKernelInterface::MASTER_REQUEST, $catch); - // we don't implement the stale-if-error on Requests, which is nonetheless part of the RFC - if (null !== $entry && \in_array($response->getStatusCode(), [500, 502, 503, 504])) { + /* + * Support stale-if-error given on Responses or as a config option. + * RFC 7234 summarizes in Section 4.2.4 (but also mentions with the individual + * Cache-Control directives) that + * + * A cache MUST NOT generate a stale response if it is prohibited by an + * explicit in-protocol directive (e.g., by a "no-store" or "no-cache" + * cache directive, a "must-revalidate" cache-response-directive, or an + * applicable "s-maxage" or "proxy-revalidate" cache-response-directive; + * see Section 5.2.2). + * + * https://tools.ietf.org/html/rfc7234#section-4.2.4 + * + * We deviate from this in one detail, namely that we *do* serve entries in the + * stale-if-error case even if they have a `s-maxage` Cache-Control directive. + */ + if (null !== $entry + && \in_array($response->getStatusCode(), [500, 502, 503, 504]) + && !$entry->headers->hasCacheControlDirective('no-cache') + && !$entry->mustRevalidate() + ) { if (null === $age = $entry->headers->getCacheControlDirective('stale-if-error')) { $age = $this->options['stale_if_error']; } - if (abs($entry->getTtl()) < $age) { + /* + * stale-if-error gives the (extra) time that the Response may be used *after* it has become stale. + * So we compare the time the $entry has been sitting in the cache already with the + * time it was fresh plus the allowed grace period. + */ + if ($entry->getAge() <= $entry->getMaxAge() + $age) { $this->record($request, 'stale-if-error'); return $entry; diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 91b10b32284c4..828ba08406626 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -76,11 +76,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private static $freshCache = []; - const VERSION = '4.4.3'; - const VERSION_ID = 40403; + const VERSION = '4.4.4'; + const VERSION_ID = 40404; const MAJOR_VERSION = 4; const MINOR_VERSION = 4; - const RELEASE_VERSION = 3; + const RELEASE_VERSION = 4; const EXTRA_VERSION = ''; const END_OF_MAINTENANCE = '11/2022'; @@ -634,7 +634,10 @@ public function release() } $this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass()); - $cache->release(); + if (method_exists($cache, 'release')) { + $cache->release(); + } + $this->container = require $cachePath; $this->container->set('kernel', $this); diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php index 34f1dc7f3b512..9c64b98fee519 100644 --- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php @@ -1522,6 +1522,168 @@ public function testUsesOriginalRequestForSurrogate() $cache->handle($request, HttpKernelInterface::SUB_REQUEST); } + public function testStaleIfErrorMustNotResetLifetime() + { + // Make sure we don't accidentally treat the response as fresh (revalidated) again + // when stale-if-error handling kicks in. + + $responses = [ + [ + 'status' => 200, + 'body' => 'OK', + // This is cacheable and can be used in stale-if-error cases: + 'headers' => ['Cache-Control' => 'public, max-age=10', 'ETag' => 'some-etag'], + ], + [ + 'status' => 500, + 'body' => 'FAIL', + 'headers' => [], + ], + [ + 'status' => 500, + 'body' => 'FAIL', + 'headers' => [], + ], + ]; + + $this->setNextResponses($responses); + $this->cacheConfig['stale_if_error'] = 10; + + $this->request('GET', '/'); // warm cache + + sleep(15); // now the entry is stale, but still within the grace period (10s max-age + 10s stale-if-error) + + $this->request('GET', '/'); // hit backend error + $this->assertEquals(200, $this->response->getStatusCode()); // stale-if-error saved the day + $this->assertEquals(15, $this->response->getAge()); + + sleep(10); // now we're outside the grace period + + $this->request('GET', '/'); // hit backend error + $this->assertEquals(500, $this->response->getStatusCode()); // fail + } + + /** + * @dataProvider getResponseDataThatMayBeServedStaleIfError + */ + public function testResponsesThatMayBeUsedStaleIfError($responseHeaders, $sleepBetweenRequests = null) + { + $responses = [ + [ + 'status' => 200, + 'body' => 'OK', + 'headers' => $responseHeaders, + ], + [ + 'status' => 500, + 'body' => 'FAIL', + 'headers' => [], + ], + ]; + + $this->setNextResponses($responses); + $this->cacheConfig['stale_if_error'] = 10; // after stale, may be served for 10s + + $this->request('GET', '/'); // warm cache + + if ($sleepBetweenRequests) { + sleep($sleepBetweenRequests); + } + + $this->request('GET', '/'); // hit backend error + + $this->assertEquals(200, $this->response->getStatusCode()); + $this->assertEquals('OK', $this->response->getContent()); + $this->assertTraceContains('stale-if-error'); + } + + public function getResponseDataThatMayBeServedStaleIfError() + { + // All data sets assume that a 10s stale-if-error grace period has been configured + yield 'public, max-age expired' => [['Cache-Control' => 'public, max-age=60'], 65]; + yield 'public, validateable with ETag, no TTL' => [['Cache-Control' => 'public', 'ETag' => 'some-etag'], 5]; + yield 'public, validateable with Last-Modified, no TTL' => [['Cache-Control' => 'public', 'Last-Modified' => 'yesterday'], 5]; + yield 'public, s-maxage will be served stale-if-error, even if the RFC mandates otherwise' => [['Cache-Control' => 'public, s-maxage=20'], 25]; + } + + /** + * @dataProvider getResponseDataThatMustNotBeServedStaleIfError + */ + public function testResponsesThatMustNotBeUsedStaleIfError($responseHeaders, $sleepBetweenRequests = null) + { + $responses = [ + [ + 'status' => 200, + 'body' => 'OK', + 'headers' => $responseHeaders, + ], + [ + 'status' => 500, + 'body' => 'FAIL', + 'headers' => [], + ], + ]; + + $this->setNextResponses($responses); + $this->cacheConfig['stale_if_error'] = 10; // after stale, may be served for 10s + $this->cacheConfig['strict_smaxage'] = true; // full RFC compliance for this feature + + $this->request('GET', '/'); // warm cache + + if ($sleepBetweenRequests) { + sleep($sleepBetweenRequests); + } + + $this->request('GET', '/'); // hit backend error + + $this->assertEquals(500, $this->response->getStatusCode()); + } + + public function getResponseDataThatMustNotBeServedStaleIfError() + { + // All data sets assume that a 10s stale-if-error grace period has been configured + yield 'public, no TTL but beyond grace period' => [['Cache-Control' => 'public'], 15]; + yield 'public, validateable with ETag, no TTL but beyond grace period' => [['Cache-Control' => 'public', 'ETag' => 'some-etag'], 15]; + yield 'public, validateable with Last-Modified, no TTL but beyond grace period' => [['Cache-Control' => 'public', 'Last-Modified' => 'yesterday'], 15]; + yield 'public, stale beyond grace period' => [['Cache-Control' => 'public, max-age=10'], 30]; + + // Cache-control values that prohibit serving stale responses or responses without positive validation - + // see https://tools.ietf.org/html/rfc7234#section-4.2.4 and + // https://tools.ietf.org/html/rfc7234#section-5.2.2 + yield 'no-cache requires positive validation' => [['Cache-Control' => 'public, no-cache', 'ETag' => 'some-etag']]; + yield 'no-cache requires positive validation, even if fresh' => [['Cache-Control' => 'public, no-cache, max-age=10']]; + yield 'must-revalidate requires positive validation once stale' => [['Cache-Control' => 'public, max-age=10, must-revalidate'], 15]; + yield 'proxy-revalidate requires positive validation once stale' => [['Cache-Control' => 'public, max-age=10, proxy-revalidate'], 15]; + } + + public function testStaleIfErrorWhenStrictSmaxageDisabled() + { + $responses = [ + [ + 'status' => 200, + 'body' => 'OK', + 'headers' => ['Cache-Control' => 'public, s-maxage=20'], + ], + [ + 'status' => 500, + 'body' => 'FAIL', + 'headers' => [], + ], + ]; + + $this->setNextResponses($responses); + $this->cacheConfig['stale_if_error'] = 10; + $this->cacheConfig['strict_smaxage'] = false; + + $this->request('GET', '/'); // warm cache + sleep(25); + $this->request('GET', '/'); // hit backend error + + $this->assertEquals(200, $this->response->getStatusCode()); + $this->assertEquals('OK', $this->response->getContent()); + $this->assertTraceContains('stale-if-error'); + } + public function testTraceHeaderNameCanBeChanged() { $this->cacheConfig['trace_header'] = 'X-My-Header'; diff --git a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php index 25d35d2850abf..8cf0ae52abe13 100644 --- a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php @@ -164,7 +164,7 @@ private function generateLocaleName(BundleEntryReaderInterface $reader, string $ // Discover the name of the region part of the locale // i.e. in de_AT, "AT" is the region if ($region = \Locale::getRegion($locale)) { - if (!RegionDataGenerator::isValidCountryCode($region)) { + if (ctype_alpha($region) && !RegionDataGenerator::isValidCountryCode($region)) { throw new MissingResourceException('Skipping "'.$locale.'" due an invalid country.'); } diff --git a/src/Symfony/Component/Intl/Resources/data/locales/af.json b/src/Symfony/Component/Intl/Resources/data/locales/af.json index 24e54896fea31..679d249a8d743 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/af.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/af.json @@ -8,6 +8,7 @@ "am": "Amharies", "am_ET": "Amharies (Ethiopië)", "ar": "Arabies", + "ar_001": "Arabies (Wêreld)", "ar_AE": "Arabies (Verenigde Arabiese Emirate)", "ar_BH": "Arabies (Bahrein)", "ar_DJ": "Arabies (Djiboeti)", @@ -94,6 +95,8 @@ "el_CY": "Grieks (Siprus)", "el_GR": "Grieks (Griekeland)", "en": "Engels", + "en_001": "Engels (Wêreld)", + "en_150": "Engels (Europa)", "en_AE": "Engels (Verenigde Arabiese Emirate)", "en_AG": "Engels (Antigua en Barbuda)", "en_AI": "Engels (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "Engels (Zambië)", "en_ZW": "Engels (Zimbabwe)", "eo": "Esperanto", + "eo_001": "Esperanto (Wêreld)", "es": "Spaans", + "es_419": "Spaans (Latyns-Amerika)", "es_AR": "Spaans (Argentinië)", "es_BO": "Spaans (Bolivië)", "es_BR": "Spaans (Brasilië)", @@ -329,6 +334,7 @@ "hy": "Armeens", "hy_AM": "Armeens (Armenië)", "ia": "Interlingua", + "ia_001": "Interlingua (Wêreld)", "id": "Indonesies", "id_ID": "Indonesies (Indonesië)", "ig": "Igbo", @@ -572,6 +578,7 @@ "xh": "Xhosa", "xh_ZA": "Xhosa (Suid-Afrika)", "yi": "Jiddisj", + "yi_001": "Jiddisj (Wêreld)", "yo": "Yoruba", "yo_BJ": "Yoruba (Benin)", "yo_NG": "Yoruba (Nigerië)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/am.json b/src/Symfony/Component/Intl/Resources/data/locales/am.json index 0a88014be6998..62fa94ca3e91d 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/am.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/am.json @@ -8,6 +8,7 @@ "am": "አማርኛ", "am_ET": "አማርኛ (ኢትዮጵያ)", "ar": "ዓረብኛ", + "ar_001": "ዓረብኛ (ዓለም)", "ar_AE": "ዓረብኛ (የተባበሩት ዓረብ ኤምሬትስ)", "ar_BH": "ዓረብኛ (ባህሬን)", "ar_DJ": "ዓረብኛ (ጂቡቲ)", @@ -94,6 +95,8 @@ "el_CY": "ግሪክኛ (ሳይፕረስ)", "el_GR": "ግሪክኛ (ግሪክ)", "en": "እንግሊዝኛ", + "en_001": "እንግሊዝኛ (ዓለም)", + "en_150": "እንግሊዝኛ (አውሮፓ)", "en_AE": "እንግሊዝኛ (የተባበሩት ዓረብ ኤምሬትስ)", "en_AG": "እንግሊዝኛ (አንቲጓ እና ባሩዳ)", "en_AI": "እንግሊዝኛ (አንጉይላ)", @@ -197,7 +200,9 @@ "en_ZM": "እንግሊዝኛ (ዛምቢያ)", "en_ZW": "እንግሊዝኛ (ዚምቧቤ)", "eo": "ኤስፐራንቶ", + "eo_001": "ኤስፐራንቶ (ዓለም)", "es": "ስፓንሽኛ", + "es_419": "ስፓንሽኛ (ላቲን አሜሪካ)", "es_AR": "ስፓንሽኛ (አርጀንቲና)", "es_BO": "ስፓንሽኛ (ቦሊቪያ)", "es_BR": "ስፓንሽኛ (ብራዚል)", @@ -329,6 +334,7 @@ "hy": "አርመናዊ", "hy_AM": "አርመናዊ (አርሜኒያ)", "ia": "ኢንቴርሊንጓ", + "ia_001": "ኢንቴርሊንጓ (ዓለም)", "id": "ኢንዶኔዥኛ", "id_ID": "ኢንዶኔዥኛ (ኢንዶኔዢያ)", "ig": "ኢግቦኛ", @@ -574,6 +580,7 @@ "xh": "ዞሳኛ", "xh_ZA": "ዞሳኛ (ደቡብ አፍሪካ)", "yi": "ይዲሽኛ", + "yi_001": "ይዲሽኛ (ዓለም)", "yo": "ዮሩባዊኛ", "yo_BJ": "ዮሩባዊኛ (ቤኒን)", "yo_NG": "ዮሩባዊኛ (ናይጄሪያ)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ar.json b/src/Symfony/Component/Intl/Resources/data/locales/ar.json index a5412fa7d176b..fb9f1f0c132b0 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ar.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ar.json @@ -8,6 +8,7 @@ "am": "الأمهرية", "am_ET": "الأمهرية (إثيوبيا)", "ar": "العربية", + "ar_001": "العربية (العالم)", "ar_AE": "العربية (الإمارات العربية المتحدة)", "ar_BH": "العربية (البحرين)", "ar_DJ": "العربية (جيبوتي)", @@ -94,6 +95,8 @@ "el_CY": "اليونانية (قبرص)", "el_GR": "اليونانية (اليونان)", "en": "الإنجليزية", + "en_001": "الإنجليزية (العالم)", + "en_150": "الإنجليزية (أوروبا)", "en_AE": "الإنجليزية (الإمارات العربية المتحدة)", "en_AG": "الإنجليزية (أنتيغوا وبربودا)", "en_AI": "الإنجليزية (أنغويلا)", @@ -197,7 +200,9 @@ "en_ZM": "الإنجليزية (زامبيا)", "en_ZW": "الإنجليزية (زيمبابوي)", "eo": "الإسبرانتو", + "eo_001": "الإسبرانتو (العالم)", "es": "الإسبانية", + "es_419": "الإسبانية (أمريكا اللاتينية)", "es_AR": "الإسبانية (الأرجنتين)", "es_BO": "الإسبانية (بوليفيا)", "es_BR": "الإسبانية (البرازيل)", @@ -329,6 +334,7 @@ "hy": "الأرمنية", "hy_AM": "الأرمنية (أرمينيا)", "ia": "اللّغة الوسيطة", + "ia_001": "اللّغة الوسيطة (العالم)", "id": "الإندونيسية", "id_ID": "الإندونيسية (إندونيسيا)", "ig": "الإيجبو", @@ -574,6 +580,7 @@ "xh": "الخوسا", "xh_ZA": "الخوسا (جنوب أفريقيا)", "yi": "اليديشية", + "yi_001": "اليديشية (العالم)", "yo": "اليوروبا", "yo_BJ": "اليوروبا (بنين)", "yo_NG": "اليوروبا (نيجيريا)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/as.json b/src/Symfony/Component/Intl/Resources/data/locales/as.json index 2bfe86fb163f7..c6cf343b57474 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/as.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/as.json @@ -8,6 +8,7 @@ "am": "আমহাৰিক", "am_ET": "আমহাৰিক (ইথিঅ’পিয়া)", "ar": "আৰবী", + "ar_001": "আৰবী (বিশ্ব)", "ar_AE": "আৰবী (সংযুক্ত আৰব আমিৰাত)", "ar_BH": "আৰবী (বাহৰেইন)", "ar_DJ": "আৰবী (জিবুটি)", @@ -94,6 +95,8 @@ "el_CY": "গ্ৰীক (চাইপ্ৰাছ)", "el_GR": "গ্ৰীক (গ্ৰীচ)", "en": "ইংৰাজী", + "en_001": "ইংৰাজী (বিশ্ব)", + "en_150": "ইংৰাজী (ইউৰোপ)", "en_AE": "ইংৰাজী (সংযুক্ত আৰব আমিৰাত)", "en_AG": "ইংৰাজী (এণ্টিগুৱা আৰু বাৰ্বুডা)", "en_AI": "ইংৰাজী (এনগুইলা)", @@ -197,7 +200,9 @@ "en_ZM": "ইংৰাজী (জাম্বিয়া)", "en_ZW": "ইংৰাজী (জিম্বাবৱে)", "eo": "এস্পেৰান্তো", + "eo_001": "এস্পেৰান্তো (বিশ্ব)", "es": "স্পেনিচ", + "es_419": "স্পেনিচ (লেটিন আমেৰিকা)", "es_AR": "স্পেনিচ (আৰ্জেণ্টিনা)", "es_BO": "স্পেনিচ (বলিভিয়া)", "es_BR": "স্পেনিচ (ব্ৰাজিল)", @@ -329,6 +334,7 @@ "hy": "আৰ্মেনীয়", "hy_AM": "আৰ্মেনীয় (আৰ্মেনিয়া)", "ia": "ইণ্টাৰলিংগুৱা", + "ia_001": "ইণ্টাৰলিংগুৱা (বিশ্ব)", "id": "ইণ্ডোনেচিয়", "id_ID": "ইণ্ডোনেচিয় (ইণ্ডোনেচিয়া)", "ig": "ইগ্বো", @@ -568,6 +574,7 @@ "xh": "হোছা", "xh_ZA": "হোছা (দক্ষিণ আফ্রিকা)", "yi": "ইদ্দিছ", + "yi_001": "ইদ্দিছ (বিশ্ব)", "yo": "ইউৰুবা", "yo_BJ": "ইউৰুবা (বেনিন)", "yo_NG": "ইউৰুবা (নাইজেৰিয়া)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/az.json b/src/Symfony/Component/Intl/Resources/data/locales/az.json index b85e7fd486574..3a557bf35d749 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/az.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/az.json @@ -8,6 +8,7 @@ "am": "amhar", "am_ET": "amhar (Efiopiya)", "ar": "ərəb", + "ar_001": "ərəb (Dünya)", "ar_AE": "ərəb (Birləşmiş Ərəb Əmirlikləri)", "ar_BH": "ərəb (Bəhreyn)", "ar_DJ": "ərəb (Cibuti)", @@ -94,6 +95,8 @@ "el_CY": "yunan (Kipr)", "el_GR": "yunan (Yunanıstan)", "en": "ingilis", + "en_001": "ingilis (Dünya)", + "en_150": "ingilis (Avropa)", "en_AE": "ingilis (Birləşmiş Ərəb Əmirlikləri)", "en_AG": "ingilis (Antiqua və Barbuda)", "en_AI": "ingilis (Angilya)", @@ -197,7 +200,9 @@ "en_ZM": "ingilis (Zambiya)", "en_ZW": "ingilis (Zimbabve)", "eo": "esperanto", + "eo_001": "esperanto (Dünya)", "es": "ispan", + "es_419": "ispan (Latın Amerikası)", "es_AR": "ispan (Argentina)", "es_BO": "ispan (Boliviya)", "es_BR": "ispan (Braziliya)", @@ -329,6 +334,7 @@ "hy": "erməni", "hy_AM": "erməni (Ermənistan)", "ia": "interlinqua", + "ia_001": "interlinqua (Dünya)", "id": "indoneziya", "id_ID": "indoneziya (İndoneziya)", "ig": "iqbo", @@ -574,6 +580,7 @@ "xh": "xosa", "xh_ZA": "xosa (Cənub Afrika)", "yi": "idiş", + "yi_001": "idiş (Dünya)", "yo": "yoruba", "yo_BJ": "yoruba (Benin)", "yo_NG": "yoruba (Nigeriya)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/az_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/locales/az_Cyrl.json index 7949e62a19e2f..d0425b7e54e9e 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/az_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/az_Cyrl.json @@ -8,6 +8,7 @@ "am": "амһар", "am_ET": "амһар (Ефиопија)", "ar": "әрәб", + "ar_001": "әрәб (Дүнја)", "ar_AE": "әрәб (Бирләшмиш Әрәб Әмирликләри)", "ar_BH": "әрәб (Бәһрејн)", "ar_DJ": "әрәб (Ҹибути)", @@ -94,6 +95,8 @@ "el_CY": "јунан (Кипр)", "el_GR": "јунан (Јунаныстан)", "en": "инҝилис", + "en_001": "инҝилис (Дүнја)", + "en_150": "инҝилис (Авропа)", "en_AE": "инҝилис (Бирләшмиш Әрәб Әмирликләри)", "en_AG": "инҝилис (Антигуа вә Барбуда)", "en_AI": "инҝилис (Анҝилја)", @@ -197,7 +200,9 @@ "en_ZM": "инҝилис (Замбија)", "en_ZW": "инҝилис (Зимбабве)", "eo": "есперанто", + "eo_001": "есперанто (Дүнја)", "es": "испан", + "es_419": "испан (Латын Америкасы)", "es_AR": "испан (Арҝентина)", "es_BO": "испан (Боливија)", "es_BR": "испан (Бразилија)", @@ -329,6 +334,7 @@ "hy": "ермәни", "hy_AM": "ермәни (Ермәнистан)", "ia": "интерлингве", + "ia_001": "интерлингве (Дүнја)", "id": "индонезија", "id_ID": "индонезија (Индонезија)", "ig": "игбо", @@ -570,6 +576,7 @@ "xh": "хоса", "xh_ZA": "хоса (Ҹәнуб Африка)", "yi": "идиш", + "yi_001": "идиш (Дүнја)", "yo": "јоруба", "yo_BJ": "јоруба (Бенин)", "yo_NG": "јоруба (Ниҝерија)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/be.json b/src/Symfony/Component/Intl/Resources/data/locales/be.json index 46aae9cd62010..3e03d39f78095 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/be.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/be.json @@ -8,6 +8,7 @@ "am": "амхарская", "am_ET": "амхарская (Эфіопія)", "ar": "арабская", + "ar_001": "арабская (Свет)", "ar_AE": "арабская (Аб’яднаныя Арабскія Эміраты)", "ar_BH": "арабская (Бахрэйн)", "ar_DJ": "арабская (Джыбуці)", @@ -94,6 +95,8 @@ "el_CY": "грэчаская (Кіпр)", "el_GR": "грэчаская (Грэцыя)", "en": "англійская", + "en_001": "англійская (Свет)", + "en_150": "англійская (Еўропа)", "en_AE": "англійская (Аб’яднаныя Арабскія Эміраты)", "en_AG": "англійская (Антыгуа і Барбуда)", "en_AI": "англійская (Ангілья)", @@ -197,7 +200,9 @@ "en_ZM": "англійская (Замбія)", "en_ZW": "англійская (Зімбабвэ)", "eo": "эсперанта", + "eo_001": "эсперанта (Свет)", "es": "іспанская", + "es_419": "іспанская (Лацінская Амерыка)", "es_AR": "іспанская (Аргенціна)", "es_BO": "іспанская (Балівія)", "es_BR": "іспанская (Бразілія)", @@ -329,6 +334,7 @@ "hy": "армянская", "hy_AM": "армянская (Арменія)", "ia": "інтэрлінгва", + "ia_001": "інтэрлінгва (Свет)", "id": "інданезійская", "id_ID": "інданезійская (Інданезія)", "ig": "ігба", @@ -572,6 +578,7 @@ "xh": "коса", "xh_ZA": "коса (Паўднёва-Афрыканская Рэспубліка)", "yi": "ідыш", + "yi_001": "ідыш (Свет)", "yo": "ёруба", "yo_BJ": "ёруба (Бенін)", "yo_NG": "ёруба (Нігерыя)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/bg.json b/src/Symfony/Component/Intl/Resources/data/locales/bg.json index 92237bc846c69..77acbdc27f105 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/bg.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/bg.json @@ -8,6 +8,7 @@ "am": "амхарски", "am_ET": "амхарски (Етиопия)", "ar": "арабски", + "ar_001": "арабски (свят)", "ar_AE": "арабски (Обединени арабски емирства)", "ar_BH": "арабски (Бахрейн)", "ar_DJ": "арабски (Джибути)", @@ -94,6 +95,8 @@ "el_CY": "гръцки (Кипър)", "el_GR": "гръцки (Гърция)", "en": "английски", + "en_001": "английски (свят)", + "en_150": "английски (Европа)", "en_AE": "английски (Обединени арабски емирства)", "en_AG": "английски (Антигуа и Барбуда)", "en_AI": "английски (Ангуила)", @@ -197,7 +200,9 @@ "en_ZM": "английски (Замбия)", "en_ZW": "английски (Зимбабве)", "eo": "есперанто", + "eo_001": "есперанто (свят)", "es": "испански", + "es_419": "испански (Латинска Америка)", "es_AR": "испански (Аржентина)", "es_BO": "испански (Боливия)", "es_BR": "испански (Бразилия)", @@ -329,6 +334,7 @@ "hy": "арменски", "hy_AM": "арменски (Армения)", "ia": "интерлингва", + "ia_001": "интерлингва (свят)", "id": "индонезийски", "id_ID": "индонезийски (Индонезия)", "ig": "игбо", @@ -574,6 +580,7 @@ "xh": "ксоса", "xh_ZA": "ксоса (Южна Африка)", "yi": "идиш", + "yi_001": "идиш (свят)", "yo": "йоруба", "yo_BJ": "йоруба (Бенин)", "yo_NG": "йоруба (Нигерия)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/bn.json b/src/Symfony/Component/Intl/Resources/data/locales/bn.json index 222c4ecfb4da0..c65893ecc255f 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/bn.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/bn.json @@ -8,6 +8,7 @@ "am": "আমহারিক", "am_ET": "আমহারিক (ইথিওপিয়া)", "ar": "আরবী", + "ar_001": "আরবী (পৃথিবী)", "ar_AE": "আরবী (সংযুক্ত আরব আমিরাত)", "ar_BH": "আরবী (বাহরাইন)", "ar_DJ": "আরবী (জিবুতি)", @@ -94,6 +95,8 @@ "el_CY": "গ্রিক (সাইপ্রাস)", "el_GR": "গ্রিক (গ্রীস)", "en": "ইংরেজি", + "en_001": "ইংরেজি (পৃথিবী)", + "en_150": "ইংরেজি (ইউরোপ)", "en_AE": "ইংরেজি (সংযুক্ত আরব আমিরাত)", "en_AG": "ইংরেজি (অ্যান্টিগুয়া ও বারবুডা)", "en_AI": "ইংরেজি (এ্যাঙ্গুইলা)", @@ -197,7 +200,9 @@ "en_ZM": "ইংরেজি (জাম্বিয়া)", "en_ZW": "ইংরেজি (জিম্বাবোয়ে)", "eo": "এস্পেরান্তো", + "eo_001": "এস্পেরান্তো (পৃথিবী)", "es": "স্প্যানিশ", + "es_419": "স্প্যানিশ (ল্যাটিন আমেরিকা)", "es_AR": "স্প্যানিশ (আর্জেন্টিনা)", "es_BO": "স্প্যানিশ (বলিভিয়া)", "es_BR": "স্প্যানিশ (ব্রাজিল)", @@ -329,6 +334,7 @@ "hy": "আর্মেনিয়", "hy_AM": "আর্মেনিয় (আর্মেনিয়া)", "ia": "ইন্টারলিঙ্গুয়া", + "ia_001": "ইন্টারলিঙ্গুয়া (পৃথিবী)", "id": "ইন্দোনেশীয়", "id_ID": "ইন্দোনেশীয় (ইন্দোনেশিয়া)", "ig": "ইগ্‌বো", @@ -574,6 +580,7 @@ "xh": "জোসা", "xh_ZA": "জোসা (দক্ষিণ আফ্রিকা)", "yi": "ইয়েদ্দিশ", + "yi_001": "ইয়েদ্দিশ (পৃথিবী)", "yo": "ইওরুবা", "yo_BJ": "ইওরুবা (বেনিন)", "yo_NG": "ইওরুবা (নাইজেরিয়া)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/bo.json b/src/Symfony/Component/Intl/Resources/data/locales/bo.json index 34dd3d08832d8..dc9a041cf84e4 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/bo.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/bo.json @@ -5,6 +5,7 @@ "bo_IN": "བོད་སྐད་ (རྒྱ་གར་)", "dz": "རྫོང་ཁ", "en": "དབྱིན་ཇིའི་སྐད།", + "en_001": "དབྱིན་ཇིའི་སྐད། (འཛམ་གླིང་།)", "en_DE": "དབྱིན་ཇིའི་སྐད། (འཇར་མན་)", "en_GB": "དབྱིན་ཇིའི་སྐད། (དབྱིན་ཇི་)", "en_IN": "དབྱིན་ཇིའི་སྐད། (རྒྱ་གར་)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/br.json b/src/Symfony/Component/Intl/Resources/data/locales/br.json index e51c733730bbd..8a08f65836579 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/br.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/br.json @@ -8,6 +8,7 @@ "am": "amhareg", "am_ET": "amhareg (Etiopia)", "ar": "arabeg", + "ar_001": "arabeg (Bed)", "ar_AE": "arabeg (Emirelezhioù Arab Unanet)", "ar_BH": "arabeg (Bahrein)", "ar_DJ": "arabeg (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "gresianeg (Kiprenez)", "el_GR": "gresianeg (Gres)", "en": "saozneg", + "en_001": "saozneg (Bed)", + "en_150": "saozneg (Europa)", "en_AE": "saozneg (Emirelezhioù Arab Unanet)", "en_AG": "saozneg (Antigua ha Barbuda)", "en_AI": "saozneg (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "saozneg (Zambia)", "en_ZW": "saozneg (Zimbabwe)", "eo": "esperanteg", + "eo_001": "esperanteg (Bed)", "es": "spagnoleg", + "es_419": "spagnoleg (Amerika Latin)", "es_AR": "spagnoleg (Arcʼhantina)", "es_BO": "spagnoleg (Bolivia)", "es_BR": "spagnoleg (Brazil)", @@ -329,6 +334,7 @@ "hy": "armenianeg", "hy_AM": "armenianeg (Armenia)", "ia": "interlingua", + "ia_001": "interlingua (Bed)", "id": "indonezeg", "id_ID": "indonezeg (Indonezia)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (Suafrika)", "yi": "yiddish", + "yi_001": "yiddish (Bed)", "yo": "yorouba", "yo_BJ": "yorouba (Benin)", "yo_NG": "yorouba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/bs.json b/src/Symfony/Component/Intl/Resources/data/locales/bs.json index 6775a3987f255..49cbd18cd5a56 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/bs.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/bs.json @@ -8,6 +8,7 @@ "am": "amharski", "am_ET": "amharski (Etiopija)", "ar": "arapski", + "ar_001": "arapski (Svijet)", "ar_AE": "arapski (Ujedinjeni Arapski Emirati)", "ar_BH": "arapski (Bahrein)", "ar_DJ": "arapski (Džibuti)", @@ -94,6 +95,8 @@ "el_CY": "grčki (Kipar)", "el_GR": "grčki (Grčka)", "en": "engleski", + "en_001": "engleski (Svijet)", + "en_150": "engleski (Evropa)", "en_AE": "engleski (Ujedinjeni Arapski Emirati)", "en_AG": "engleski (Antigva i Barbuda)", "en_AI": "engleski (Angvila)", @@ -197,7 +200,9 @@ "en_ZM": "engleski (Zambija)", "en_ZW": "engleski (Zimbabve)", "eo": "esperanto", + "eo_001": "esperanto (Svijet)", "es": "španski", + "es_419": "španski (Latinska Amerika)", "es_AR": "španski (Argentina)", "es_BO": "španski (Bolivija)", "es_BR": "španski (Brazil)", @@ -329,6 +334,7 @@ "hy": "armenski", "hy_AM": "armenski (Armenija)", "ia": "interlingva", + "ia_001": "interlingva (Svijet)", "id": "indonezijski", "id_ID": "indonezijski (Indonezija)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "hosa", "xh_ZA": "hosa (Južnoafrička Republika)", "yi": "jidiš", + "yi_001": "jidiš (Svijet)", "yo": "jorubanski", "yo_BJ": "jorubanski (Benin)", "yo_NG": "jorubanski (Nigerija)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/bs_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/locales/bs_Cyrl.json index df1e447d42ef3..7f0bab34194ba 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/bs_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/bs_Cyrl.json @@ -8,6 +8,7 @@ "am": "амхарски", "am_ET": "амхарски (Етиопија)", "ar": "арапски", + "ar_001": "арапски (Свијет)", "ar_AE": "арапски (Уједињени Арапски Емирати)", "ar_BH": "арапски (Бахреин)", "ar_DJ": "арапски (Џибути)", @@ -94,6 +95,8 @@ "el_CY": "грчки (Кипар)", "el_GR": "грчки (Грчка)", "en": "енглески", + "en_001": "енглески (Свијет)", + "en_150": "енглески (Европа)", "en_AE": "енглески (Уједињени Арапски Емирати)", "en_AG": "енглески (Антигва и Барбуда)", "en_AI": "енглески (Ангвила)", @@ -197,7 +200,9 @@ "en_ZM": "енглески (Замбија)", "en_ZW": "енглески (Зимбабве)", "eo": "есперанто", + "eo_001": "есперанто (Свијет)", "es": "шпански", + "es_419": "шпански (Латинска Америка)", "es_AR": "шпански (Аргентина)", "es_BO": "шпански (Боливија)", "es_BR": "шпански (Бразил)", @@ -329,6 +334,7 @@ "hy": "јерменски", "hy_AM": "јерменски (Арменија)", "ia": "интерлингва", + "ia_001": "интерлингва (Свијет)", "id": "индонежански", "id_ID": "индонежански (Индонезија)", "ig": "игбо", @@ -574,6 +580,7 @@ "xh": "коса", "xh_ZA": "коса (Јужноафричка Република)", "yi": "јидиш", + "yi_001": "јидиш (Свијет)", "yo": "јоруба", "yo_BJ": "јоруба (Бенин)", "yo_NG": "јоруба (Нигерија)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ca.json b/src/Symfony/Component/Intl/Resources/data/locales/ca.json index 8fbacaa7cccae..e81072a55851e 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ca.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ca.json @@ -8,6 +8,7 @@ "am": "amhàric", "am_ET": "amhàric (Etiòpia)", "ar": "àrab", + "ar_001": "àrab (Món)", "ar_AE": "àrab (Emirats Àrabs Units)", "ar_BH": "àrab (Bahrain)", "ar_DJ": "àrab (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "grec (Xipre)", "el_GR": "grec (Grècia)", "en": "anglès", + "en_001": "anglès (Món)", + "en_150": "anglès (Europa)", "en_AE": "anglès (Emirats Àrabs Units)", "en_AG": "anglès (Antigua i Barbuda)", "en_AI": "anglès (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "anglès (Zàmbia)", "en_ZW": "anglès (Zimbàbue)", "eo": "esperanto", + "eo_001": "esperanto (Món)", "es": "espanyol", + "es_419": "espanyol (Amèrica Llatina)", "es_AR": "espanyol (Argentina)", "es_BO": "espanyol (Bolívia)", "es_BR": "espanyol (Brasil)", @@ -329,6 +334,7 @@ "hy": "armeni", "hy_AM": "armeni (Armènia)", "ia": "interlingua", + "ia_001": "interlingua (Món)", "id": "indonesi", "id_ID": "indonesi (Indonèsia)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "xosa", "xh_ZA": "xosa (República de Sud-àfrica)", "yi": "ídix", + "yi_001": "ídix (Món)", "yo": "ioruba", "yo_BJ": "ioruba (Benín)", "yo_NG": "ioruba (Nigèria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ce.json b/src/Symfony/Component/Intl/Resources/data/locales/ce.json index b65c8de2a769f..857fc6bd8915d 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ce.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ce.json @@ -8,6 +8,7 @@ "am": "амхаройн", "am_ET": "амхаройн (Эфиопи)", "ar": "Ӏаьрбийн", + "ar_001": "Ӏаьрбийн (Дерригдуьненан)", "ar_AE": "Ӏаьрбийн (Ӏарбийн Цхьанатоьхна Эмираташ)", "ar_BH": "Ӏаьрбийн (Бахрейн)", "ar_DJ": "Ӏаьрбийн (Джибути)", @@ -94,6 +95,8 @@ "el_CY": "грекийн (Кипр)", "el_GR": "грекийн (Греци)", "en": "ингалсан", + "en_001": "ингалсан (Дерригдуьненан)", + "en_150": "ингалсан (Европа)", "en_AE": "ингалсан (Ӏарбийн Цхьанатоьхна Эмираташ)", "en_AG": "ингалсан (Антигуа а, Барбуда а)", "en_AI": "ингалсан (Ангилья)", @@ -197,7 +200,9 @@ "en_ZM": "ингалсан (Замби)", "en_ZW": "ингалсан (Зимбабве)", "eo": "эсперанто", + "eo_001": "эсперанто (Дерригдуьненан)", "es": "испанхойн", + "es_419": "испанхойн (Латинан Америка)", "es_AR": "испанхойн (Аргентина)", "es_BO": "испанхойн (Боливи)", "es_BR": "испанхойн (Бразили)", @@ -329,6 +334,7 @@ "hy": "эрмалойн", "hy_AM": "эрмалойн (Эрмалойчоь)", "ia": "интерлингва", + "ia_001": "интерлингва (Дерригдуьненан)", "id": "индонезихойн", "id_ID": "индонезихойн (Индонези)", "ig": "игбо", @@ -566,6 +572,7 @@ "xh": "коса", "xh_ZA": "коса (Къилба-Африкин Республика)", "yi": "идиш", + "yi_001": "идиш (Дерригдуьненан)", "yo": "йоруба", "yo_BJ": "йоруба (Бенин)", "yo_NG": "йоруба (Нигери)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/cs.json b/src/Symfony/Component/Intl/Resources/data/locales/cs.json index 852ccc8b31885..8c2cfe24c1e7b 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/cs.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/cs.json @@ -8,6 +8,7 @@ "am": "amharština", "am_ET": "amharština (Etiopie)", "ar": "arabština", + "ar_001": "arabština (svět)", "ar_AE": "arabština (Spojené arabské emiráty)", "ar_BH": "arabština (Bahrajn)", "ar_DJ": "arabština (Džibutsko)", @@ -94,6 +95,8 @@ "el_CY": "řečtina (Kypr)", "el_GR": "řečtina (Řecko)", "en": "angličtina", + "en_001": "angličtina (svět)", + "en_150": "angličtina (Evropa)", "en_AE": "angličtina (Spojené arabské emiráty)", "en_AG": "angličtina (Antigua a Barbuda)", "en_AI": "angličtina (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "angličtina (Zambie)", "en_ZW": "angličtina (Zimbabwe)", "eo": "esperanto", + "eo_001": "esperanto (svět)", "es": "španělština", + "es_419": "španělština (Latinská Amerika)", "es_AR": "španělština (Argentina)", "es_BO": "španělština (Bolívie)", "es_BR": "španělština (Brazílie)", @@ -329,6 +334,7 @@ "hy": "arménština", "hy_AM": "arménština (Arménie)", "ia": "interlingua", + "ia_001": "interlingua (svět)", "id": "indonéština", "id_ID": "indonéština (Indonésie)", "ig": "igboština", @@ -574,6 +580,7 @@ "xh": "xhoština", "xh_ZA": "xhoština (Jihoafrická republika)", "yi": "jidiš", + "yi_001": "jidiš (svět)", "yo": "jorubština", "yo_BJ": "jorubština (Benin)", "yo_NG": "jorubština (Nigérie)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/cy.json b/src/Symfony/Component/Intl/Resources/data/locales/cy.json index 732499e726fb8..a0bcd28aaa828 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/cy.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/cy.json @@ -8,6 +8,7 @@ "am": "Amhareg", "am_ET": "Amhareg (Ethiopia)", "ar": "Arabeg", + "ar_001": "Arabeg (Y Byd)", "ar_AE": "Arabeg (Emiradau Arabaidd Unedig)", "ar_BH": "Arabeg (Bahrain)", "ar_DJ": "Arabeg (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "Groeg (Cyprus)", "el_GR": "Groeg (Gwlad Groeg)", "en": "Saesneg", + "en_001": "Saesneg (Y Byd)", + "en_150": "Saesneg (Ewrop)", "en_AE": "Saesneg (Emiradau Arabaidd Unedig)", "en_AG": "Saesneg (Antigua a Barbuda)", "en_AI": "Saesneg (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "Saesneg (Zambia)", "en_ZW": "Saesneg (Zimbabwe)", "eo": "Esperanto", + "eo_001": "Esperanto (Y Byd)", "es": "Sbaeneg", + "es_419": "Sbaeneg (America Ladin)", "es_AR": "Sbaeneg (Yr Ariannin)", "es_BO": "Sbaeneg (Bolifia)", "es_BR": "Sbaeneg (Brasil)", @@ -329,6 +334,7 @@ "hy": "Armeneg", "hy_AM": "Armeneg (Armenia)", "ia": "Interlingua", + "ia_001": "Interlingua (Y Byd)", "id": "Indoneseg", "id_ID": "Indoneseg (Indonesia)", "ig": "Igbo", @@ -574,6 +580,7 @@ "xh": "Xhosa", "xh_ZA": "Xhosa (De Affrica)", "yi": "Iddew-Almaeneg", + "yi_001": "Iddew-Almaeneg (Y Byd)", "yo": "Iorwba", "yo_BJ": "Iorwba (Benin)", "yo_NG": "Iorwba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/da.json b/src/Symfony/Component/Intl/Resources/data/locales/da.json index c400ea47effa3..315330b7ef6ea 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/da.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/da.json @@ -8,6 +8,7 @@ "am": "amharisk", "am_ET": "amharisk (Etiopien)", "ar": "arabisk", + "ar_001": "arabisk (Verden)", "ar_AE": "arabisk (De Forenede Arabiske Emirater)", "ar_BH": "arabisk (Bahrain)", "ar_DJ": "arabisk (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "græsk (Cypern)", "el_GR": "græsk (Grækenland)", "en": "engelsk", + "en_001": "engelsk (Verden)", + "en_150": "engelsk (Europa)", "en_AE": "engelsk (De Forenede Arabiske Emirater)", "en_AG": "engelsk (Antigua og Barbuda)", "en_AI": "engelsk (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "engelsk (Zambia)", "en_ZW": "engelsk (Zimbabwe)", "eo": "esperanto", + "eo_001": "esperanto (Verden)", "es": "spansk", + "es_419": "spansk (Latinamerika)", "es_AR": "spansk (Argentina)", "es_BO": "spansk (Bolivia)", "es_BR": "spansk (Brasilien)", @@ -329,6 +334,7 @@ "hy": "armensk", "hy_AM": "armensk (Armenien)", "ia": "interlingua", + "ia_001": "interlingua (Verden)", "id": "indonesisk", "id_ID": "indonesisk (Indonesien)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "isiXhosa", "xh_ZA": "isiXhosa (Sydafrika)", "yi": "jiddisch", + "yi_001": "jiddisch (Verden)", "yo": "yoruba", "yo_BJ": "yoruba (Benin)", "yo_NG": "yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/de.json b/src/Symfony/Component/Intl/Resources/data/locales/de.json index 7291b3c260581..be3fb1d93a72c 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/de.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/de.json @@ -8,6 +8,7 @@ "am": "Amharisch", "am_ET": "Amharisch (Äthiopien)", "ar": "Arabisch", + "ar_001": "Arabisch (Welt)", "ar_AE": "Arabisch (Vereinigte Arabische Emirate)", "ar_BH": "Arabisch (Bahrain)", "ar_DJ": "Arabisch (Dschibuti)", @@ -94,6 +95,8 @@ "el_CY": "Griechisch (Zypern)", "el_GR": "Griechisch (Griechenland)", "en": "Englisch", + "en_001": "Englisch (Welt)", + "en_150": "Englisch (Europa)", "en_AE": "Englisch (Vereinigte Arabische Emirate)", "en_AG": "Englisch (Antigua und Barbuda)", "en_AI": "Englisch (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "Englisch (Sambia)", "en_ZW": "Englisch (Simbabwe)", "eo": "Esperanto", + "eo_001": "Esperanto (Welt)", "es": "Spanisch", + "es_419": "Spanisch (Lateinamerika)", "es_AR": "Spanisch (Argentinien)", "es_BO": "Spanisch (Bolivien)", "es_BR": "Spanisch (Brasilien)", @@ -329,6 +334,7 @@ "hy": "Armenisch", "hy_AM": "Armenisch (Armenien)", "ia": "Interlingua", + "ia_001": "Interlingua (Welt)", "id": "Indonesisch", "id_ID": "Indonesisch (Indonesien)", "ig": "Igbo", @@ -574,6 +580,7 @@ "xh": "Xhosa", "xh_ZA": "Xhosa (Südafrika)", "yi": "Jiddisch", + "yi_001": "Jiddisch (Welt)", "yo": "Yoruba", "yo_BJ": "Yoruba (Benin)", "yo_NG": "Yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/dz.json b/src/Symfony/Component/Intl/Resources/data/locales/dz.json index 7663c47966a97..dcbea32b762d2 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/dz.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/dz.json @@ -6,6 +6,7 @@ "am": "ཨམ་ཧ་རིཀ་ཁ", "am_ET": "ཨམ་ཧ་རིཀ་ཁ། (ཨི་ཐི་ཡོ་པི་ཡ།)", "ar": "ཨེ་ར་བིཀ་ཁ", + "ar_001": "ཨེ་ར་བིཀ་ཁ། (འཛམ་གླིང༌།)", "ar_AE": "ཨེ་ར་བིཀ་ཁ། (ཡུ་ནཱའི་ཊེཌ་ ཨ་རབ་ ཨེ་མེ་རེཊས།)", "ar_BH": "ཨེ་ར་བིཀ་ཁ། (བྷ་རེན།)", "ar_DJ": "ཨེ་ར་བིཀ་ཁ། (ཇི་བྷུ་ཊི།)", @@ -83,6 +84,8 @@ "el_CY": "གྲིཀ་ཁ། (སཱའི་པྲས།)", "el_GR": "གྲིཀ་ཁ། (གིརིས྄།)", "en": "ཨིང་ལིཤ་ཁ", + "en_001": "ཨིང་ལིཤ་ཁ། (འཛམ་གླིང༌།)", + "en_150": "ཨིང་ལིཤ་ཁ། (ཡུ་རོབ།)", "en_AE": "ཨིང་ལིཤ་ཁ། (ཡུ་ནཱའི་ཊེཌ་ ཨ་རབ་ ཨེ་མེ་རེཊས།)", "en_AG": "ཨིང་ལིཤ་ཁ། (ཨན་ཊི་གུ་ཝ་ ཨེནཌ་ བྷར་བྷུ་ཌ།)", "en_AI": "ཨིང་ལིཤ་ཁ། (ཨང་གི་ལ།)", @@ -186,7 +189,9 @@ "en_ZM": "ཨིང་ལིཤ་ཁ། (ཛམ་བྷི་ཡ།)", "en_ZW": "ཨིང་ལིཤ་ཁ། (ཛིམ་བྷབ་ཝེ།)", "eo": "ཨེས་པ་རཱན་ཏོ་ཁ", + "eo_001": "ཨེས་པ་རཱན་ཏོ་ཁ། (འཛམ་གླིང༌།)", "es": "ཨིས་པེ་ནིཤ་ཁ", + "es_419": "ཨིས་པེ་ནིཤ་ཁ། (ལེ་ཊིནཨ་མི་རི་ཀ།)", "es_AR": "ཨིས་པེ་ནིཤ་ཁ། (ཨར་ཇེན་ཊི་ན།)", "es_BO": "ཨིས་པེ་ནིཤ་ཁ། (བྷེ་ལི་བི་ཡ།)", "es_BR": "ཨིས་པེ་ནིཤ་ཁ། (བྲ་ཛིལ།)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ee.json b/src/Symfony/Component/Intl/Resources/data/locales/ee.json index 658001b191913..2ea994f90a612 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ee.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ee.json @@ -8,6 +8,7 @@ "am": "amhariagbe", "am_ET": "amhariagbe (Etiopia nutome)", "ar": "Arabiagbe", + "ar_001": "Arabiagbe (xexeme)", "ar_AE": "Arabiagbe (United Arab Emirates nutome)", "ar_BH": "Arabiagbe (Bahrain nutome)", "ar_DJ": "Arabiagbe (Dzibuti nutome)", @@ -91,6 +92,8 @@ "el_CY": "grisigbe (Saiprus nutome)", "el_GR": "grisigbe (Greece nutome)", "en": "Yevugbe", + "en_001": "Yevugbe (xexeme)", + "en_150": "Yevugbe (Europa nutome)", "en_AE": "Yevugbe (United Arab Emirates nutome)", "en_AG": "Yevugbe (́Antigua kple Barbuda nutome)", "en_AI": "Yevugbe (Anguilla nutome)", @@ -192,7 +195,9 @@ "en_ZM": "Yevugbe (Zambia nutome)", "en_ZW": "Yevugbe (Zimbabwe nutome)", "eo": "esperantogbe", + "eo_001": "esperantogbe (xexeme)", "es": "Spanishgbe", + "es_419": "Spanishgbe (Latin Amerika nutome)", "es_AR": "Spanishgbe (Argentina nutome)", "es_BO": "Spanishgbe (Bolivia nutome)", "es_BR": "Spanishgbe (Brazil nutome)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/el.json b/src/Symfony/Component/Intl/Resources/data/locales/el.json index 5e37af67ac927..5352bfab72599 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/el.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/el.json @@ -8,6 +8,7 @@ "am": "Αμχαρικά", "am_ET": "Αμχαρικά (Αιθιοπία)", "ar": "Αραβικά", + "ar_001": "Αραβικά (Κόσμος)", "ar_AE": "Αραβικά (Ηνωμένα Αραβικά Εμιράτα)", "ar_BH": "Αραβικά (Μπαχρέιν)", "ar_DJ": "Αραβικά (Τζιμπουτί)", @@ -94,6 +95,8 @@ "el_CY": "Ελληνικά (Κύπρος)", "el_GR": "Ελληνικά (Ελλάδα)", "en": "Αγγλικά", + "en_001": "Αγγλικά (Κόσμος)", + "en_150": "Αγγλικά (Ευρώπη)", "en_AE": "Αγγλικά (Ηνωμένα Αραβικά Εμιράτα)", "en_AG": "Αγγλικά (Αντίγκουα και Μπαρμπούντα)", "en_AI": "Αγγλικά (Ανγκουίλα)", @@ -197,7 +200,9 @@ "en_ZM": "Αγγλικά (Ζάμπια)", "en_ZW": "Αγγλικά (Ζιμπάμπουε)", "eo": "Εσπεράντο", + "eo_001": "Εσπεράντο (Κόσμος)", "es": "Ισπανικά", + "es_419": "Ισπανικά (Λατινική Αμερική)", "es_AR": "Ισπανικά (Αργεντινή)", "es_BO": "Ισπανικά (Βολιβία)", "es_BR": "Ισπανικά (Βραζιλία)", @@ -329,6 +334,7 @@ "hy": "Αρμενικά", "hy_AM": "Αρμενικά (Αρμενία)", "ia": "Ιντερλίνγκουα", + "ia_001": "Ιντερλίνγκουα (Κόσμος)", "id": "Ινδονησιακά", "id_ID": "Ινδονησιακά (Ινδονησία)", "ig": "Ίγκμπο", @@ -574,6 +580,7 @@ "xh": "Κόσα", "xh_ZA": "Κόσα (Νότια Αφρική)", "yi": "Γίντις", + "yi_001": "Γίντις (Κόσμος)", "yo": "Γιορούμπα", "yo_BJ": "Γιορούμπα (Μπενίν)", "yo_NG": "Γιορούμπα (Νιγηρία)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/en.json b/src/Symfony/Component/Intl/Resources/data/locales/en.json index 4cf2891f2e607..0ab7a27d0c3c8 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/en.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/en.json @@ -8,6 +8,7 @@ "am": "Amharic", "am_ET": "Amharic (Ethiopia)", "ar": "Arabic", + "ar_001": "Arabic (World)", "ar_AE": "Arabic (United Arab Emirates)", "ar_BH": "Arabic (Bahrain)", "ar_DJ": "Arabic (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "Greek (Cyprus)", "el_GR": "Greek (Greece)", "en": "English", + "en_001": "English (World)", + "en_150": "English (Europe)", "en_AE": "English (United Arab Emirates)", "en_AG": "English (Antigua & Barbuda)", "en_AI": "English (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "English (Zambia)", "en_ZW": "English (Zimbabwe)", "eo": "Esperanto", + "eo_001": "Esperanto (World)", "es": "Spanish", + "es_419": "Spanish (Latin America)", "es_AR": "Spanish (Argentina)", "es_BO": "Spanish (Bolivia)", "es_BR": "Spanish (Brazil)", @@ -329,6 +334,7 @@ "hy": "Armenian", "hy_AM": "Armenian (Armenia)", "ia": "Interlingua", + "ia_001": "Interlingua (World)", "id": "Indonesian", "id_ID": "Indonesian (Indonesia)", "ig": "Igbo", @@ -574,6 +580,7 @@ "xh": "Xhosa", "xh_ZA": "Xhosa (South Africa)", "yi": "Yiddish", + "yi_001": "Yiddish (World)", "yo": "Yoruba", "yo_BJ": "Yoruba (Benin)", "yo_NG": "Yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/eo.json b/src/Symfony/Component/Intl/Resources/data/locales/eo.json index a59255d203ded..d99f8817d46e2 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/eo.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/eo.json @@ -6,6 +6,7 @@ "am": "amhara", "am_ET": "amhara (Etiopujo)", "ar": "araba", + "ar_001": "araba (Mondo)", "ar_AE": "araba (Unuiĝintaj Arabaj Emirlandoj)", "ar_BH": "araba (Barejno)", "ar_DJ": "araba (Ĝibutio)", @@ -75,6 +76,7 @@ "el_CY": "greka (Kipro)", "el_GR": "greka (Grekujo)", "en": "angla", + "en_001": "angla (Mondo)", "en_AE": "angla (Unuiĝintaj Arabaj Emirlandoj)", "en_AG": "angla (Antigvo-Barbudo)", "en_AI": "angla (Angvilo)", @@ -164,6 +166,7 @@ "en_ZM": "angla (Zambio)", "en_ZW": "angla (Zimbabvo)", "eo": "esperanto", + "eo_001": "esperanto (Mondo)", "es": "hispana", "es_AR": "hispana (Argentino)", "es_BO": "hispana (Bolivio)", @@ -273,6 +276,7 @@ "hy": "armena", "hy_AM": "armena (Armenujo)", "ia": "interlingvao", + "ia_001": "interlingvao (Mondo)", "id": "indonezia", "id_ID": "indonezia (Indonezio)", "is": "islanda", @@ -467,6 +471,7 @@ "xh": "ksosa", "xh_ZA": "ksosa (Sud-Afriko)", "yi": "jida", + "yi_001": "jida (Mondo)", "yo": "joruba", "yo_BJ": "joruba (Benino)", "yo_NG": "joruba (Niĝerio)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/es.json b/src/Symfony/Component/Intl/Resources/data/locales/es.json index 220094ddb368c..77af364cc80a1 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/es.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/es.json @@ -8,6 +8,7 @@ "am": "amárico", "am_ET": "amárico (Etiopía)", "ar": "árabe", + "ar_001": "árabe (Mundo)", "ar_AE": "árabe (Emiratos Árabes Unidos)", "ar_BH": "árabe (Baréin)", "ar_DJ": "árabe (Yibuti)", @@ -94,6 +95,8 @@ "el_CY": "griego (Chipre)", "el_GR": "griego (Grecia)", "en": "inglés", + "en_001": "inglés (Mundo)", + "en_150": "inglés (Europa)", "en_AE": "inglés (Emiratos Árabes Unidos)", "en_AG": "inglés (Antigua y Barbuda)", "en_AI": "inglés (Anguila)", @@ -197,7 +200,9 @@ "en_ZM": "inglés (Zambia)", "en_ZW": "inglés (Zimbabue)", "eo": "esperanto", + "eo_001": "esperanto (Mundo)", "es": "español", + "es_419": "español (Latinoamérica)", "es_AR": "español (Argentina)", "es_BO": "español (Bolivia)", "es_BR": "español (Brasil)", @@ -329,6 +334,7 @@ "hy": "armenio", "hy_AM": "armenio (Armenia)", "ia": "interlingua", + "ia_001": "interlingua (Mundo)", "id": "indonesio", "id_ID": "indonesio (Indonesia)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (Sudáfrica)", "yi": "yidis", + "yi_001": "yidis (Mundo)", "yo": "yoruba", "yo_BJ": "yoruba (Benín)", "yo_NG": "yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/et.json b/src/Symfony/Component/Intl/Resources/data/locales/et.json index 3abf9fb4fd227..c5f1106ccf37d 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/et.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/et.json @@ -8,6 +8,7 @@ "am": "amhara", "am_ET": "amhara (Etioopia)", "ar": "araabia", + "ar_001": "araabia (maailm)", "ar_AE": "araabia (Araabia Ühendemiraadid)", "ar_BH": "araabia (Bahrein)", "ar_DJ": "araabia (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "kreeka (Küpros)", "el_GR": "kreeka (Kreeka)", "en": "inglise", + "en_001": "inglise (maailm)", + "en_150": "inglise (Euroopa)", "en_AE": "inglise (Araabia Ühendemiraadid)", "en_AG": "inglise (Antigua ja Barbuda)", "en_AI": "inglise (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "inglise (Sambia)", "en_ZW": "inglise (Zimbabwe)", "eo": "esperanto", + "eo_001": "esperanto (maailm)", "es": "hispaania", + "es_419": "hispaania (Ladina-Ameerika)", "es_AR": "hispaania (Argentina)", "es_BO": "hispaania (Boliivia)", "es_BR": "hispaania (Brasiilia)", @@ -329,6 +334,7 @@ "hy": "armeenia", "hy_AM": "armeenia (Armeenia)", "ia": "interlingua", + "ia_001": "interlingua (maailm)", "id": "indoneesia", "id_ID": "indoneesia (Indoneesia)", "ig": "ibo", @@ -574,6 +580,7 @@ "xh": "koosa", "xh_ZA": "koosa (Lõuna-Aafrika Vabariik)", "yi": "jidiši", + "yi_001": "jidiši (maailm)", "yo": "joruba", "yo_BJ": "joruba (Benin)", "yo_NG": "joruba (Nigeeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/eu.json b/src/Symfony/Component/Intl/Resources/data/locales/eu.json index e13082aa1de9d..c13584376ea40 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/eu.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/eu.json @@ -8,6 +8,7 @@ "am": "amharera", "am_ET": "amharera (Etiopia)", "ar": "arabiera", + "ar_001": "arabiera (Mundua)", "ar_AE": "arabiera (Arabiar Emirerri Batuak)", "ar_BH": "arabiera (Bahrain)", "ar_DJ": "arabiera (Djibuti)", @@ -94,6 +95,8 @@ "el_CY": "greziera (Zipre)", "el_GR": "greziera (Grezia)", "en": "ingeles", + "en_001": "ingeles (Mundua)", + "en_150": "ingeles (Europa)", "en_AE": "ingeles (Arabiar Emirerri Batuak)", "en_AG": "ingeles (Antigua eta Barbuda)", "en_AI": "ingeles (Aingira)", @@ -197,7 +200,9 @@ "en_ZM": "ingeles (Zambia)", "en_ZW": "ingeles (Zimbabwe)", "eo": "esperanto", + "eo_001": "esperanto (Mundua)", "es": "espainiera", + "es_419": "espainiera (Latinoamerika)", "es_AR": "espainiera (Argentina)", "es_BO": "espainiera (Bolivia)", "es_BR": "espainiera (Brasil)", @@ -329,6 +334,7 @@ "hy": "armeniera", "hy_AM": "armeniera (Armenia)", "ia": "interlingua", + "ia_001": "interlingua (Mundua)", "id": "indonesiera", "id_ID": "indonesiera (Indonesia)", "ig": "igboera", @@ -574,6 +580,7 @@ "xh": "xhosera", "xh_ZA": "xhosera (Hegoafrika)", "yi": "yiddish", + "yi_001": "yiddish (Mundua)", "yo": "jorubera", "yo_BJ": "jorubera (Benin)", "yo_NG": "jorubera (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/fa.json b/src/Symfony/Component/Intl/Resources/data/locales/fa.json index 2043b5435f4b4..fbee9f6b58479 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/fa.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/fa.json @@ -8,6 +8,7 @@ "am": "امهری", "am_ET": "امهری (اتیوپی)", "ar": "عربی", + "ar_001": "عربی (جهان)", "ar_AE": "عربی (امارات متحدهٔ عربی)", "ar_BH": "عربی (بحرین)", "ar_DJ": "عربی (جیبوتی)", @@ -94,6 +95,8 @@ "el_CY": "یونانی (قبرس)", "el_GR": "یونانی (یونان)", "en": "انگلیسی", + "en_001": "انگلیسی (جهان)", + "en_150": "انگلیسی (اروپا)", "en_AE": "انگلیسی (امارات متحدهٔ عربی)", "en_AG": "انگلیسی (آنتیگوا و باربودا)", "en_AI": "انگلیسی (آنگویلا)", @@ -197,7 +200,9 @@ "en_ZM": "انگلیسی (زامبیا)", "en_ZW": "انگلیسی (زیمبابوه)", "eo": "اسپرانتو", + "eo_001": "اسپرانتو (جهان)", "es": "اسپانیایی", + "es_419": "اسپانیایی (امریکای لاتین)", "es_AR": "اسپانیایی (آرژانتین)", "es_BO": "اسپانیایی (بولیوی)", "es_BR": "اسپانیایی (برزیل)", @@ -329,6 +334,7 @@ "hy": "ارمنی", "hy_AM": "ارمنی (ارمنستان)", "ia": "میان‌زبان", + "ia_001": "میان‌زبان (جهان)", "id": "اندونزیایی", "id_ID": "اندونزیایی (اندونزی)", "ig": "ایگبویی", @@ -574,6 +580,7 @@ "xh": "خوسایی", "xh_ZA": "خوسایی (افریقای جنوبی)", "yi": "یدی", + "yi_001": "یدی (جهان)", "yo": "یوروبایی", "yo_BJ": "یوروبایی (بنین)", "yo_NG": "یوروبایی (نیجریه)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/fa_AF.json b/src/Symfony/Component/Intl/Resources/data/locales/fa_AF.json index 639b55bd683bd..dfb60cbcace9a 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/fa_AF.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/fa_AF.json @@ -55,6 +55,7 @@ "en_VC": "انگلیسی (سنت وینسنت و گرنادین‌ها)", "en_ZW": "انگلیسی (زیمبابوی)", "es": "هسپانوی", + "es_419": "هسپانوی (امریکای لاتین)", "es_AR": "هسپانوی (ارجنتاین)", "es_BO": "هسپانوی (بولیویا)", "es_BR": "هسپانوی (برازیل)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/fi.json b/src/Symfony/Component/Intl/Resources/data/locales/fi.json index 922b8d9b1e9b1..3b6fdfd309bce 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/fi.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/fi.json @@ -8,6 +8,7 @@ "am": "amhara", "am_ET": "amhara (Etiopia)", "ar": "arabia", + "ar_001": "arabia (maailma)", "ar_AE": "arabia (Arabiemiirikunnat)", "ar_BH": "arabia (Bahrain)", "ar_DJ": "arabia (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "kreikka (Kypros)", "el_GR": "kreikka (Kreikka)", "en": "englanti", + "en_001": "englanti (maailma)", + "en_150": "englanti (Eurooppa)", "en_AE": "englanti (Arabiemiirikunnat)", "en_AG": "englanti (Antigua ja Barbuda)", "en_AI": "englanti (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "englanti (Sambia)", "en_ZW": "englanti (Zimbabwe)", "eo": "esperanto", + "eo_001": "esperanto (maailma)", "es": "espanja", + "es_419": "espanja (Latinalainen Amerikka)", "es_AR": "espanja (Argentiina)", "es_BO": "espanja (Bolivia)", "es_BR": "espanja (Brasilia)", @@ -329,6 +334,7 @@ "hy": "armenia", "hy_AM": "armenia (Armenia)", "ia": "interlingua", + "ia_001": "interlingua (maailma)", "id": "indonesia", "id_ID": "indonesia (Indonesia)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (Etelä-Afrikka)", "yi": "jiddiš", + "yi_001": "jiddiš (maailma)", "yo": "joruba", "yo_BJ": "joruba (Benin)", "yo_NG": "joruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/fo.json b/src/Symfony/Component/Intl/Resources/data/locales/fo.json index 09f6ee85216c6..40d766185ede3 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/fo.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/fo.json @@ -8,6 +8,7 @@ "am": "amhariskt", "am_ET": "amhariskt (Etiopia)", "ar": "arabiskt", + "ar_001": "arabiskt (heimur)", "ar_AE": "arabiskt (Sameindu Emirríkini)", "ar_BH": "arabiskt (Barein)", "ar_DJ": "arabiskt (Djibuti)", @@ -94,6 +95,8 @@ "el_CY": "grikskt (Kýpros)", "el_GR": "grikskt (Grikkaland)", "en": "enskt", + "en_001": "enskt (heimur)", + "en_150": "enskt (Evropa)", "en_AE": "enskt (Sameindu Emirríkini)", "en_AG": "enskt (Antigua & Barbuda)", "en_AI": "enskt (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "enskt (Sambia)", "en_ZW": "enskt (Simbabvi)", "eo": "esperanto", + "eo_001": "esperanto (heimur)", "es": "spanskt", + "es_419": "spanskt (Latínamerika)", "es_AR": "spanskt (Argentina)", "es_BO": "spanskt (Bolivia)", "es_BR": "spanskt (Brasil)", @@ -329,6 +334,7 @@ "hy": "armenskt", "hy_AM": "armenskt (Armenia)", "ia": "interlingua", + "ia_001": "interlingua (heimur)", "id": "indonesiskt", "id_ID": "indonesiskt (Indonesia)", "ig": "igbo", @@ -572,6 +578,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (Suðurafrika)", "yi": "jiddiskt", + "yi_001": "jiddiskt (heimur)", "yo": "yoruba", "yo_BJ": "yoruba (Benin)", "yo_NG": "yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/fr.json b/src/Symfony/Component/Intl/Resources/data/locales/fr.json index 2ad2da453202b..99049d5edb8f9 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/fr.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/fr.json @@ -8,6 +8,7 @@ "am": "amharique", "am_ET": "amharique (Éthiopie)", "ar": "arabe", + "ar_001": "arabe (Monde)", "ar_AE": "arabe (Émirats arabes unis)", "ar_BH": "arabe (Bahreïn)", "ar_DJ": "arabe (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "grec (Chypre)", "el_GR": "grec (Grèce)", "en": "anglais", + "en_001": "anglais (Monde)", + "en_150": "anglais (Europe)", "en_AE": "anglais (Émirats arabes unis)", "en_AG": "anglais (Antigua-et-Barbuda)", "en_AI": "anglais (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "anglais (Zambie)", "en_ZW": "anglais (Zimbabwe)", "eo": "espéranto", + "eo_001": "espéranto (Monde)", "es": "espagnol", + "es_419": "espagnol (Amérique latine)", "es_AR": "espagnol (Argentine)", "es_BO": "espagnol (Bolivie)", "es_BR": "espagnol (Brésil)", @@ -329,6 +334,7 @@ "hy": "arménien", "hy_AM": "arménien (Arménie)", "ia": "interlingua", + "ia_001": "interlingua (Monde)", "id": "indonésien", "id_ID": "indonésien (Indonésie)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (Afrique du Sud)", "yi": "yiddish", + "yi_001": "yiddish (Monde)", "yo": "yoruba", "yo_BJ": "yoruba (Bénin)", "yo_NG": "yoruba (Nigéria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/fy.json b/src/Symfony/Component/Intl/Resources/data/locales/fy.json index 7052f4db0b05b..f2854d11f250f 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/fy.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/fy.json @@ -8,6 +8,7 @@ "am": "Amhaarsk", "am_ET": "Amhaarsk (Ethiopië)", "ar": "Arabysk", + "ar_001": "Arabysk (Wrâld)", "ar_AE": "Arabysk (Verenigde Arabyske Emiraten)", "ar_BH": "Arabysk (Bahrein)", "ar_DJ": "Arabysk (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "Gryks (Syprus)", "el_GR": "Gryks (Grikelân)", "en": "Ingelsk", + "en_001": "Ingelsk (Wrâld)", + "en_150": "Ingelsk (Europa)", "en_AE": "Ingelsk (Verenigde Arabyske Emiraten)", "en_AG": "Ingelsk (Antigua en Barbuda)", "en_AI": "Ingelsk (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "Ingelsk (Zambia)", "en_ZW": "Ingelsk (Zimbabwe)", "eo": "Esperanto", + "eo_001": "Esperanto (Wrâld)", "es": "Spaansk", + "es_419": "Spaansk (Latynsk-Amearika)", "es_AR": "Spaansk (Argentinië)", "es_BO": "Spaansk (Bolivia)", "es_BR": "Spaansk (Brazilië)", @@ -329,6 +334,7 @@ "hy": "Armeensk", "hy_AM": "Armeensk (Armenië)", "ia": "Interlingua", + "ia_001": "Interlingua (Wrâld)", "id": "Yndonezysk", "id_ID": "Yndonezysk (Yndonesië)", "ig": "Igbo", @@ -572,6 +578,7 @@ "xh": "Xhosa", "xh_ZA": "Xhosa (Sûd-Afrika)", "yi": "Jiddysk", + "yi_001": "Jiddysk (Wrâld)", "yo": "Yoruba", "yo_BJ": "Yoruba (Benin)", "yo_NG": "Yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ga.json b/src/Symfony/Component/Intl/Resources/data/locales/ga.json index 35a8a92ff7a75..6a1b918e5efc0 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ga.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ga.json @@ -8,6 +8,7 @@ "am": "Amáiris", "am_ET": "Amáiris (an Aetóip)", "ar": "Araibis", + "ar_001": "Araibis (an Domhan)", "ar_AE": "Araibis (Aontas na nÉimíríochtaí Arabacha)", "ar_BH": "Araibis (Bairéin)", "ar_DJ": "Araibis (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "Gréigis (an Chipir)", "el_GR": "Gréigis (an Ghréig)", "en": "Béarla", + "en_001": "Béarla (an Domhan)", + "en_150": "Béarla (an Eoraip)", "en_AE": "Béarla (Aontas na nÉimíríochtaí Arabacha)", "en_AG": "Béarla (Antigua agus Barbúda)", "en_AI": "Béarla (Angaíle)", @@ -197,7 +200,9 @@ "en_ZM": "Béarla (an tSaimbia)", "en_ZW": "Béarla (an tSiombáib)", "eo": "Esperanto", + "eo_001": "Esperanto (an Domhan)", "es": "Spáinnis", + "es_419": "Spáinnis (Meiriceá Laidineach)", "es_AR": "Spáinnis (an Airgintín)", "es_BO": "Spáinnis (an Bholaiv)", "es_BR": "Spáinnis (an Bhrasaíl)", @@ -329,6 +334,7 @@ "hy": "Airméinis", "hy_AM": "Airméinis (an Airméin)", "ia": "Interlingua", + "ia_001": "Interlingua (an Domhan)", "id": "Indinéisis", "id_ID": "Indinéisis (an Indinéis)", "ig": "Íogbóis", @@ -574,6 +580,7 @@ "xh": "Cóisis", "xh_ZA": "Cóisis (an Afraic Theas)", "yi": "Giúdais", + "yi_001": "Giúdais (an Domhan)", "yo": "Iarúibis", "yo_BJ": "Iarúibis (Beinin)", "yo_NG": "Iarúibis (an Nigéir)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/gd.json b/src/Symfony/Component/Intl/Resources/data/locales/gd.json index c5db580e93ce2..6b5575e4b8972 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/gd.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/gd.json @@ -8,6 +8,7 @@ "am": "Amtharais", "am_ET": "Amtharais (An Itiop)", "ar": "Arabais", + "ar_001": "Arabais (An Saoghal)", "ar_AE": "Arabais (Na h-Iomaratan Arabach Aonaichte)", "ar_BH": "Arabais (Bachrain)", "ar_DJ": "Arabais (Diobùtaidh)", @@ -94,6 +95,8 @@ "el_CY": "Greugais (Cìopras)", "el_GR": "Greugais (A’ Ghreug)", "en": "Beurla", + "en_001": "Beurla (An Saoghal)", + "en_150": "Beurla (An Roinn-Eòrpa)", "en_AE": "Beurla (Na h-Iomaratan Arabach Aonaichte)", "en_AG": "Beurla (Aintìoga is Barbuda)", "en_AI": "Beurla (Anguillia)", @@ -197,7 +200,9 @@ "en_ZM": "Beurla (Sàimbia)", "en_ZW": "Beurla (An t-Sìombab)", "eo": "Esperanto", + "eo_001": "Esperanto (An Saoghal)", "es": "Spàinntis", + "es_419": "Spàinntis (Aimeireaga Laidinneach)", "es_AR": "Spàinntis (An Argantain)", "es_BO": "Spàinntis (Boilibhia)", "es_BR": "Spàinntis (Braisil)", @@ -329,6 +334,7 @@ "hy": "Airmeinis", "hy_AM": "Airmeinis (Airmeinea)", "ia": "Interlingua", + "ia_001": "Interlingua (An Saoghal)", "id": "Innd-Innsis", "id_ID": "Innd-Innsis (Na h-Innd-innse)", "ig": "Igbo", @@ -574,6 +580,7 @@ "xh": "Xhosa", "xh_ZA": "Xhosa (Afraga a Deas)", "yi": "Iùdhais", + "yi_001": "Iùdhais (An Saoghal)", "yo": "Yoruba", "yo_BJ": "Yoruba (Beinin)", "yo_NG": "Yoruba (Nigèiria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/gl.json b/src/Symfony/Component/Intl/Resources/data/locales/gl.json index 675a5fe5caad2..492906f47880d 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/gl.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/gl.json @@ -8,6 +8,7 @@ "am": "amhárico", "am_ET": "amhárico (Etiopía)", "ar": "árabe", + "ar_001": "árabe (Mundo)", "ar_AE": "árabe (Os Emiratos Árabes Unidos)", "ar_BH": "árabe (Bahrain)", "ar_DJ": "árabe (Djibuti)", @@ -94,6 +95,8 @@ "el_CY": "grego (Chipre)", "el_GR": "grego (Grecia)", "en": "inglés", + "en_001": "inglés (Mundo)", + "en_150": "inglés (Europa)", "en_AE": "inglés (Os Emiratos Árabes Unidos)", "en_AG": "inglés (Antigua e Barbuda)", "en_AI": "inglés (Anguila)", @@ -197,7 +200,9 @@ "en_ZM": "inglés (Zambia)", "en_ZW": "inglés (Zimbabwe)", "eo": "esperanto", + "eo_001": "esperanto (Mundo)", "es": "español", + "es_419": "español (América Latina)", "es_AR": "español (A Arxentina)", "es_BO": "español (Bolivia)", "es_BR": "español (O Brasil)", @@ -329,6 +334,7 @@ "hy": "armenio", "hy_AM": "armenio (Armenia)", "ia": "interlingua", + "ia_001": "interlingua (Mundo)", "id": "indonesio", "id_ID": "indonesio (Indonesia)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (Suráfrica)", "yi": "yiddish", + "yi_001": "yiddish (Mundo)", "yo": "ioruba", "yo_BJ": "ioruba (Benín)", "yo_NG": "ioruba (Nixeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/gu.json b/src/Symfony/Component/Intl/Resources/data/locales/gu.json index f35211ee17cbd..6731f9c46add1 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/gu.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/gu.json @@ -8,6 +8,7 @@ "am": "એમ્હારિક", "am_ET": "એમ્હારિક (ઇથિઓપિયા)", "ar": "અરબી", + "ar_001": "અરબી (વિશ્વ)", "ar_AE": "અરબી (યુનાઇટેડ આરબ અમીરાત)", "ar_BH": "અરબી (બેહરીન)", "ar_DJ": "અરબી (જીબૌટી)", @@ -94,6 +95,8 @@ "el_CY": "ગ્રીક (સાયપ્રસ)", "el_GR": "ગ્રીક (ગ્રીસ)", "en": "અંગ્રેજી", + "en_001": "અંગ્રેજી (વિશ્વ)", + "en_150": "અંગ્રેજી (યુરોપ)", "en_AE": "અંગ્રેજી (યુનાઇટેડ આરબ અમીરાત)", "en_AG": "અંગ્રેજી (ઍન્ટિગુઆ અને બર્મુડા)", "en_AI": "અંગ્રેજી (ઍંગ્વિલા)", @@ -197,7 +200,9 @@ "en_ZM": "અંગ્રેજી (ઝામ્બિયા)", "en_ZW": "અંગ્રેજી (ઝિમ્બાબ્વે)", "eo": "એસ્પેરાન્ટો", + "eo_001": "એસ્પેરાન્ટો (વિશ્વ)", "es": "સ્પેનિશ", + "es_419": "સ્પેનિશ (લેટિન અમેરિકા)", "es_AR": "સ્પેનિશ (આર્જેન્ટીના)", "es_BO": "સ્પેનિશ (બોલિવિયા)", "es_BR": "સ્પેનિશ (બ્રાઝિલ)", @@ -329,6 +334,7 @@ "hy": "આર્મેનિયન", "hy_AM": "આર્મેનિયન (આર્મેનિયા)", "ia": "ઇંટરલિંગુઆ", + "ia_001": "ઇંટરલિંગુઆ (વિશ્વ)", "id": "ઇન્ડોનેશિયન", "id_ID": "ઇન્ડોનેશિયન (ઇન્ડોનેશિયા)", "ig": "ઇગ્બો", @@ -574,6 +580,7 @@ "xh": "ખોસા", "xh_ZA": "ખોસા (દક્ષિણ આફ્રિકા)", "yi": "યિદ્દિશ", + "yi_001": "યિદ્દિશ (વિશ્વ)", "yo": "યોરૂબા", "yo_BJ": "યોરૂબા (બેનિન)", "yo_NG": "યોરૂબા (નાઇજેરિયા)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ha.json b/src/Symfony/Component/Intl/Resources/data/locales/ha.json index 32913eebd796a..d1948f07811cb 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ha.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ha.json @@ -8,6 +8,7 @@ "am": "Amharik", "am_ET": "Amharik (Habasha)", "ar": "Larabci", + "ar_001": "Larabci (Duniya)", "ar_AE": "Larabci (Haɗaɗɗiyar Daular Larabawa)", "ar_BH": "Larabci (Baharan)", "ar_DJ": "Larabci (Jibuti)", @@ -93,6 +94,8 @@ "el_CY": "Girkanci (Sifurus)", "el_GR": "Girkanci (Girka)", "en": "Turanci", + "en_001": "Turanci (Duniya)", + "en_150": "Turanci (Turai)", "en_AE": "Turanci (Haɗaɗɗiyar Daular Larabawa)", "en_AG": "Turanci (Antigwa da Barbuba)", "en_AI": "Turanci (Angila)", @@ -190,7 +193,9 @@ "en_ZM": "Turanci (Zambiya)", "en_ZW": "Turanci (Zimbabuwe)", "eo": "Dʼan\/ʼYar Kabilar Andalus", + "eo_001": "Dʼan\/ʼYar Kabilar Andalus (Duniya)", "es": "Sifaniyanci", + "es_419": "Sifaniyanci (Latin America)", "es_AR": "Sifaniyanci (Arjantiniya)", "es_BO": "Sifaniyanci (Bolibiya)", "es_BR": "Sifaniyanci (Birazil)", @@ -320,6 +325,7 @@ "hy": "Armeniyanci", "hy_AM": "Armeniyanci (Armeniya)", "ia": "Yare Tsakanin Kasashe", + "ia_001": "Yare Tsakanin Kasashe (Duniya)", "id": "Harshen Indunusiya", "id_ID": "Harshen Indunusiya (Indunusiya)", "ig": "Inyamuranci", @@ -556,6 +562,7 @@ "xh": "Bazosa", "xh_ZA": "Bazosa (Afirka Ta Kudu)", "yi": "Yiddish", + "yi_001": "Yiddish (Duniya)", "yo": "Yarbanci", "yo_BJ": "Yarbanci (Binin)", "yo_NG": "Yarbanci (Najeriya)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ha_NE.json b/src/Symfony/Component/Intl/Resources/data/locales/ha_NE.json index 88ee481ab8240..34afae0492977 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ha_NE.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ha_NE.json @@ -1,6 +1,7 @@ { "Names": { "eo": "Dʼan\/Ƴar Kabilar Andalus", + "eo_001": "Dʼan\/Ƴar Kabilar Andalus (Duniya)", "te": "Dʼan\/Ƴar Kabilar Telug", "te_IN": "Dʼan\/Ƴar Kabilar Telug (Indiya)" } diff --git a/src/Symfony/Component/Intl/Resources/data/locales/he.json b/src/Symfony/Component/Intl/Resources/data/locales/he.json index f315e5401cda8..3d99181d5bdb7 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/he.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/he.json @@ -8,6 +8,7 @@ "am": "אמהרית", "am_ET": "אמהרית (אתיופיה)", "ar": "ערבית", + "ar_001": "ערבית (העולם)", "ar_AE": "ערבית (איחוד האמירויות הערביות)", "ar_BH": "ערבית (בחריין)", "ar_DJ": "ערבית (ג׳יבוטי)", @@ -94,6 +95,8 @@ "el_CY": "יוונית (קפריסין)", "el_GR": "יוונית (יוון)", "en": "אנגלית", + "en_001": "אנגלית (העולם)", + "en_150": "אנגלית (אירופה)", "en_AE": "אנגלית (איחוד האמירויות הערביות)", "en_AG": "אנגלית (אנטיגואה וברבודה)", "en_AI": "אנגלית (אנגווילה)", @@ -197,7 +200,9 @@ "en_ZM": "אנגלית (זמביה)", "en_ZW": "אנגלית (זימבבואה)", "eo": "אספרנטו", + "eo_001": "אספרנטו (העולם)", "es": "ספרדית", + "es_419": "ספרדית (אמריקה הלטינית)", "es_AR": "ספרדית (ארגנטינה)", "es_BO": "ספרדית (בוליביה)", "es_BR": "ספרדית (ברזיל)", @@ -329,6 +334,7 @@ "hy": "ארמנית", "hy_AM": "ארמנית (ארמניה)", "ia": "‏אינטרלינגואה", + "ia_001": "‏אינטרלינגואה (העולם)", "id": "אינדונזית", "id_ID": "אינדונזית (אינדונזיה)", "ig": "איגבו", @@ -574,6 +580,7 @@ "xh": "קוסה", "xh_ZA": "קוסה (דרום אפריקה)", "yi": "יידיש", + "yi_001": "יידיש (העולם)", "yo": "יורובה", "yo_BJ": "יורובה (בנין)", "yo_NG": "יורובה (ניגריה)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/hi.json b/src/Symfony/Component/Intl/Resources/data/locales/hi.json index fad4263b25f58..f8ecc10aa749d 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/hi.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/hi.json @@ -8,6 +8,7 @@ "am": "अम्हेरी", "am_ET": "अम्हेरी (इथियोपिया)", "ar": "अरबी", + "ar_001": "अरबी (विश्व)", "ar_AE": "अरबी (संयुक्त अरब अमीरात)", "ar_BH": "अरबी (बहरीन)", "ar_DJ": "अरबी (जिबूती)", @@ -94,6 +95,8 @@ "el_CY": "यूनानी (साइप्रस)", "el_GR": "यूनानी (यूनान)", "en": "अंग्रेज़ी", + "en_001": "अंग्रेज़ी (विश्व)", + "en_150": "अंग्रेज़ी (यूरोप)", "en_AE": "अंग्रेज़ी (संयुक्त अरब अमीरात)", "en_AG": "अंग्रेज़ी (एंटिगुआ और बरबुडा)", "en_AI": "अंग्रेज़ी (एंग्विला)", @@ -197,7 +200,9 @@ "en_ZM": "अंग्रेज़ी (ज़ाम्बिया)", "en_ZW": "अंग्रेज़ी (ज़िम्बाब्वे)", "eo": "एस्पेरेंतो", + "eo_001": "एस्पेरेंतो (विश्व)", "es": "स्पेनी", + "es_419": "स्पेनी (लैटिन अमेरिका)", "es_AR": "स्पेनी (अर्जेंटीना)", "es_BO": "स्पेनी (बोलीविया)", "es_BR": "स्पेनी (ब्राज़ील)", @@ -329,6 +334,7 @@ "hy": "आर्मेनियाई", "hy_AM": "आर्मेनियाई (आर्मेनिया)", "ia": "इंटरलिंगुआ", + "ia_001": "इंटरलिंगुआ (विश्व)", "id": "इंडोनेशियाई", "id_ID": "इंडोनेशियाई (इंडोनेशिया)", "ig": "ईग्बो", @@ -574,6 +580,7 @@ "xh": "ख़ोसा", "xh_ZA": "ख़ोसा (दक्षिण अफ़्रीका)", "yi": "यहूदी", + "yi_001": "यहूदी (विश्व)", "yo": "योरूबा", "yo_BJ": "योरूबा (बेनिन)", "yo_NG": "योरूबा (नाइजीरिया)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/hr.json b/src/Symfony/Component/Intl/Resources/data/locales/hr.json index d8d522066193c..c488f1ade50dd 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/hr.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/hr.json @@ -8,6 +8,7 @@ "am": "amharski", "am_ET": "amharski (Etiopija)", "ar": "arapski", + "ar_001": "arapski (Svijet)", "ar_AE": "arapski (Ujedinjeni Arapski Emirati)", "ar_BH": "arapski (Bahrein)", "ar_DJ": "arapski (Džibuti)", @@ -94,6 +95,8 @@ "el_CY": "grčki (Cipar)", "el_GR": "grčki (Grčka)", "en": "engleski", + "en_001": "engleski (Svijet)", + "en_150": "engleski (Europa)", "en_AE": "engleski (Ujedinjeni Arapski Emirati)", "en_AG": "engleski (Antigva i Barbuda)", "en_AI": "engleski (Angvila)", @@ -197,7 +200,9 @@ "en_ZM": "engleski (Zambija)", "en_ZW": "engleski (Zimbabve)", "eo": "esperanto", + "eo_001": "esperanto (Svijet)", "es": "španjolski", + "es_419": "španjolski (Latinska Amerika)", "es_AR": "španjolski (Argentina)", "es_BO": "španjolski (Bolivija)", "es_BR": "španjolski (Brazil)", @@ -329,6 +334,7 @@ "hy": "armenski", "hy_AM": "armenski (Armenija)", "ia": "interlingua", + "ia_001": "interlingua (Svijet)", "id": "indonezijski", "id_ID": "indonezijski (Indonezija)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (Južnoafrička Republika)", "yi": "jidiš", + "yi_001": "jidiš (Svijet)", "yo": "jorupski", "yo_BJ": "jorupski (Benin)", "yo_NG": "jorupski (Nigerija)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/hu.json b/src/Symfony/Component/Intl/Resources/data/locales/hu.json index 2197aedc88fb2..e245bc7b8bcdf 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/hu.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/hu.json @@ -8,6 +8,7 @@ "am": "amhara", "am_ET": "amhara (Etiópia)", "ar": "arab", + "ar_001": "arab (Világ)", "ar_AE": "arab (Egyesült Arab Emírségek)", "ar_BH": "arab (Bahrein)", "ar_DJ": "arab (Dzsibuti)", @@ -94,6 +95,8 @@ "el_CY": "görög (Ciprus)", "el_GR": "görög (Görögország)", "en": "angol", + "en_001": "angol (Világ)", + "en_150": "angol (Európa)", "en_AE": "angol (Egyesült Arab Emírségek)", "en_AG": "angol (Antigua és Barbuda)", "en_AI": "angol (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "angol (Zambia)", "en_ZW": "angol (Zimbabwe)", "eo": "eszperantó", + "eo_001": "eszperantó (Világ)", "es": "spanyol", + "es_419": "spanyol (Latin-Amerika)", "es_AR": "spanyol (Argentína)", "es_BO": "spanyol (Bolívia)", "es_BR": "spanyol (Brazília)", @@ -329,6 +334,7 @@ "hy": "örmény", "hy_AM": "örmény (Örményország)", "ia": "interlingva", + "ia_001": "interlingva (Világ)", "id": "indonéz", "id_ID": "indonéz (Indonézia)", "ig": "igbó", @@ -574,6 +580,7 @@ "xh": "xhosza", "xh_ZA": "xhosza (Dél-afrikai Köztársaság)", "yi": "jiddis", + "yi_001": "jiddis (Világ)", "yo": "joruba", "yo_BJ": "joruba (Benin)", "yo_NG": "joruba (Nigéria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/hy.json b/src/Symfony/Component/Intl/Resources/data/locales/hy.json index 8f7daaaa7c88c..8e8854a577acf 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/hy.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/hy.json @@ -8,6 +8,7 @@ "am": "ամհարերեն", "am_ET": "ամհարերեն (Եթովպիա)", "ar": "արաբերեն", + "ar_001": "արաբերեն (Աշխարհ)", "ar_AE": "արաբերեն (Արաբական Միացյալ Էմիրություններ)", "ar_BH": "արաբերեն (Բահրեյն)", "ar_DJ": "արաբերեն (Ջիբութի)", @@ -94,6 +95,8 @@ "el_CY": "հունարեն (Կիպրոս)", "el_GR": "հունարեն (Հունաստան)", "en": "անգլերեն", + "en_001": "անգլերեն (Աշխարհ)", + "en_150": "անգլերեն (Եվրոպա)", "en_AE": "անգլերեն (Արաբական Միացյալ Էմիրություններ)", "en_AG": "անգլերեն (Անտիգուա և Բարբուդա)", "en_AI": "անգլերեն (Անգուիլա)", @@ -197,7 +200,9 @@ "en_ZM": "անգլերեն (Զամբիա)", "en_ZW": "անգլերեն (Զիմբաբվե)", "eo": "էսպերանտո", + "eo_001": "էսպերանտո (Աշխարհ)", "es": "իսպաներեն", + "es_419": "իսպաներեն (Լատինական Ամերիկա)", "es_AR": "իսպաներեն (Արգենտինա)", "es_BO": "իսպաներեն (Բոլիվիա)", "es_BR": "իսպաներեն (Բրազիլիա)", @@ -329,6 +334,7 @@ "hy": "հայերեն", "hy_AM": "հայերեն (Հայաստան)", "ia": "ինտերլինգուա", + "ia_001": "ինտերլինգուա (Աշխարհ)", "id": "ինդոնեզերեն", "id_ID": "ինդոնեզերեն (Ինդոնեզիա)", "ig": "իգբո", @@ -574,6 +580,7 @@ "xh": "քոսա", "xh_ZA": "քոսա (Հարավաֆրիկյան Հանրապետություն)", "yi": "իդիշ", + "yi_001": "իդիշ (Աշխարհ)", "yo": "յորուբա", "yo_BJ": "յորուբա (Բենին)", "yo_NG": "յորուբա (Նիգերիա)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ia.json b/src/Symfony/Component/Intl/Resources/data/locales/ia.json index fa5303b0fbd73..666d94c87f0f8 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ia.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ia.json @@ -8,6 +8,7 @@ "am": "amharico", "am_ET": "amharico (Ethiopia)", "ar": "arabe", + "ar_001": "arabe (Mundo)", "ar_AE": "arabe (Emiratos Arabe Unite)", "ar_DZ": "arabe (Algeria)", "ar_EG": "arabe (Egypto)", @@ -88,6 +89,8 @@ "el_CY": "greco (Cypro)", "el_GR": "greco (Grecia)", "en": "anglese", + "en_001": "anglese (Mundo)", + "en_150": "anglese (Europa)", "en_AE": "anglese (Emiratos Arabe Unite)", "en_AG": "anglese (Antigua e Barbuda)", "en_AS": "anglese (Samoa american)", @@ -166,7 +169,9 @@ "en_ZM": "anglese (Zambia)", "en_ZW": "anglese (Zimbabwe)", "eo": "esperanto", + "eo_001": "esperanto (Mundo)", "es": "espaniol", + "es_419": "espaniol (America latin)", "es_AR": "espaniol (Argentina)", "es_BO": "espaniol (Bolivia)", "es_BR": "espaniol (Brasil)", @@ -285,6 +290,7 @@ "hy": "armeniano", "hy_AM": "armeniano (Armenia)", "ia": "interlingua", + "ia_001": "interlingua (Mundo)", "id": "indonesiano", "id_ID": "indonesiano (Indonesia)", "ig": "igbo", @@ -507,6 +513,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (Sudafrica)", "yi": "yiddish", + "yi_001": "yiddish (Mundo)", "yo": "yoruba", "yo_BJ": "yoruba (Benin)", "yo_NG": "yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/id.json b/src/Symfony/Component/Intl/Resources/data/locales/id.json index bc9048d55a1fa..9d6f101e8edb4 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/id.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/id.json @@ -8,6 +8,7 @@ "am": "Amharik", "am_ET": "Amharik (Etiopia)", "ar": "Arab", + "ar_001": "Arab (Dunia)", "ar_AE": "Arab (Uni Emirat Arab)", "ar_BH": "Arab (Bahrain)", "ar_DJ": "Arab (Jibuti)", @@ -94,6 +95,8 @@ "el_CY": "Yunani (Siprus)", "el_GR": "Yunani (Yunani)", "en": "Inggris", + "en_001": "Inggris (Dunia)", + "en_150": "Inggris (Eropa)", "en_AE": "Inggris (Uni Emirat Arab)", "en_AG": "Inggris (Antigua dan Barbuda)", "en_AI": "Inggris (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "Inggris (Zambia)", "en_ZW": "Inggris (Zimbabwe)", "eo": "Esperanto", + "eo_001": "Esperanto (Dunia)", "es": "Spanyol", + "es_419": "Spanyol (Amerika Latin)", "es_AR": "Spanyol (Argentina)", "es_BO": "Spanyol (Bolivia)", "es_BR": "Spanyol (Brasil)", @@ -329,6 +334,7 @@ "hy": "Armenia", "hy_AM": "Armenia (Armenia)", "ia": "Interlingua", + "ia_001": "Interlingua (Dunia)", "id": "Indonesia", "id_ID": "Indonesia (Indonesia)", "ig": "Igbo", @@ -574,6 +580,7 @@ "xh": "Xhosa", "xh_ZA": "Xhosa (Afrika Selatan)", "yi": "Yiddish", + "yi_001": "Yiddish (Dunia)", "yo": "Yoruba", "yo_BJ": "Yoruba (Benin)", "yo_NG": "Yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ig.json b/src/Symfony/Component/Intl/Resources/data/locales/ig.json index 71e39873cb22c..effdda848aad3 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ig.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ig.json @@ -5,6 +5,7 @@ "am": "Amariikị", "am_ET": "Amariikị (Ethiopia)", "ar": "Arabiikị", + "ar_001": "Arabiikị (Uwa)", "ar_DJ": "Arabiikị (Djibouti)", "ar_DZ": "Arabiikị (Algeria)", "ar_EG": "Arabiikị (Egypt)", @@ -38,6 +39,8 @@ "el": "Giriikị", "el_GR": "Giriikị (Greece)", "en": "Asụsụ Bekee", + "en_001": "Asụsụ Bekee (Uwa)", + "en_150": "Asụsụ Bekee (Europe)", "en_AG": "Asụsụ Bekee (Antigua & Barbuda)", "en_AI": "Asụsụ Bekee (Anguilla)", "en_AS": "Asụsụ Bekee (American Samoa)", @@ -134,6 +137,7 @@ "en_ZM": "Asụsụ Bekee (Zambia)", "en_ZW": "Asụsụ Bekee (Zimbabwe)", "es": "Asụsụ Spanish", + "es_419": "Asụsụ Spanish (Latin America)", "es_AR": "Asụsụ Spanish (Argentina)", "es_BO": "Asụsụ Spanish (Bolivia)", "es_BR": "Asụsụ Spanish (Mba Brazil)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/is.json b/src/Symfony/Component/Intl/Resources/data/locales/is.json index 00957976ad50b..517a0a785cfcf 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/is.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/is.json @@ -8,6 +8,7 @@ "am": "amharíska", "am_ET": "amharíska (Eþíópía)", "ar": "arabíska", + "ar_001": "arabíska (Heimurinn)", "ar_AE": "arabíska (Sameinuðu arabísku furstadæmin)", "ar_BH": "arabíska (Barein)", "ar_DJ": "arabíska (Djíbútí)", @@ -94,6 +95,8 @@ "el_CY": "gríska (Kýpur)", "el_GR": "gríska (Grikkland)", "en": "enska", + "en_001": "enska (Heimurinn)", + "en_150": "enska (Evrópa)", "en_AE": "enska (Sameinuðu arabísku furstadæmin)", "en_AG": "enska (Antígva og Barbúda)", "en_AI": "enska (Angvilla)", @@ -197,7 +200,9 @@ "en_ZM": "enska (Sambía)", "en_ZW": "enska (Simbabve)", "eo": "esperantó", + "eo_001": "esperantó (Heimurinn)", "es": "spænska", + "es_419": "spænska (Rómanska Ameríka)", "es_AR": "spænska (Argentína)", "es_BO": "spænska (Bólivía)", "es_BR": "spænska (Brasilía)", @@ -329,6 +334,7 @@ "hy": "armenska", "hy_AM": "armenska (Armenía)", "ia": "alþjóðatunga", + "ia_001": "alþjóðatunga (Heimurinn)", "id": "indónesíska", "id_ID": "indónesíska (Indónesía)", "ig": "ígbó", @@ -574,6 +580,7 @@ "xh": "sósa", "xh_ZA": "sósa (Suður-Afríka)", "yi": "jiddíska", + "yi_001": "jiddíska (Heimurinn)", "yo": "jórúba", "yo_BJ": "jórúba (Benín)", "yo_NG": "jórúba (Nígería)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/it.json b/src/Symfony/Component/Intl/Resources/data/locales/it.json index 97e1889cf1bde..bbdbd17218c42 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/it.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/it.json @@ -8,6 +8,7 @@ "am": "amarico", "am_ET": "amarico (Etiopia)", "ar": "arabo", + "ar_001": "arabo (Mondo)", "ar_AE": "arabo (Emirati Arabi Uniti)", "ar_BH": "arabo (Bahrein)", "ar_DJ": "arabo (Gibuti)", @@ -94,6 +95,8 @@ "el_CY": "greco (Cipro)", "el_GR": "greco (Grecia)", "en": "inglese", + "en_001": "inglese (Mondo)", + "en_150": "inglese (Europa)", "en_AE": "inglese (Emirati Arabi Uniti)", "en_AG": "inglese (Antigua e Barbuda)", "en_AI": "inglese (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "inglese (Zambia)", "en_ZW": "inglese (Zimbabwe)", "eo": "esperanto", + "eo_001": "esperanto (Mondo)", "es": "spagnolo", + "es_419": "spagnolo (America Latina)", "es_AR": "spagnolo (Argentina)", "es_BO": "spagnolo (Bolivia)", "es_BR": "spagnolo (Brasile)", @@ -329,6 +334,7 @@ "hy": "armeno", "hy_AM": "armeno (Armenia)", "ia": "interlingua", + "ia_001": "interlingua (Mondo)", "id": "indonesiano", "id_ID": "indonesiano (Indonesia)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (Sudafrica)", "yi": "yiddish", + "yi_001": "yiddish (Mondo)", "yo": "yoruba", "yo_BJ": "yoruba (Benin)", "yo_NG": "yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ja.json b/src/Symfony/Component/Intl/Resources/data/locales/ja.json index 9d077d2ca485b..428577972342b 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ja.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ja.json @@ -8,6 +8,7 @@ "am": "アムハラ語", "am_ET": "アムハラ語 (エチオピア)", "ar": "アラビア語", + "ar_001": "アラビア語 (世界)", "ar_AE": "アラビア語 (アラブ首長国連邦)", "ar_BH": "アラビア語 (バーレーン)", "ar_DJ": "アラビア語 (ジブチ)", @@ -94,6 +95,8 @@ "el_CY": "ギリシャ語 (キプロス)", "el_GR": "ギリシャ語 (ギリシャ)", "en": "英語", + "en_001": "英語 (世界)", + "en_150": "英語 (ヨーロッパ)", "en_AE": "英語 (アラブ首長国連邦)", "en_AG": "英語 (アンティグア・バーブーダ)", "en_AI": "英語 (アンギラ)", @@ -197,7 +200,9 @@ "en_ZM": "英語 (ザンビア)", "en_ZW": "英語 (ジンバブエ)", "eo": "エスペラント語", + "eo_001": "エスペラント語 (世界)", "es": "スペイン語", + "es_419": "スペイン語 (ラテンアメリカ)", "es_AR": "スペイン語 (アルゼンチン)", "es_BO": "スペイン語 (ボリビア)", "es_BR": "スペイン語 (ブラジル)", @@ -329,6 +334,7 @@ "hy": "アルメニア語", "hy_AM": "アルメニア語 (アルメニア)", "ia": "インターリングア", + "ia_001": "インターリングア (世界)", "id": "インドネシア語", "id_ID": "インドネシア語 (インドネシア)", "ig": "イボ語", @@ -574,6 +580,7 @@ "xh": "コサ語", "xh_ZA": "コサ語 (南アフリカ)", "yi": "イディッシュ語", + "yi_001": "イディッシュ語 (世界)", "yo": "ヨルバ語", "yo_BJ": "ヨルバ語 (ベナン)", "yo_NG": "ヨルバ語 (ナイジェリア)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/jv.json b/src/Symfony/Component/Intl/Resources/data/locales/jv.json index 8e82f9945956c..74e0a60bd6543 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/jv.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/jv.json @@ -8,6 +8,7 @@ "am": "Amharik", "am_ET": "Amharik (Étiopia)", "ar": "Arab", + "ar_001": "Arab (Donya)", "ar_AE": "Arab (Uni Émirat Arab)", "ar_BH": "Arab (Bahrain)", "ar_DJ": "Arab (Jibuti)", @@ -91,6 +92,8 @@ "el_CY": "Yunani (Siprus)", "el_GR": "Yunani (Grikenlan)", "en": "Inggris", + "en_001": "Inggris (Donya)", + "en_150": "Inggris (Éropah)", "en_AE": "Inggris (Uni Émirat Arab)", "en_AG": "Inggris (Antigua lan Barbuda)", "en_AI": "Inggris (Anguilla)", @@ -192,7 +195,9 @@ "en_ZM": "Inggris (Sambia)", "en_ZW": "Inggris (Simbabwe)", "eo": "Esperanto", + "eo_001": "Esperanto (Donya)", "es": "Spanyol", + "es_419": "Spanyol (Amérika Latin)", "es_AR": "Spanyol (Argèntina)", "es_BO": "Spanyol (Bolivia)", "es_BR": "Spanyol (Brasil)", @@ -322,6 +327,7 @@ "hy": "Armenia", "hy_AM": "Armenia (Arménia)", "ia": "Interlingua", + "ia_001": "Interlingua (Donya)", "id": "Indonesia", "id_ID": "Indonesia (Indonésia)", "ig": "Iqbo", @@ -546,6 +552,7 @@ "xh": "Xhosa", "xh_ZA": "Xhosa (Afrika Kidul)", "yi": "Yiddish", + "yi_001": "Yiddish (Donya)", "yo": "Yoruba", "yo_BJ": "Yoruba (Bénin)", "yo_NG": "Yoruba (Nigéria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ka.json b/src/Symfony/Component/Intl/Resources/data/locales/ka.json index 79395cea9b794..1a29c80a5db2f 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ka.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ka.json @@ -8,6 +8,7 @@ "am": "ამჰარული", "am_ET": "ამჰარული (ეთიოპია)", "ar": "არაბული", + "ar_001": "არაბული (მსოფლიო)", "ar_AE": "არაბული (არაბთა გაერთიანებული საამიროები)", "ar_BH": "არაბული (ბაჰრეინი)", "ar_DJ": "არაბული (ჯიბუტი)", @@ -94,6 +95,8 @@ "el_CY": "ბერძნული (კვიპროსი)", "el_GR": "ბერძნული (საბერძნეთი)", "en": "ინგლისური", + "en_001": "ინგლისური (მსოფლიო)", + "en_150": "ინგლისური (ევროპა)", "en_AE": "ინგლისური (არაბთა გაერთიანებული საამიროები)", "en_AG": "ინგლისური (ანტიგუა და ბარბუდა)", "en_AI": "ინგლისური (ანგილია)", @@ -197,7 +200,9 @@ "en_ZM": "ინგლისური (ზამბია)", "en_ZW": "ინგლისური (ზიმბაბვე)", "eo": "ესპერანტო", + "eo_001": "ესპერანტო (მსოფლიო)", "es": "ესპანური", + "es_419": "ესპანური (ლათინური ამერიკა)", "es_AR": "ესპანური (არგენტინა)", "es_BO": "ესპანური (ბოლივია)", "es_BR": "ესპანური (ბრაზილია)", @@ -329,6 +334,7 @@ "hy": "სომხური", "hy_AM": "სომხური (სომხეთი)", "ia": "ინტერლინგუალური", + "ia_001": "ინტერლინგუალური (მსოფლიო)", "id": "ინდონეზიური", "id_ID": "ინდონეზიური (ინდონეზია)", "ig": "იგბო", @@ -572,6 +578,7 @@ "xh": "ქჰოსა", "xh_ZA": "ქჰოსა (სამხრეთ აფრიკის რესპუბლიკა)", "yi": "იდიში", + "yi_001": "იდიში (მსოფლიო)", "yo": "იორუბა", "yo_BJ": "იორუბა (ბენინი)", "yo_NG": "იორუბა (ნიგერია)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/kk.json b/src/Symfony/Component/Intl/Resources/data/locales/kk.json index 13dfd4a87742b..201c75725c8e9 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/kk.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/kk.json @@ -8,6 +8,7 @@ "am": "амхар тілі", "am_ET": "амхар тілі (Эфиопия)", "ar": "араб тілі", + "ar_001": "араб тілі (Әлем)", "ar_AE": "араб тілі (Біріккен Араб Әмірліктері)", "ar_BH": "араб тілі (Бахрейн)", "ar_DJ": "араб тілі (Джибути)", @@ -94,6 +95,8 @@ "el_CY": "грек тілі (Кипр)", "el_GR": "грек тілі (Грекия)", "en": "ағылшын тілі", + "en_001": "ағылшын тілі (Әлем)", + "en_150": "ағылшын тілі (Еуропа)", "en_AE": "ағылшын тілі (Біріккен Араб Әмірліктері)", "en_AG": "ағылшын тілі (Антигуа және Барбуда)", "en_AI": "ағылшын тілі (Ангилья)", @@ -197,7 +200,9 @@ "en_ZM": "ағылшын тілі (Замбия)", "en_ZW": "ағылшын тілі (Зимбабве)", "eo": "эсперанто тілі", + "eo_001": "эсперанто тілі (Әлем)", "es": "испан тілі", + "es_419": "испан тілі (Латын Америкасы)", "es_AR": "испан тілі (Аргентина)", "es_BO": "испан тілі (Боливия)", "es_BR": "испан тілі (Бразилия)", @@ -329,6 +334,7 @@ "hy": "армян тілі", "hy_AM": "армян тілі (Армения)", "ia": "интерлингва тілі", + "ia_001": "интерлингва тілі (Әлем)", "id": "индонезия тілі", "id_ID": "индонезия тілі (Индонезия)", "ig": "игбо тілі", @@ -572,6 +578,7 @@ "xh": "кхоса тілі", "xh_ZA": "кхоса тілі (Оңтүстік Африка Республикасы)", "yi": "идиш тілі", + "yi_001": "идиш тілі (Әлем)", "yo": "йоруба тілі", "yo_BJ": "йоруба тілі (Бенин)", "yo_NG": "йоруба тілі (Нигерия)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/km.json b/src/Symfony/Component/Intl/Resources/data/locales/km.json index 8f770789463ed..04fa86069ebf4 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/km.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/km.json @@ -8,6 +8,7 @@ "am": "អាំហារិក", "am_ET": "អាំហារិក (អេត្យូពី)", "ar": "អារ៉ាប់", + "ar_001": "អារ៉ាប់ (ពិភពលោក)", "ar_AE": "អារ៉ាប់ (អេមីរ៉ាត​អារ៉ាប់​រួម)", "ar_BH": "អារ៉ាប់ (បារ៉ែន)", "ar_DJ": "អារ៉ាប់ (ជីប៊ូទី)", @@ -94,6 +95,8 @@ "el_CY": "ក្រិក (ស៊ីប)", "el_GR": "ក្រិក (ក្រិក)", "en": "អង់គ្លេស", + "en_001": "អង់គ្លេស (ពិភពលោក)", + "en_150": "អង់គ្លេស (អឺរ៉ុប)", "en_AE": "អង់គ្លេស (អេមីរ៉ាត​អារ៉ាប់​រួម)", "en_AG": "អង់គ្លេស (អង់ទីហ្គា និង បាប៊ុយដា)", "en_AI": "អង់គ្លេស (អង់ហ្គីឡា)", @@ -197,7 +200,9 @@ "en_ZM": "អង់គ្លេស (សំប៊ី)", "en_ZW": "អង់គ្លេស (ស៊ីមបាវ៉េ)", "eo": "អេស្ពេរ៉ាន់តូ", + "eo_001": "អេស្ពេរ៉ាន់តូ (ពិភពលោក)", "es": "អេស្ប៉ាញ", + "es_419": "អេស្ប៉ាញ (អាមេរិក​ឡាទីន)", "es_AR": "អេស្ប៉ាញ (អាហ្សង់ទីន)", "es_BO": "អេស្ប៉ាញ (បូលីវី)", "es_BR": "អេស្ប៉ាញ (ប្រេស៊ីល)", @@ -329,6 +334,7 @@ "hy": "អាមេនី", "hy_AM": "អាមេនី (អាមេនី)", "ia": "អីនធើលីង", + "ia_001": "អីនធើលីង (ពិភពលោក)", "id": "ឥណ្ឌូណេស៊ី", "id_ID": "ឥណ្ឌូណេស៊ី (ឥណ្ឌូណេស៊ី)", "ig": "អ៊ីកបូ", @@ -572,6 +578,7 @@ "xh": "ឃសា", "xh_ZA": "ឃសា (អាហ្វ្រិកខាងត្បូង)", "yi": "យ៉ីឌីស", + "yi_001": "យ៉ីឌីស (ពិភពលោក)", "yo": "យរូបា", "yo_BJ": "យរូបា (បេណាំង)", "yo_NG": "យរូបា (នីហ្សេរីយ៉ា)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/kn.json b/src/Symfony/Component/Intl/Resources/data/locales/kn.json index d148b8a625d24..e5fc0b23cb254 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/kn.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/kn.json @@ -8,6 +8,7 @@ "am": "ಅಂಹರಿಕ್", "am_ET": "ಅಂಹರಿಕ್ (ಇಥಿಯೋಪಿಯಾ)", "ar": "ಅರೇಬಿಕ್", + "ar_001": "ಅರೇಬಿಕ್ (ಪ್ರಪಂಚ)", "ar_AE": "ಅರೇಬಿಕ್ (ಯುನೈಟೆಡ್ ಅರಬ್ ಎಮಿರೇಟ್ಸ್)", "ar_BH": "ಅರೇಬಿಕ್ (ಬಹ್ರೇನ್)", "ar_DJ": "ಅರೇಬಿಕ್ (ಜಿಬೂಟಿ)", @@ -94,6 +95,8 @@ "el_CY": "ಗ್ರೀಕ್ (ಸೈಪ್ರಸ್)", "el_GR": "ಗ್ರೀಕ್ (ಗ್ರೀಸ್)", "en": "ಇಂಗ್ಲಿಷ್", + "en_001": "ಇಂಗ್ಲಿಷ್ (ಪ್ರಪಂಚ)", + "en_150": "ಇಂಗ್ಲಿಷ್ (ಯೂರೋಪ್)", "en_AE": "ಇಂಗ್ಲಿಷ್ (ಯುನೈಟೆಡ್ ಅರಬ್ ಎಮಿರೇಟ್ಸ್)", "en_AG": "ಇಂಗ್ಲಿಷ್ (ಆಂಟಿಗುವಾ ಮತ್ತು ಬರ್ಬುಡಾ)", "en_AI": "ಇಂಗ್ಲಿಷ್ (ಆಂಗ್ವಿಲ್ಲಾ)", @@ -197,7 +200,9 @@ "en_ZM": "ಇಂಗ್ಲಿಷ್ (ಜಾಂಬಿಯ)", "en_ZW": "ಇಂಗ್ಲಿಷ್ (ಜಿಂಬಾಬ್ವೆ)", "eo": "ಎಸ್ಪೆರಾಂಟೊ", + "eo_001": "ಎಸ್ಪೆರಾಂಟೊ (ಪ್ರಪಂಚ)", "es": "ಸ್ಪ್ಯಾನಿಷ್", + "es_419": "ಸ್ಪ್ಯಾನಿಷ್ (ಲ್ಯಾಟಿನ್ ಅಮೇರಿಕಾ)", "es_AR": "ಸ್ಪ್ಯಾನಿಷ್ (ಅರ್ಜೆಂಟಿನಾ)", "es_BO": "ಸ್ಪ್ಯಾನಿಷ್ (ಬೊಲಿವಿಯಾ)", "es_BR": "ಸ್ಪ್ಯಾನಿಷ್ (ಬ್ರೆಜಿಲ್)", @@ -329,6 +334,7 @@ "hy": "ಅರ್ಮೇನಿಯನ್", "hy_AM": "ಅರ್ಮೇನಿಯನ್ (ಆರ್ಮೇನಿಯ)", "ia": "ಇಂಟರ್‌ಲಿಂಗ್ವಾ", + "ia_001": "ಇಂಟರ್‌ಲಿಂಗ್ವಾ (ಪ್ರಪಂಚ)", "id": "ಇಂಡೋನೇಶಿಯನ್", "id_ID": "ಇಂಡೋನೇಶಿಯನ್ (ಇಂಡೋನೇಶಿಯಾ)", "ig": "ಇಗ್ಬೊ", @@ -574,6 +580,7 @@ "xh": "ಕ್ಸೋಸ", "xh_ZA": "ಕ್ಸೋಸ (ದಕ್ಷಿಣ ಆಫ್ರಿಕಾ)", "yi": "ಯಿಡ್ಡಿಶ್", + "yi_001": "ಯಿಡ್ಡಿಶ್ (ಪ್ರಪಂಚ)", "yo": "ಯೊರುಬಾ", "yo_BJ": "ಯೊರುಬಾ (ಬೆನಿನ್)", "yo_NG": "ಯೊರುಬಾ (ನೈಜೀರಿಯಾ)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ko.json b/src/Symfony/Component/Intl/Resources/data/locales/ko.json index f5d60de53f896..d0d601a7ff01d 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ko.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ko.json @@ -8,6 +8,7 @@ "am": "암하라어", "am_ET": "암하라어(에티오피아)", "ar": "아랍어", + "ar_001": "아랍어(세계)", "ar_AE": "아랍어(아랍에미리트)", "ar_BH": "아랍어(바레인)", "ar_DJ": "아랍어(지부티)", @@ -94,6 +95,8 @@ "el_CY": "그리스어(키프로스)", "el_GR": "그리스어(그리스)", "en": "영어", + "en_001": "영어(세계)", + "en_150": "영어(유럽)", "en_AE": "영어(아랍에미리트)", "en_AG": "영어(앤티가 바부다)", "en_AI": "영어(앵귈라)", @@ -197,7 +200,9 @@ "en_ZM": "영어(잠비아)", "en_ZW": "영어(짐바브웨)", "eo": "에스페란토어", + "eo_001": "에스페란토어(세계)", "es": "스페인어", + "es_419": "스페인어(라틴 아메리카)", "es_AR": "스페인어(아르헨티나)", "es_BO": "스페인어(볼리비아)", "es_BR": "스페인어(브라질)", @@ -329,6 +334,7 @@ "hy": "아르메니아어", "hy_AM": "아르메니아어(아르메니아)", "ia": "인터링구아", + "ia_001": "인터링구아(세계)", "id": "인도네시아어", "id_ID": "인도네시아어(인도네시아)", "ig": "이그보어", @@ -574,6 +580,7 @@ "xh": "코사어", "xh_ZA": "코사어(남아프리카)", "yi": "이디시어", + "yi_001": "이디시어(세계)", "yo": "요루바어", "yo_BJ": "요루바어(베냉)", "yo_NG": "요루바어(나이지리아)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ks.json b/src/Symfony/Component/Intl/Resources/data/locales/ks.json index d76a8eaf9d357..6b94b25a9ca58 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ks.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ks.json @@ -8,6 +8,7 @@ "am": "اَمہاری", "am_ET": "اَمہاری (اِتھوپِیا)", "ar": "عربی", + "ar_001": "عربی (دُنیا)", "ar_AE": "عربی (مُتحدہ عرَب امارات)", "ar_BH": "عربی (بحریٖن)", "ar_DJ": "عربی (جِبوٗتی)", @@ -92,6 +93,8 @@ "el_CY": "یوٗنٲنی (سایفرس)", "el_GR": "یوٗنٲنی (گریٖس)", "en": "اَنگیٖزۍ", + "en_001": "اَنگیٖزۍ (دُنیا)", + "en_150": "اَنگیٖزۍ (یوٗرَپ)", "en_AE": "اَنگیٖزۍ (مُتحدہ عرَب امارات)", "en_AG": "اَنگیٖزۍ (اؠنٹِگُوا تہٕ باربوڑا)", "en_AI": "اَنگیٖزۍ (انگوئیلا)", @@ -192,7 +195,9 @@ "en_ZM": "اَنگیٖزۍ (جامبِیا)", "en_ZW": "اَنگیٖزۍ (زِمبابے)", "eo": "ایسپَرینٹو", + "eo_001": "ایسپَرینٹو (دُنیا)", "es": "سپینِش", + "es_419": "سپینِش (لاطیٖنی اَمریٖکا تہٕ کیرَبیٖن)", "es_AR": "سپینِش (أرجَنٹینا)", "es_BO": "سپینِش (بولِوِیا)", "es_BR": "سپینِش (برازِل)", @@ -323,6 +328,7 @@ "hy": "اَرمینیَن", "hy_AM": "اَرمینیَن (اَرمانِیا)", "ia": "اِنٹَرلِنگوا", + "ia_001": "اِنٹَرلِنگوا (دُنیا)", "id": "اِنڈونیشیا", "id_ID": "اِنڈونیشیا (اِنڑونیشِیا)", "ig": "اِگبو", @@ -562,6 +568,7 @@ "xh": "کھوسا", "xh_ZA": "کھوسا (جَنوٗبی اَفریٖکا)", "yi": "یِدِش", + "yi_001": "یِدِش (دُنیا)", "yo": "یورُبا", "yo_BJ": "یورُبا (بِنِن)", "yo_NG": "یورُبا (نایجیرِیا)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ku.json b/src/Symfony/Component/Intl/Resources/data/locales/ku.json index 7bd6ddbf684d6..7ac8d6de66944 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ku.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ku.json @@ -6,6 +6,7 @@ "am": "amharî", "am_ET": "amharî (Etiyopya)", "ar": "erebî", + "ar_001": "erebî (Cîhan)", "ar_AE": "erebî (Emîrtiyên Erebî yên Yekbûyî)", "ar_BH": "erebî (Behreyn)", "ar_DJ": "erebî (Cîbûtî)", @@ -92,6 +93,8 @@ "el_CY": "yewnanî (Kîpros)", "el_GR": "yewnanî (Yewnanistan)", "en": "îngilîzî", + "en_001": "îngilîzî (Cîhan)", + "en_150": "îngilîzî (Ewropa)", "en_AE": "îngilîzî (Emîrtiyên Erebî yên Yekbûyî)", "en_AG": "îngilîzî (Antîgua û Berbûda)", "en_AS": "îngilîzî (Samoaya Amerîkanî)", @@ -181,7 +184,9 @@ "en_ZM": "îngilîzî (Zambiya)", "en_ZW": "îngilîzî (Zîmbabwe)", "eo": "esperantoyî", + "eo_001": "esperantoyî (Cîhan)", "es": "spanî", + "es_419": "spanî (Amerîkaya Latînî)", "es_AR": "spanî (Arjentîn)", "es_BO": "spanî (Bolîvya)", "es_BR": "spanî (Brazîl)", @@ -312,6 +317,7 @@ "hy": "ermenî", "hy_AM": "ermenî (Ermenistan)", "ia": "interlingua", + "ia_001": "interlingua (Cîhan)", "id": "indonezî", "id_ID": "indonezî (Îndonezya)", "ig": "îgboyî", @@ -531,6 +537,7 @@ "xh": "xosayî", "xh_ZA": "xosayî (Afrîkaya Başûr)", "yi": "yidîşî", + "yi_001": "yidîşî (Cîhan)", "yo": "yorubayî", "yo_BJ": "yorubayî (Bênîn)", "yo_NG": "yorubayî (Nîjerya)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ky.json b/src/Symfony/Component/Intl/Resources/data/locales/ky.json index ac261c511ee51..d9730ffb818cb 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ky.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ky.json @@ -8,6 +8,7 @@ "am": "амхарча", "am_ET": "амхарча (Эфиопия)", "ar": "арабча", + "ar_001": "арабча (Дүйнө)", "ar_AE": "арабча (Бириккен Араб Эмираттары)", "ar_BH": "арабча (Бахрейн)", "ar_DJ": "арабча (Джибути)", @@ -94,6 +95,8 @@ "el_CY": "грекче (Кипр)", "el_GR": "грекче (Греция)", "en": "англисче", + "en_001": "англисче (Дүйнө)", + "en_150": "англисче (Европа)", "en_AE": "англисче (Бириккен Араб Эмираттары)", "en_AG": "англисче (Антигуа жана Барбуда)", "en_AI": "англисче (Ангилья)", @@ -197,7 +200,9 @@ "en_ZM": "англисче (Замбия)", "en_ZW": "англисче (Зимбабве)", "eo": "эсперанто", + "eo_001": "эсперанто (Дүйнө)", "es": "испанча", + "es_419": "испанча (Латын Америкасы)", "es_AR": "испанча (Аргентина)", "es_BO": "испанча (Боливия)", "es_BR": "испанча (Бразилия)", @@ -329,6 +334,7 @@ "hy": "армянча", "hy_AM": "армянча (Армения)", "ia": "интерлингва", + "ia_001": "интерлингва (Дүйнө)", "id": "индонезияча", "id_ID": "индонезияча (Индонезия)", "ig": "игбочо", @@ -572,6 +578,7 @@ "xh": "косача", "xh_ZA": "косача (Түштүк-Африка Республикасы)", "yi": "идишче", + "yi_001": "идишче (Дүйнө)", "yo": "йорубача", "yo_BJ": "йорубача (Бенин)", "yo_NG": "йорубача (Нигерия)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/lb.json b/src/Symfony/Component/Intl/Resources/data/locales/lb.json index 4e5d1a77037d4..85b901b8fe323 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/lb.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/lb.json @@ -8,6 +8,7 @@ "am": "Amharesch", "am_ET": "Amharesch (Ethiopien)", "ar": "Arabesch", + "ar_001": "Arabesch (Welt)", "ar_AE": "Arabesch (Vereenegt Arabesch Emirater)", "ar_BH": "Arabesch (Bahrain)", "ar_DJ": "Arabesch (Dschibuti)", @@ -94,6 +95,8 @@ "el_CY": "Griichesch (Zypern)", "el_GR": "Griichesch (Griicheland)", "en": "Englesch", + "en_001": "Englesch (Welt)", + "en_150": "Englesch (Europa)", "en_AE": "Englesch (Vereenegt Arabesch Emirater)", "en_AG": "Englesch (Antigua a Barbuda)", "en_AI": "Englesch (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "Englesch (Sambia)", "en_ZW": "Englesch (Simbabwe)", "eo": "Esperanto", + "eo_001": "Esperanto (Welt)", "es": "Spuenesch", + "es_419": "Spuenesch (Latäinamerika)", "es_AR": "Spuenesch (Argentinien)", "es_BO": "Spuenesch (Bolivien)", "es_BR": "Spuenesch (Brasilien)", @@ -329,6 +334,7 @@ "hy": "Armenesch", "hy_AM": "Armenesch (Armenien)", "ia": "Interlingua", + "ia_001": "Interlingua (Welt)", "id": "Indonesesch", "id_ID": "Indonesesch (Indonesien)", "ig": "Igbo-Sprooch", @@ -574,6 +580,7 @@ "xh": "Xhosa", "xh_ZA": "Xhosa (Südafrika)", "yi": "Jiddesch", + "yi_001": "Jiddesch (Welt)", "yo": "Yoruba", "yo_BJ": "Yoruba (Benin)", "yo_NG": "Yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/lo.json b/src/Symfony/Component/Intl/Resources/data/locales/lo.json index 9d553156a190a..8082140a2648e 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/lo.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/lo.json @@ -8,6 +8,7 @@ "am": "ອຳຮາຣິກ", "am_ET": "ອຳຮາຣິກ (ອີທິໂອເປຍ)", "ar": "ອາຣັບ", + "ar_001": "ອາຣັບ (ໂລກ)", "ar_AE": "ອາຣັບ (ສະຫະລັດອາຣັບເອມິເຣດ)", "ar_BH": "ອາຣັບ (ບາເຣນ)", "ar_DJ": "ອາຣັບ (ຈິບູຕິ)", @@ -94,6 +95,8 @@ "el_CY": "ກຣີກ (ໄຊປຣັສ)", "el_GR": "ກຣີກ (ກຣີຊ)", "en": "ອັງກິດ", + "en_001": "ອັງກິດ (ໂລກ)", + "en_150": "ອັງກິດ (ຢູໂຣບ)", "en_AE": "ອັງກິດ (ສະຫະລັດອາຣັບເອມິເຣດ)", "en_AG": "ອັງກິດ (ແອນທິກົວ ແລະ ບາບູດາ)", "en_AI": "ອັງກິດ (ແອນກຸຍລາ)", @@ -197,7 +200,9 @@ "en_ZM": "ອັງກິດ (ແຊມເບຍ)", "en_ZW": "ອັງກິດ (ຊິມບັບເວ)", "eo": "ເອສປາຍ", + "eo_001": "ເອສປາຍ (ໂລກ)", "es": "ສະແປນນິຊ", + "es_419": "ສະແປນນິຊ (ລາຕິນ ອາເມລິກາ)", "es_AR": "ສະແປນນິຊ (ອາເຈນທິນາ)", "es_BO": "ສະແປນນິຊ (ໂບລິເວຍ)", "es_BR": "ສະແປນນິຊ (ບຣາຊິວ)", @@ -329,6 +334,7 @@ "hy": "ອາເມນຽນ", "hy_AM": "ອາເມນຽນ (ອາເມເນຍ)", "ia": "ອິນເຕີລິງລົວ", + "ia_001": "ອິນເຕີລິງລົວ (ໂລກ)", "id": "ອິນໂດເນຊຽນ", "id_ID": "ອິນໂດເນຊຽນ (ອິນໂດເນເຊຍ)", "ig": "ອິກໂບ", @@ -574,6 +580,7 @@ "xh": "ໂຮຊາ", "xh_ZA": "ໂຮຊາ (ອາຟຣິກາໃຕ້)", "yi": "ຢິວ", + "yi_001": "ຢິວ (ໂລກ)", "yo": "ໂຢຣູບາ", "yo_BJ": "ໂຢຣູບາ (ເບນິນ)", "yo_NG": "ໂຢຣູບາ (ໄນຈີເຣຍ)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/lt.json b/src/Symfony/Component/Intl/Resources/data/locales/lt.json index 12dc112119e9c..ac060fcdbf0d9 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/lt.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/lt.json @@ -8,6 +8,7 @@ "am": "amharų", "am_ET": "amharų (Etiopija)", "ar": "arabų", + "ar_001": "arabų (pasaulis)", "ar_AE": "arabų (Jungtiniai Arabų Emyratai)", "ar_BH": "arabų (Bahreinas)", "ar_DJ": "arabų (Džibutis)", @@ -94,6 +95,8 @@ "el_CY": "graikų (Kipras)", "el_GR": "graikų (Graikija)", "en": "anglų", + "en_001": "anglų (pasaulis)", + "en_150": "anglų (Europa)", "en_AE": "anglų (Jungtiniai Arabų Emyratai)", "en_AG": "anglų (Antigva ir Barbuda)", "en_AI": "anglų (Angilija)", @@ -197,7 +200,9 @@ "en_ZM": "anglų (Zambija)", "en_ZW": "anglų (Zimbabvė)", "eo": "esperanto", + "eo_001": "esperanto (pasaulis)", "es": "ispanų", + "es_419": "ispanų (Lotynų Amerika)", "es_AR": "ispanų (Argentina)", "es_BO": "ispanų (Bolivija)", "es_BR": "ispanų (Brazilija)", @@ -329,6 +334,7 @@ "hy": "armėnų", "hy_AM": "armėnų (Armėnija)", "ia": "tarpinė", + "ia_001": "tarpinė (pasaulis)", "id": "indoneziečių", "id_ID": "indoneziečių (Indonezija)", "ig": "igbų", @@ -574,6 +580,7 @@ "xh": "kosų", "xh_ZA": "kosų (Pietų Afrika)", "yi": "jidiš", + "yi_001": "jidiš (pasaulis)", "yo": "jorubų", "yo_BJ": "jorubų (Beninas)", "yo_NG": "jorubų (Nigerija)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/lv.json b/src/Symfony/Component/Intl/Resources/data/locales/lv.json index b092a309182f0..a1b684ef03d99 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/lv.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/lv.json @@ -8,6 +8,7 @@ "am": "amharu", "am_ET": "amharu (Etiopija)", "ar": "arābu", + "ar_001": "arābu (pasaule)", "ar_AE": "arābu (Apvienotie Arābu Emirāti)", "ar_BH": "arābu (Bahreina)", "ar_DJ": "arābu (Džibutija)", @@ -94,6 +95,8 @@ "el_CY": "grieķu (Kipra)", "el_GR": "grieķu (Grieķija)", "en": "angļu", + "en_001": "angļu (pasaule)", + "en_150": "angļu (Eiropa)", "en_AE": "angļu (Apvienotie Arābu Emirāti)", "en_AG": "angļu (Antigva un Barbuda)", "en_AI": "angļu (Angilja)", @@ -197,7 +200,9 @@ "en_ZM": "angļu (Zambija)", "en_ZW": "angļu (Zimbabve)", "eo": "esperanto", + "eo_001": "esperanto (pasaule)", "es": "spāņu", + "es_419": "spāņu (Latīņamerika)", "es_AR": "spāņu (Argentīna)", "es_BO": "spāņu (Bolīvija)", "es_BR": "spāņu (Brazīlija)", @@ -329,6 +334,7 @@ "hy": "armēņu", "hy_AM": "armēņu (Armēnija)", "ia": "interlingva", + "ia_001": "interlingva (pasaule)", "id": "indonēziešu", "id_ID": "indonēziešu (Indonēzija)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "khosu", "xh_ZA": "khosu (Dienvidāfrikas Republika)", "yi": "jidišs", + "yi_001": "jidišs (pasaule)", "yo": "jorubu", "yo_BJ": "jorubu (Benina)", "yo_NG": "jorubu (Nigērija)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/mk.json b/src/Symfony/Component/Intl/Resources/data/locales/mk.json index 4e61575e7b986..2263bc903758c 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/mk.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/mk.json @@ -8,6 +8,7 @@ "am": "амхарски", "am_ET": "амхарски (Етиопија)", "ar": "арапски", + "ar_001": "арапски (Свет)", "ar_AE": "арапски (Обединети Арапски Емирати)", "ar_BH": "арапски (Бахреин)", "ar_DJ": "арапски (Џибути)", @@ -94,6 +95,8 @@ "el_CY": "грчки (Кипар)", "el_GR": "грчки (Грција)", "en": "англиски", + "en_001": "англиски (Свет)", + "en_150": "англиски (Европа)", "en_AE": "англиски (Обединети Арапски Емирати)", "en_AG": "англиски (Антига и Барбуда)", "en_AI": "англиски (Ангвила)", @@ -197,7 +200,9 @@ "en_ZM": "англиски (Замбија)", "en_ZW": "англиски (Зимбабве)", "eo": "есперанто", + "eo_001": "есперанто (Свет)", "es": "шпански", + "es_419": "шпански (Латинска Америка)", "es_AR": "шпански (Аргентина)", "es_BO": "шпански (Боливија)", "es_BR": "шпански (Бразил)", @@ -329,6 +334,7 @@ "hy": "ерменски", "hy_AM": "ерменски (Ерменија)", "ia": "интерлингва", + "ia_001": "интерлингва (Свет)", "id": "индонезиски", "id_ID": "индонезиски (Индонезија)", "ig": "игбо", @@ -574,6 +580,7 @@ "xh": "коса", "xh_ZA": "коса (Јужноафриканска Република)", "yi": "јидиш", + "yi_001": "јидиш (Свет)", "yo": "јорупски", "yo_BJ": "јорупски (Бенин)", "yo_NG": "јорупски (Нигерија)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ml.json b/src/Symfony/Component/Intl/Resources/data/locales/ml.json index 51e32bd3ac65a..78aa26cdc567c 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ml.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ml.json @@ -8,6 +8,7 @@ "am": "അംഹാരിക്", "am_ET": "അംഹാരിക് (എത്യോപ്യ)", "ar": "അറബിക്", + "ar_001": "അറബിക് (ലോകം)", "ar_AE": "അറബിക് (യുണൈറ്റഡ് അറബ് എമിറൈറ്റ്‌സ്)", "ar_BH": "അറബിക് (ബഹ്റിൻ)", "ar_DJ": "അറബിക് (ജിബൂത്തി)", @@ -94,6 +95,8 @@ "el_CY": "ഗ്രീക്ക് (സൈപ്രസ്)", "el_GR": "ഗ്രീക്ക് (ഗ്രീസ്)", "en": "ഇംഗ്ലീഷ്", + "en_001": "ഇംഗ്ലീഷ് (ലോകം)", + "en_150": "ഇംഗ്ലീഷ് (യൂറോപ്പ്)", "en_AE": "ഇംഗ്ലീഷ് (യുണൈറ്റഡ് അറബ് എമിറൈറ്റ്‌സ്)", "en_AG": "ഇംഗ്ലീഷ് (ആൻറിഗ്വയും ബർബുഡയും)", "en_AI": "ഇംഗ്ലീഷ് (ആൻഗ്വില്ല)", @@ -197,7 +200,9 @@ "en_ZM": "ഇംഗ്ലീഷ് (സാംബിയ)", "en_ZW": "ഇംഗ്ലീഷ് (സിംബാബ്‌വേ)", "eo": "എസ്‌പരാന്റോ", + "eo_001": "എസ്‌പരാന്റോ (ലോകം)", "es": "സ്‌പാനിഷ്", + "es_419": "സ്‌പാനിഷ് (ലാറ്റിനമേരിക്ക)", "es_AR": "സ്‌പാനിഷ് (അർജന്റീന)", "es_BO": "സ്‌പാനിഷ് (ബൊളീവിയ)", "es_BR": "സ്‌പാനിഷ് (ബ്രസീൽ)", @@ -329,6 +334,7 @@ "hy": "അർമേനിയൻ", "hy_AM": "അർമേനിയൻ (അർമേനിയ)", "ia": "ഇന്റർലിംഗ്വ", + "ia_001": "ഇന്റർലിംഗ്വ (ലോകം)", "id": "ഇന്തോനേഷ്യൻ", "id_ID": "ഇന്തോനേഷ്യൻ (ഇന്തോനേഷ്യ)", "ig": "ഇഗ്ബോ", @@ -574,6 +580,7 @@ "xh": "ഖോസ", "xh_ZA": "ഖോസ (ദക്ഷിണാഫ്രിക്ക)", "yi": "യിദ്ദിഷ്", + "yi_001": "യിദ്ദിഷ് (ലോകം)", "yo": "യൊറൂബാ", "yo_BJ": "യൊറൂബാ (ബെനിൻ)", "yo_NG": "യൊറൂബാ (നൈജീരിയ)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/mn.json b/src/Symfony/Component/Intl/Resources/data/locales/mn.json index 8f2c94e1e0481..777f83087cbb6 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/mn.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/mn.json @@ -8,6 +8,7 @@ "am": "амхар", "am_ET": "амхар (Этиоп)", "ar": "араб", + "ar_001": "араб (Дэлхий)", "ar_AE": "араб (Арабын Нэгдсэн Эмирт Улс)", "ar_BH": "араб (Бахрейн)", "ar_DJ": "араб (Джибути)", @@ -94,6 +95,8 @@ "el_CY": "грек (Кипр)", "el_GR": "грек (Грек)", "en": "англи", + "en_001": "англи (Дэлхий)", + "en_150": "англи (Европ)", "en_AE": "англи (Арабын Нэгдсэн Эмирт Улс)", "en_AG": "англи (Антигуа ба Барбуда)", "en_AI": "англи (Ангилья)", @@ -197,7 +200,9 @@ "en_ZM": "англи (Замби)", "en_ZW": "англи (Зимбабве)", "eo": "эсперанто", + "eo_001": "эсперанто (Дэлхий)", "es": "испани", + "es_419": "испани (Латин Америк)", "es_AR": "испани (Аргентин)", "es_BO": "испани (Боливи)", "es_BR": "испани (Бразил)", @@ -329,6 +334,7 @@ "hy": "армен", "hy_AM": "армен (Армени)", "ia": "интерлингво", + "ia_001": "интерлингво (Дэлхий)", "id": "индонези", "id_ID": "индонези (Индонез)", "ig": "игбо", @@ -572,6 +578,7 @@ "xh": "хоса", "xh_ZA": "хоса (Өмнөд Африк)", "yi": "иддиш", + "yi_001": "иддиш (Дэлхий)", "yo": "ёруба", "yo_BJ": "ёруба (Бенин)", "yo_NG": "ёруба (Нигери)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/mr.json b/src/Symfony/Component/Intl/Resources/data/locales/mr.json index 7bef3374099cf..1e3c0c4920925 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/mr.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/mr.json @@ -8,6 +8,7 @@ "am": "अम्हारिक", "am_ET": "अम्हारिक (इथिओपिया)", "ar": "अरबी", + "ar_001": "अरबी (विश्व)", "ar_AE": "अरबी (संयुक्त अरब अमीरात)", "ar_BH": "अरबी (बहारीन)", "ar_DJ": "अरबी (जिबौटी)", @@ -94,6 +95,8 @@ "el_CY": "ग्रीक (सायप्रस)", "el_GR": "ग्रीक (ग्रीस)", "en": "इंग्रजी", + "en_001": "इंग्रजी (विश्व)", + "en_150": "इंग्रजी (युरोप)", "en_AE": "इंग्रजी (संयुक्त अरब अमीरात)", "en_AG": "इंग्रजी (अँटिग्वा आणि बर्बुडा)", "en_AI": "इंग्रजी (अँग्विला)", @@ -197,7 +200,9 @@ "en_ZM": "इंग्रजी (झाम्बिया)", "en_ZW": "इंग्रजी (झिम्बाब्वे)", "eo": "एस्परान्टो", + "eo_001": "एस्परान्टो (विश्व)", "es": "स्पॅनिश", + "es_419": "स्पॅनिश (लॅटिन अमेरिका)", "es_AR": "स्पॅनिश (अर्जेंटिना)", "es_BO": "स्पॅनिश (बोलिव्हिया)", "es_BR": "स्पॅनिश (ब्राझिल)", @@ -329,6 +334,7 @@ "hy": "आर्मेनियन", "hy_AM": "आर्मेनियन (अर्मेनिया)", "ia": "इंटरलिंग्वा", + "ia_001": "इंटरलिंग्वा (विश्व)", "id": "इंडोनेशियन", "id_ID": "इंडोनेशियन (इंडोनेशिया)", "ig": "ईग्बो", @@ -574,6 +580,7 @@ "xh": "खोसा", "xh_ZA": "खोसा (दक्षिण आफ्रिका)", "yi": "यिद्दिश", + "yi_001": "यिद्दिश (विश्व)", "yo": "योरुबा", "yo_BJ": "योरुबा (बेनिन)", "yo_NG": "योरुबा (नायजेरिया)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ms.json b/src/Symfony/Component/Intl/Resources/data/locales/ms.json index a9ae96772d375..7d17d4cbc6920 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ms.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ms.json @@ -8,6 +8,7 @@ "am": "Amharic", "am_ET": "Amharic (Ethiopia)", "ar": "Arab", + "ar_001": "Arab (Dunia)", "ar_AE": "Arab (Emiriah Arab Bersatu)", "ar_BH": "Arab (Bahrain)", "ar_DJ": "Arab (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "Greek (Cyprus)", "el_GR": "Greek (Greece)", "en": "Inggeris", + "en_001": "Inggeris (Dunia)", + "en_150": "Inggeris (Eropah)", "en_AE": "Inggeris (Emiriah Arab Bersatu)", "en_AG": "Inggeris (Antigua dan Barbuda)", "en_AI": "Inggeris (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "Inggeris (Zambia)", "en_ZW": "Inggeris (Zimbabwe)", "eo": "Esperanto", + "eo_001": "Esperanto (Dunia)", "es": "Sepanyol", + "es_419": "Sepanyol (Amerika Latin)", "es_AR": "Sepanyol (Argentina)", "es_BO": "Sepanyol (Bolivia)", "es_BR": "Sepanyol (Brazil)", @@ -329,6 +334,7 @@ "hy": "Armenia", "hy_AM": "Armenia (Armenia)", "ia": "Interlingua", + "ia_001": "Interlingua (Dunia)", "id": "Indonesia", "id_ID": "Indonesia (Indonesia)", "ig": "Igbo", @@ -572,6 +578,7 @@ "xh": "Xhosa", "xh_ZA": "Xhosa (Afrika Selatan)", "yi": "Yiddish", + "yi_001": "Yiddish (Dunia)", "yo": "Yoruba", "yo_BJ": "Yoruba (Benin)", "yo_NG": "Yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/mt.json b/src/Symfony/Component/Intl/Resources/data/locales/mt.json index ec0e8975b3ecf..348cac79aa9fa 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/mt.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/mt.json @@ -8,6 +8,7 @@ "am": "Amhariku", "am_ET": "Amhariku (l-Etjopja)", "ar": "Għarbi", + "ar_001": "Għarbi (Dinja)", "ar_AE": "Għarbi (l-Emirati Għarab Magħquda)", "ar_BH": "Għarbi (il-Bahrain)", "ar_DJ": "Għarbi (il-Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "Grieg (Ċipru)", "el_GR": "Grieg (il-Greċja)", "en": "Ingliż", + "en_001": "Ingliż (Dinja)", + "en_150": "Ingliż (Ewropa)", "en_AE": "Ingliż (l-Emirati Għarab Magħquda)", "en_AG": "Ingliż (Antigua u Barbuda)", "en_AI": "Ingliż (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "Ingliż (iż-Żambja)", "en_ZW": "Ingliż (iż-Żimbabwe)", "eo": "Esperanto", + "eo_001": "Esperanto (Dinja)", "es": "Spanjol", + "es_419": "Spanjol (Amerika Latina)", "es_AR": "Spanjol (l-Arġentina)", "es_BO": "Spanjol (il-Bolivja)", "es_BR": "Spanjol (Il-Brażil)", @@ -329,6 +334,7 @@ "hy": "Armen", "hy_AM": "Armen (l-Armenja)", "ia": "Interlingua", + "ia_001": "Interlingua (Dinja)", "id": "Indoneżjan", "id_ID": "Indoneżjan (l-Indoneżja)", "ig": "Igbo", @@ -572,6 +578,7 @@ "xh": "Xhosa", "xh_ZA": "Xhosa (l-Afrika t’Isfel)", "yi": "Yiddish", + "yi_001": "Yiddish (Dinja)", "yo": "Yoruba", "yo_BJ": "Yoruba (il-Benin)", "yo_NG": "Yoruba (in-Niġerja)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/my.json b/src/Symfony/Component/Intl/Resources/data/locales/my.json index 4ddbbff928e59..2c68ea7d7b1af 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/my.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/my.json @@ -8,6 +8,7 @@ "am": "အမ်ဟာရစ်ခ်", "am_ET": "အမ်ဟာရစ်ခ် (အီသီယိုးပီးယား)", "ar": "အာရဗီ", + "ar_001": "အာရဗီ (ကမ္ဘာ)", "ar_AE": "အာရဗီ (ယူအေအီး)", "ar_BH": "အာရဗီ (ဘာရိန်း)", "ar_DJ": "အာရဗီ (ဂျီဘူတီ)", @@ -94,6 +95,8 @@ "el_CY": "ဂရိ (ဆိုက်ပရပ်စ်)", "el_GR": "ဂရိ (ဂရိ)", "en": "အင်္ဂလိပ်", + "en_001": "အင်္ဂလိပ် (ကမ္ဘာ)", + "en_150": "အင်္ဂလိပ် (ဥရောပ)", "en_AE": "အင်္ဂလိပ် (ယူအေအီး)", "en_AG": "အင်္ဂလိပ် (အန်တီဂွါနှင့် ဘာဘူဒါ)", "en_AI": "အင်္ဂလိပ် (အန်ဂီလာ)", @@ -197,7 +200,9 @@ "en_ZM": "အင်္ဂလိပ် (ဇမ်ဘီယာ)", "en_ZW": "အင်္ဂလိပ် (ဇင်ဘာဘွေ)", "eo": "အက်စ်ပရန်တို", + "eo_001": "အက်စ်ပရန်တို (ကမ္ဘာ)", "es": "စပိန်", + "es_419": "စပိန် (လက်တင်အမေရိက)", "es_AR": "စပိန် (အာဂျင်တီးနား)", "es_BO": "စပိန် (ဘိုလီးဗီးယား)", "es_BR": "စပိန် (ဘရာဇီး)", @@ -329,6 +334,7 @@ "hy": "အာမေးနီးယား", "hy_AM": "အာမေးနီးယား (အာမေးနီးယား)", "ia": "အင်တာလင်ဂွါ", + "ia_001": "အင်တာလင်ဂွါ (ကမ္ဘာ)", "id": "အင်ဒိုနီးရှား", "id_ID": "အင်ဒိုနီးရှား (အင်ဒိုနီးရှား)", "ig": "အစ္ဂဘို", @@ -570,6 +576,7 @@ "xh": "ဇိုစာ", "xh_ZA": "ဇိုစာ (တောင်အာဖရိက)", "yi": "ဂျူး", + "yi_001": "ဂျူး (ကမ္ဘာ)", "yo": "ယိုရူဘာ", "yo_BJ": "ယိုရူဘာ (ဘီနင်)", "yo_NG": "ယိုရူဘာ (နိုင်ဂျီးရီးယား)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/nb.json b/src/Symfony/Component/Intl/Resources/data/locales/nb.json index dcaa0e3541aae..10053435d89b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/nb.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/nb.json @@ -8,6 +8,7 @@ "am": "amharisk", "am_ET": "amharisk (Etiopia)", "ar": "arabisk", + "ar_001": "arabisk (verden)", "ar_AE": "arabisk (De forente arabiske emirater)", "ar_BH": "arabisk (Bahrain)", "ar_DJ": "arabisk (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "gresk (Kypros)", "el_GR": "gresk (Hellas)", "en": "engelsk", + "en_001": "engelsk (verden)", + "en_150": "engelsk (Europa)", "en_AE": "engelsk (De forente arabiske emirater)", "en_AG": "engelsk (Antigua og Barbuda)", "en_AI": "engelsk (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "engelsk (Zambia)", "en_ZW": "engelsk (Zimbabwe)", "eo": "esperanto", + "eo_001": "esperanto (verden)", "es": "spansk", + "es_419": "spansk (Latin-Amerika)", "es_AR": "spansk (Argentina)", "es_BO": "spansk (Bolivia)", "es_BR": "spansk (Brasil)", @@ -329,6 +334,7 @@ "hy": "armensk", "hy_AM": "armensk (Armenia)", "ia": "interlingua", + "ia_001": "interlingua (verden)", "id": "indonesisk", "id_ID": "indonesisk (Indonesia)", "ig": "ibo", @@ -574,6 +580,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (Sør-Afrika)", "yi": "jiddisk", + "yi_001": "jiddisk (verden)", "yo": "joruba", "yo_BJ": "joruba (Benin)", "yo_NG": "joruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ne.json b/src/Symfony/Component/Intl/Resources/data/locales/ne.json index c17f14a5233f4..fc2c93cda56c2 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ne.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ne.json @@ -8,6 +8,7 @@ "am": "अम्हारिक", "am_ET": "अम्हारिक (इथियोपिया)", "ar": "अरबी", + "ar_001": "अरबी (विश्व)", "ar_AE": "अरबी (संयुक्त अरब इमिराट्स)", "ar_BH": "अरबी (बहराइन)", "ar_DJ": "अरबी (डिजिबुटी)", @@ -94,6 +95,8 @@ "el_CY": "ग्रीक (साइप्रस)", "el_GR": "ग्रीक (ग्रीस)", "en": "अङ्ग्रेजी", + "en_001": "अङ्ग्रेजी (विश्व)", + "en_150": "अङ्ग्रेजी (युरोप)", "en_AE": "अङ्ग्रेजी (संयुक्त अरब इमिराट्स)", "en_AG": "अङ्ग्रेजी (एन्टिगुआ र बारबुडा)", "en_AI": "अङ्ग्रेजी (आङ्गुइला)", @@ -197,7 +200,9 @@ "en_ZM": "अङ्ग्रेजी (जाम्बिया)", "en_ZW": "अङ्ग्रेजी (जिम्बाबवे)", "eo": "एस्पेरान्तो", + "eo_001": "एस्पेरान्तो (विश्व)", "es": "स्पेनी", + "es_419": "स्पेनी (ल्याटिन अमेरिका)", "es_AR": "स्पेनी (अर्जेन्टिना)", "es_BO": "स्पेनी (बोलिभिया)", "es_BR": "स्पेनी (ब्राजिल)", @@ -329,6 +334,7 @@ "hy": "आर्मेनियाली", "hy_AM": "आर्मेनियाली (आर्मेनिया)", "ia": "इन्टर्लिङ्गुआ", + "ia_001": "इन्टर्लिङ्गुआ (विश्व)", "id": "इन्डोनेसियाली", "id_ID": "इन्डोनेसियाली (इन्डोनेशिया)", "ig": "इग्बो", @@ -570,6 +576,7 @@ "xh": "खोसा", "xh_ZA": "खोसा (दक्षिण अफ्रिका)", "yi": "यिद्दिस", + "yi_001": "यिद्दिस (विश्व)", "yo": "योरूवा", "yo_BJ": "योरूवा (बेनिन)", "yo_NG": "योरूवा (नाइजेरिया)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/nl.json b/src/Symfony/Component/Intl/Resources/data/locales/nl.json index c96110ad1744e..3cfdadd79de15 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/nl.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/nl.json @@ -8,6 +8,7 @@ "am": "Amhaars", "am_ET": "Amhaars (Ethiopië)", "ar": "Arabisch", + "ar_001": "Arabisch (wereld)", "ar_AE": "Arabisch (Verenigde Arabische Emiraten)", "ar_BH": "Arabisch (Bahrein)", "ar_DJ": "Arabisch (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "Grieks (Cyprus)", "el_GR": "Grieks (Griekenland)", "en": "Engels", + "en_001": "Engels (wereld)", + "en_150": "Engels (Europa)", "en_AE": "Engels (Verenigde Arabische Emiraten)", "en_AG": "Engels (Antigua en Barbuda)", "en_AI": "Engels (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "Engels (Zambia)", "en_ZW": "Engels (Zimbabwe)", "eo": "Esperanto", + "eo_001": "Esperanto (wereld)", "es": "Spaans", + "es_419": "Spaans (Latijns-Amerika)", "es_AR": "Spaans (Argentinië)", "es_BO": "Spaans (Bolivia)", "es_BR": "Spaans (Brazilië)", @@ -329,6 +334,7 @@ "hy": "Armeens", "hy_AM": "Armeens (Armenië)", "ia": "Interlingua", + "ia_001": "Interlingua (wereld)", "id": "Indonesisch", "id_ID": "Indonesisch (Indonesië)", "ig": "Igbo", @@ -574,6 +580,7 @@ "xh": "Xhosa", "xh_ZA": "Xhosa (Zuid-Afrika)", "yi": "Jiddisch", + "yi_001": "Jiddisch (wereld)", "yo": "Yoruba", "yo_BJ": "Yoruba (Benin)", "yo_NG": "Yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/nn.json b/src/Symfony/Component/Intl/Resources/data/locales/nn.json index 45ce3ac2da6f8..1d5b7696622a8 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/nn.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/nn.json @@ -8,6 +8,7 @@ "am": "amharisk", "am_ET": "amharisk (Etiopia)", "ar": "arabisk", + "ar_001": "arabisk (verda)", "ar_AE": "arabisk (Dei sameinte arabiske emirata)", "ar_BH": "arabisk (Bahrain)", "ar_DJ": "arabisk (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "gresk (Kypros)", "el_GR": "gresk (Hellas)", "en": "engelsk", + "en_001": "engelsk (verda)", + "en_150": "engelsk (Europa)", "en_AE": "engelsk (Dei sameinte arabiske emirata)", "en_AG": "engelsk (Antigua og Barbuda)", "en_AI": "engelsk (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "engelsk (Zambia)", "en_ZW": "engelsk (Zimbabwe)", "eo": "esperanto", + "eo_001": "esperanto (verda)", "es": "spansk", + "es_419": "spansk (Latin-Amerika)", "es_AR": "spansk (Argentina)", "es_BO": "spansk (Bolivia)", "es_BR": "spansk (Brasil)", @@ -329,6 +334,7 @@ "hy": "armensk", "hy_AM": "armensk (Armenia)", "ia": "interlingua", + "ia_001": "interlingua (verda)", "id": "indonesisk", "id_ID": "indonesisk (Indonesia)", "ig": "ibo", @@ -574,6 +580,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (Sør-Afrika)", "yi": "jiddisk", + "yi_001": "jiddisk (verda)", "yo": "joruba", "yo_BJ": "joruba (Benin)", "yo_NG": "joruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/or.json b/src/Symfony/Component/Intl/Resources/data/locales/or.json index 73d79022592b0..f33fd08875250 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/or.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/or.json @@ -8,6 +8,7 @@ "am": "ଆମହାରକି", "am_ET": "ଆମହାରକି (ଇଥିଓପିଆ)", "ar": "ଆରବିକ୍", + "ar_001": "ଆରବିକ୍ (ବିଶ୍ୱ)", "ar_AE": "ଆରବିକ୍ (ସଂଯୁକ୍ତ ଆରବ ଏମିରେଟସ୍)", "ar_BH": "ଆରବିକ୍ (ବାହାରିନ୍)", "ar_DJ": "ଆରବିକ୍ (ଜିବୋଟି)", @@ -94,6 +95,8 @@ "el_CY": "ଗ୍ରୀକ୍ (ସାଇପ୍ରସ୍)", "el_GR": "ଗ୍ରୀକ୍ (ଗ୍ରୀସ୍)", "en": "ଇଂରାଜୀ", + "en_001": "ଇଂରାଜୀ (ବିଶ୍ୱ)", + "en_150": "ଇଂରାଜୀ (ୟୁରୋପ୍)", "en_AE": "ଇଂରାଜୀ (ସଂଯୁକ୍ତ ଆରବ ଏମିରେଟସ୍)", "en_AG": "ଇଂରାଜୀ (ଆଣ୍ଟିଗୁଆ ଏବଂ ବାରବୁଦା)", "en_AI": "ଇଂରାଜୀ (ଆଙ୍ଗୁଇଲ୍ଲା)", @@ -197,7 +200,9 @@ "en_ZM": "ଇଂରାଜୀ (ଜାମ୍ବିଆ)", "en_ZW": "ଇଂରାଜୀ (ଜିମ୍ବାୱେ)", "eo": "ଏସ୍ପାରେଣ୍ଟୋ", + "eo_001": "ଏସ୍ପାରେଣ୍ଟୋ (ବିଶ୍ୱ)", "es": "ସ୍ପେନିୟ", + "es_419": "ସ୍ପେନିୟ (ଲାଟିନ୍‌ ଆମେରିକା)", "es_AR": "ସ୍ପେନିୟ (ଆର୍ଜେଣ୍ଟିନା)", "es_BO": "ସ୍ପେନିୟ (ବୋଲଭିଆ)", "es_BR": "ସ୍ପେନିୟ (ବ୍ରାଜିଲ୍)", @@ -329,6 +334,7 @@ "hy": "ଆର୍ମେନିଆନ୍", "hy_AM": "ଆର୍ମେନିଆନ୍ (ଆର୍ମେନିଆ)", "ia": "ଇର୍ଣ୍ଟଲିଙ୍ଗୁଆ", + "ia_001": "ଇର୍ଣ୍ଟଲିଙ୍ଗୁଆ (ବିଶ୍ୱ)", "id": "ଇଣ୍ଡୋନେସୀୟ", "id_ID": "ଇଣ୍ଡୋନେସୀୟ (ଇଣ୍ଡୋନେସିଆ)", "ig": "ଇଗବୋ", @@ -574,6 +580,7 @@ "xh": "ଖୋସା", "xh_ZA": "ଖୋସା (ଦକ୍ଷିଣ ଆଫ୍ରିକା)", "yi": "ୟିଡିସ୍", + "yi_001": "ୟିଡିସ୍ (ବିଶ୍ୱ)", "yo": "ୟୋରୁବା", "yo_BJ": "ୟୋରୁବା (ବେନିନ୍)", "yo_NG": "ୟୋରୁବା (ନାଇଜେରିଆ)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/os.json b/src/Symfony/Component/Intl/Resources/data/locales/os.json index 45fd280ce29d0..685f9fa614a0a 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/os.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/os.json @@ -2,6 +2,7 @@ "Names": { "af": "африкаанс", "ar": "араббаг", + "ar_001": "араббаг (Дуне)", "az": "тӕтӕйраг", "az_Cyrl": "тӕтӕйраг (Киррилицӕ)", "az_Latn": "тӕтӕйраг (Латинаг)", @@ -21,11 +22,14 @@ "de_IT": "немыцаг (Итали)", "el": "бердзейнаг", "en": "англисаг", + "en_001": "англисаг (Дуне)", + "en_150": "англисаг (Европӕ)", "en_DE": "англисаг (Герман)", "en_GB": "англисаг (Стыр Британи)", "en_IN": "англисаг (Инди)", "en_US": "англисаг (АИШ)", "eo": "есперанто", + "eo_001": "есперанто (Дуне)", "es": "испайнаг", "es_BR": "испайнаг (Бразили)", "es_US": "испайнаг (АИШ)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/pa.json b/src/Symfony/Component/Intl/Resources/data/locales/pa.json index ac41af1c3d5ad..2c9450ae839d9 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/pa.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/pa.json @@ -8,6 +8,7 @@ "am": "ਅਮਹਾਰਿਕ", "am_ET": "ਅਮਹਾਰਿਕ (ਇਥੋਪੀਆ)", "ar": "ਅਰਬੀ", + "ar_001": "ਅਰਬੀ (ਸੰਸਾਰ)", "ar_AE": "ਅਰਬੀ (ਸੰਯੁਕਤ ਅਰਬ ਅਮੀਰਾਤ)", "ar_BH": "ਅਰਬੀ (ਬਹਿਰੀਨ)", "ar_DJ": "ਅਰਬੀ (ਜ਼ੀਬੂਤੀ)", @@ -94,6 +95,8 @@ "el_CY": "ਯੂਨਾਨੀ (ਸਾਇਪ੍ਰਸ)", "el_GR": "ਯੂਨਾਨੀ (ਗ੍ਰੀਸ)", "en": "ਅੰਗਰੇਜ਼ੀ", + "en_001": "ਅੰਗਰੇਜ਼ੀ (ਸੰਸਾਰ)", + "en_150": "ਅੰਗਰੇਜ਼ੀ (ਯੂਰਪ)", "en_AE": "ਅੰਗਰੇਜ਼ੀ (ਸੰਯੁਕਤ ਅਰਬ ਅਮੀਰਾਤ)", "en_AG": "ਅੰਗਰੇਜ਼ੀ (ਐਂਟੀਗੁਆ ਅਤੇ ਬਾਰਬੁਡਾ)", "en_AI": "ਅੰਗਰੇਜ਼ੀ (ਅੰਗੁਇਲਾ)", @@ -197,7 +200,9 @@ "en_ZM": "ਅੰਗਰੇਜ਼ੀ (ਜ਼ਾਮਬੀਆ)", "en_ZW": "ਅੰਗਰੇਜ਼ੀ (ਜ਼ਿੰਬਾਬਵੇ)", "eo": "ਇਸਪੇਰਾਂਟੋ", + "eo_001": "ਇਸਪੇਰਾਂਟੋ (ਸੰਸਾਰ)", "es": "ਸਪੇਨੀ", + "es_419": "ਸਪੇਨੀ (ਲਾਤੀਨੀ ਅਮਰੀਕਾ)", "es_AR": "ਸਪੇਨੀ (ਅਰਜਨਟੀਨਾ)", "es_BO": "ਸਪੇਨੀ (ਬੋਲੀਵੀਆ)", "es_BR": "ਸਪੇਨੀ (ਬ੍ਰਾਜ਼ੀਲ)", @@ -329,6 +334,7 @@ "hy": "ਅਰਮੀਨੀਆਈ", "hy_AM": "ਅਰਮੀਨੀਆਈ (ਅਰਮੀਨੀਆ)", "ia": "ਇੰਟਰਲਿੰਗੁਆ", + "ia_001": "ਇੰਟਰਲਿੰਗੁਆ (ਸੰਸਾਰ)", "id": "ਇੰਡੋਨੇਸ਼ੀਆਈ", "id_ID": "ਇੰਡੋਨੇਸ਼ੀਆਈ (ਇੰਡੋਨੇਸ਼ੀਆ)", "ig": "ਇਗਬੋ", @@ -570,6 +576,7 @@ "xh": "ਖੋਸਾ", "xh_ZA": "ਖੋਸਾ (ਦੱਖਣੀ ਅਫਰੀਕਾ)", "yi": "ਯਿਦਿਸ਼", + "yi_001": "ਯਿਦਿਸ਼ (ਸੰਸਾਰ)", "yo": "ਯੋਰੂਬਾ", "yo_BJ": "ਯੋਰੂਬਾ (ਬੇਨਿਨ)", "yo_NG": "ਯੋਰੂਬਾ (ਨਾਈਜੀਰੀਆ)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/pl.json b/src/Symfony/Component/Intl/Resources/data/locales/pl.json index a4d5b96382316..9f780377a1e74 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/pl.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/pl.json @@ -8,6 +8,7 @@ "am": "amharski", "am_ET": "amharski (Etiopia)", "ar": "arabski", + "ar_001": "arabski (świat)", "ar_AE": "arabski (Zjednoczone Emiraty Arabskie)", "ar_BH": "arabski (Bahrajn)", "ar_DJ": "arabski (Dżibuti)", @@ -94,6 +95,8 @@ "el_CY": "grecki (Cypr)", "el_GR": "grecki (Grecja)", "en": "angielski", + "en_001": "angielski (świat)", + "en_150": "angielski (Europa)", "en_AE": "angielski (Zjednoczone Emiraty Arabskie)", "en_AG": "angielski (Antigua i Barbuda)", "en_AI": "angielski (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "angielski (Zambia)", "en_ZW": "angielski (Zimbabwe)", "eo": "esperanto", + "eo_001": "esperanto (świat)", "es": "hiszpański", + "es_419": "hiszpański (Ameryka Łacińska)", "es_AR": "hiszpański (Argentyna)", "es_BO": "hiszpański (Boliwia)", "es_BR": "hiszpański (Brazylia)", @@ -329,6 +334,7 @@ "hy": "ormiański", "hy_AM": "ormiański (Armenia)", "ia": "interlingua", + "ia_001": "interlingua (świat)", "id": "indonezyjski", "id_ID": "indonezyjski (Indonezja)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "khosa", "xh_ZA": "khosa (Republika Południowej Afryki)", "yi": "jidysz", + "yi_001": "jidysz (świat)", "yo": "joruba", "yo_BJ": "joruba (Benin)", "yo_NG": "joruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ps.json b/src/Symfony/Component/Intl/Resources/data/locales/ps.json index 265a21fc1c632..47f4ebb47e916 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ps.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ps.json @@ -8,6 +8,7 @@ "am": "امهاري", "am_ET": "امهاري (حبشه)", "ar": "عربي", + "ar_001": "عربي (نړۍ)", "ar_AE": "عربي (متحده عرب امارات)", "ar_BH": "عربي (بحرين)", "ar_DJ": "عربي (جبوتي)", @@ -94,6 +95,8 @@ "el_CY": "یوناني (قبرس)", "el_GR": "یوناني (یونان)", "en": "انګليسي", + "en_001": "انګليسي (نړۍ)", + "en_150": "انګليسي (اروپا)", "en_AE": "انګليسي (متحده عرب امارات)", "en_AG": "انګليسي (انټيګوا او باربودا)", "en_AI": "انګليسي (انګیلا)", @@ -197,7 +200,9 @@ "en_ZM": "انګليسي (زیمبیا)", "en_ZW": "انګليسي (زیمبابوی)", "eo": "اسپرانتو", + "eo_001": "اسپرانتو (نړۍ)", "es": "هسپانوي", + "es_419": "هسپانوي (لاتیني امریکا)", "es_AR": "هسپانوي (ارجنټاين)", "es_BO": "هسپانوي (بولیویا)", "es_BR": "هسپانوي (برازیل)", @@ -329,6 +334,7 @@ "hy": "آرمينيايي", "hy_AM": "آرمينيايي (ارمنستان)", "ia": "انټرلنګوا", + "ia_001": "انټرلنګوا (نړۍ)", "id": "انډونېزي", "id_ID": "انډونېزي (اندونیزیا)", "ig": "اګبو", @@ -568,6 +574,7 @@ "xh": "خوسا", "xh_ZA": "خوسا (سویلي افریقا)", "yi": "يديش", + "yi_001": "يديش (نړۍ)", "yo": "یوروبا", "yo_BJ": "یوروبا (بینن)", "yo_NG": "یوروبا (نایجیریا)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/pt.json b/src/Symfony/Component/Intl/Resources/data/locales/pt.json index 57f5d3d31392d..356f637dddf01 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/pt.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/pt.json @@ -8,6 +8,7 @@ "am": "amárico", "am_ET": "amárico (Etiópia)", "ar": "árabe", + "ar_001": "árabe (Mundo)", "ar_AE": "árabe (Emirados Árabes Unidos)", "ar_BH": "árabe (Bahrein)", "ar_DJ": "árabe (Djibuti)", @@ -94,6 +95,8 @@ "el_CY": "grego (Chipre)", "el_GR": "grego (Grécia)", "en": "inglês", + "en_001": "inglês (Mundo)", + "en_150": "inglês (Europa)", "en_AE": "inglês (Emirados Árabes Unidos)", "en_AG": "inglês (Antígua e Barbuda)", "en_AI": "inglês (Anguila)", @@ -197,7 +200,9 @@ "en_ZM": "inglês (Zâmbia)", "en_ZW": "inglês (Zimbábue)", "eo": "esperanto", + "eo_001": "esperanto (Mundo)", "es": "espanhol", + "es_419": "espanhol (América Latina)", "es_AR": "espanhol (Argentina)", "es_BO": "espanhol (Bolívia)", "es_BR": "espanhol (Brasil)", @@ -329,6 +334,7 @@ "hy": "armênio", "hy_AM": "armênio (Armênia)", "ia": "interlíngua", + "ia_001": "interlíngua (Mundo)", "id": "indonésio", "id_ID": "indonésio (Indonésia)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (África do Sul)", "yi": "iídiche", + "yi_001": "iídiche (Mundo)", "yo": "iorubá", "yo_BJ": "iorubá (Benin)", "yo_NG": "iorubá (Nigéria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/rm.json b/src/Symfony/Component/Intl/Resources/data/locales/rm.json index a76f0636b8a08..fbe2dbb8c4dc4 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/rm.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/rm.json @@ -8,6 +8,7 @@ "am": "amaric", "am_ET": "amaric (Etiopia)", "ar": "arab", + "ar_001": "arab (mund)", "ar_AE": "arab (Emirats Arabs Unids)", "ar_BH": "arab (Bahrain)", "ar_DJ": "arab (Dschibuti)", @@ -93,6 +94,8 @@ "el_CY": "grec (Cipra)", "el_GR": "grec (Grezia)", "en": "englais", + "en_001": "englais (mund)", + "en_150": "englais (Europa)", "en_AE": "englais (Emirats Arabs Unids)", "en_AG": "englais (Antigua e Barbuda)", "en_AI": "englais (Anguilla)", @@ -194,7 +197,9 @@ "en_ZM": "englais (Sambia)", "en_ZW": "englais (Simbabwe)", "eo": "esperanto", + "eo_001": "esperanto (mund)", "es": "spagnol", + "es_419": "spagnol (America Latina)", "es_AR": "spagnol (Argentinia)", "es_BO": "spagnol (Bolivia)", "es_BR": "spagnol (Brasilia)", @@ -326,6 +331,7 @@ "hy": "armen", "hy_AM": "armen (Armenia)", "ia": "interlingua", + "ia_001": "interlingua (mund)", "id": "indonais", "id_ID": "indonais (Indonesia)", "ig": "igbo", @@ -566,6 +572,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (Africa dal Sid)", "yi": "jiddic", + "yi_001": "jiddic (mund)", "yo": "yoruba", "yo_BJ": "yoruba (Benin)", "yo_NG": "yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ro.json b/src/Symfony/Component/Intl/Resources/data/locales/ro.json index e8a63659f2802..5af3ba8544afc 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ro.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ro.json @@ -8,6 +8,7 @@ "am": "amharică", "am_ET": "amharică (Etiopia)", "ar": "arabă", + "ar_001": "arabă (Lume)", "ar_AE": "arabă (Emiratele Arabe Unite)", "ar_BH": "arabă (Bahrain)", "ar_DJ": "arabă (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "greacă (Cipru)", "el_GR": "greacă (Grecia)", "en": "engleză", + "en_001": "engleză (Lume)", + "en_150": "engleză (Europa)", "en_AE": "engleză (Emiratele Arabe Unite)", "en_AG": "engleză (Antigua și Barbuda)", "en_AI": "engleză (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "engleză (Zambia)", "en_ZW": "engleză (Zimbabwe)", "eo": "esperanto", + "eo_001": "esperanto (Lume)", "es": "spaniolă", + "es_419": "spaniolă (America Latină)", "es_AR": "spaniolă (Argentina)", "es_BO": "spaniolă (Bolivia)", "es_BR": "spaniolă (Brazilia)", @@ -329,6 +334,7 @@ "hy": "armeană", "hy_AM": "armeană (Armenia)", "ia": "interlingua", + "ia_001": "interlingua (Lume)", "id": "indoneziană", "id_ID": "indoneziană (Indonezia)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (Africa de Sud)", "yi": "idiș", + "yi_001": "idiș (Lume)", "yo": "yoruba", "yo_BJ": "yoruba (Benin)", "yo_NG": "yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ru.json b/src/Symfony/Component/Intl/Resources/data/locales/ru.json index 18e8f145e6cf2..51158febe9299 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ru.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ru.json @@ -8,6 +8,7 @@ "am": "амхарский", "am_ET": "амхарский (Эфиопия)", "ar": "арабский", + "ar_001": "арабский (весь мир)", "ar_AE": "арабский (ОАЭ)", "ar_BH": "арабский (Бахрейн)", "ar_DJ": "арабский (Джибути)", @@ -94,6 +95,8 @@ "el_CY": "греческий (Кипр)", "el_GR": "греческий (Греция)", "en": "английский", + "en_001": "английский (весь мир)", + "en_150": "английский (Европа)", "en_AE": "английский (ОАЭ)", "en_AG": "английский (Антигуа и Барбуда)", "en_AI": "английский (Ангилья)", @@ -197,7 +200,9 @@ "en_ZM": "английский (Замбия)", "en_ZW": "английский (Зимбабве)", "eo": "эсперанто", + "eo_001": "эсперанто (весь мир)", "es": "испанский", + "es_419": "испанский (Латинская Америка)", "es_AR": "испанский (Аргентина)", "es_BO": "испанский (Боливия)", "es_BR": "испанский (Бразилия)", @@ -329,6 +334,7 @@ "hy": "армянский", "hy_AM": "армянский (Армения)", "ia": "интерлингва", + "ia_001": "интерлингва (весь мир)", "id": "индонезийский", "id_ID": "индонезийский (Индонезия)", "ig": "игбо", @@ -574,6 +580,7 @@ "xh": "коса", "xh_ZA": "коса (Южно-Африканская Республика)", "yi": "идиш", + "yi_001": "идиш (весь мир)", "yo": "йоруба", "yo_BJ": "йоруба (Бенин)", "yo_NG": "йоруба (Нигерия)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/sd.json b/src/Symfony/Component/Intl/Resources/data/locales/sd.json index dc09bcfa65f43..84a48e4bf0541 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/sd.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/sd.json @@ -8,6 +8,7 @@ "am": "امهاري", "am_ET": "امهاري (ايٿوپيا)", "ar": "عربي", + "ar_001": "عربي (دنيا)", "ar_AE": "عربي (متحده عرب امارات)", "ar_BH": "عربي (بحرين)", "ar_DJ": "عربي (ڊجبيوتي)", @@ -94,6 +95,8 @@ "el_CY": "يوناني (سائپرس)", "el_GR": "يوناني (يونان)", "en": "انگريزي", + "en_001": "انگريزي (دنيا)", + "en_150": "انگريزي (يورپ)", "en_AE": "انگريزي (متحده عرب امارات)", "en_AG": "انگريزي (انٽيگئا و بربودا)", "en_AI": "انگريزي (انگويلا)", @@ -197,7 +200,9 @@ "en_ZM": "انگريزي (زيمبيا)", "en_ZW": "انگريزي (زمبابوي)", "eo": "ايسپرانٽو", + "eo_001": "ايسپرانٽو (دنيا)", "es": "اسپيني", + "es_419": "اسپيني (لاطيني آمريڪا)", "es_AR": "اسپيني (ارجنٽينا)", "es_BO": "اسپيني (بوليويا)", "es_BR": "اسپيني (برازيل)", @@ -329,6 +334,7 @@ "hy": "ارماني", "hy_AM": "ارماني (ارمینیا)", "ia": "انٽرلنگئا", + "ia_001": "انٽرلنگئا (دنيا)", "id": "انڊونيشي", "id_ID": "انڊونيشي (انڊونيشيا)", "ig": "اگبو", @@ -568,6 +574,7 @@ "xh": "زھوسا", "xh_ZA": "زھوسا (ڏکڻ آفريقا)", "yi": "يدش", + "yi_001": "يدش (دنيا)", "yo": "يوروبا", "yo_BJ": "يوروبا (بينن)", "yo_NG": "يوروبا (نائيجيريا)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/se.json b/src/Symfony/Component/Intl/Resources/data/locales/se.json index e01ddb8391f13..e906063931dab 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/se.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/se.json @@ -4,6 +4,7 @@ "af_NA": "afrikánsagiella (Namibia)", "af_ZA": "afrikánsagiella (Mátta-Afrihká)", "ar": "arábagiella", + "ar_001": "arábagiella (máilbmi)", "ar_AE": "arábagiella (Ovttastuvvan Arábaemiráhtat)", "ar_BH": "arábagiella (Bahrain)", "ar_DJ": "arábagiella (Djibouti)", @@ -75,6 +76,8 @@ "el_CY": "greikkagiella (Kypros)", "el_GR": "greikkagiella (Greika)", "en": "eaŋgalsgiella", + "en_001": "eaŋgalsgiella (máilbmi)", + "en_150": "eaŋgalsgiella (Eurohpá)", "en_AE": "eaŋgalsgiella (Ovttastuvvan Arábaemiráhtat)", "en_AG": "eaŋgalsgiella (Antigua ja Barbuda)", "en_AI": "eaŋgalsgiella (Anguilla)", @@ -176,6 +179,7 @@ "en_ZM": "eaŋgalsgiella (Zambia)", "en_ZW": "eaŋgalsgiella (Zimbabwe)", "es": "spánskkagiella", + "es_419": "spánskkagiella (lulli-Amerihkká)", "es_AR": "spánskkagiella (Argentina)", "es_BO": "spánskkagiella (Bolivia)", "es_BR": "spánskkagiella (Brasil)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/se_FI.json b/src/Symfony/Component/Intl/Resources/data/locales/se_FI.json index ba2e99b73dd1e..1d7103de66f2f 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/se_FI.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/se_FI.json @@ -1,5 +1,6 @@ { "Names": { + "ar_001": "arábagiella (Máilbmi)", "ar_SD": "arábagiella (Sudan)", "ar_TD": "arábagiella (Chad)", "be": "vilgesruoššagiella", @@ -10,7 +11,9 @@ "bs_BA": "bosniagiella (Bosnia ja Hercegovina)", "bs_Cyrl_BA": "bosniagiella (kyrillalaš, Bosnia ja Hercegovina)", "bs_Latn_BA": "bosniagiella (láhtenaš, Bosnia ja Hercegovina)", + "en_001": "eaŋgalsgiella (Máilbmi)", "en_SD": "eaŋgalsgiella (Sudan)", + "es_419": "spánskkagiella (Latiinnalaš Amerihká)", "fr_TD": "fránskkagiella (Chad)", "hr_BA": "kroátiagiella (Bosnia ja Hercegovina)", "hy": "armenagiella", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/si.json b/src/Symfony/Component/Intl/Resources/data/locales/si.json index 8acbb148861f6..1c70c5d09f3f5 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/si.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/si.json @@ -8,6 +8,7 @@ "am": "ඇම්හාරික්", "am_ET": "ඇම්හාරික් (ඉතියෝපියාව)", "ar": "අරාබි", + "ar_001": "අරාබි (ලෝකය)", "ar_AE": "අරාබි (එක්සත් අරාබි එමිර් රාජ්‍යය)", "ar_BH": "අරාබි (බහරේන්)", "ar_DJ": "අරාබි (ජිබුටි)", @@ -94,6 +95,8 @@ "el_CY": "ග්‍රීක (සයිප්‍රසය)", "el_GR": "ග්‍රීක (ග්‍රීසිය)", "en": "ඉංග්‍රීසි", + "en_001": "ඉංග්‍රීසි (ලෝකය)", + "en_150": "ඉංග්‍රීසි (යුරෝපය)", "en_AE": "ඉංග්‍රීසි (එක්සත් අරාබි එමිර් රාජ්‍යය)", "en_AG": "ඉංග්‍රීසි (ඇන්ටිගුවා සහ බාබියුඩාව)", "en_AI": "ඉංග්‍රීසි (ඇන්ගුයිලාව)", @@ -197,7 +200,9 @@ "en_ZM": "ඉංග්‍රීසි (සැම්බියාව)", "en_ZW": "ඉංග්‍රීසි (සිම්බාබ්වේ)", "eo": "එස්පැරන්ටෝ", + "eo_001": "එස්පැරන්ටෝ (ලෝකය)", "es": "ස්පාඤ්ඤ", + "es_419": "ස්පාඤ්ඤ (ලතින් ඇමෙරිකාව)", "es_AR": "ස්පාඤ්ඤ (ආර්ජෙන්ටිනාව)", "es_BO": "ස්පාඤ්ඤ (බොලීවියාව)", "es_BR": "ස්පාඤ්ඤ (බ්‍රසීලය)", @@ -329,6 +334,7 @@ "hy": "ආර්මේනියානු", "hy_AM": "ආර්මේනියානු (ආර්මේනියාව)", "ia": "ඉන්ටලින්ගුආ", + "ia_001": "ඉන්ටලින්ගුආ (ලෝකය)", "id": "ඉන්දුනීසියානු", "id_ID": "ඉන්දුනීසියානු (ඉන්දුනීසියාව)", "ig": "ඉග්බෝ", @@ -568,6 +574,7 @@ "xh": "ශෝසා", "xh_ZA": "ශෝසා (දකුණු අප්‍රිකාව)", "yi": "යිඩිශ්", + "yi_001": "යිඩිශ් (ලෝකය)", "yo": "යොරූබා", "yo_BJ": "යොරූබා (බෙනින්)", "yo_NG": "යොරූබා (නයිජීරියාව)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/sk.json b/src/Symfony/Component/Intl/Resources/data/locales/sk.json index d51cb7cab0d38..a9307c7e59dee 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/sk.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/sk.json @@ -8,6 +8,7 @@ "am": "amharčina", "am_ET": "amharčina (Etiópia)", "ar": "arabčina", + "ar_001": "arabčina (svet)", "ar_AE": "arabčina (Spojené arabské emiráty)", "ar_BH": "arabčina (Bahrajn)", "ar_DJ": "arabčina (Džibutsko)", @@ -94,6 +95,8 @@ "el_CY": "gréčtina (Cyprus)", "el_GR": "gréčtina (Grécko)", "en": "angličtina", + "en_001": "angličtina (svet)", + "en_150": "angličtina (Európa)", "en_AE": "angličtina (Spojené arabské emiráty)", "en_AG": "angličtina (Antigua a Barbuda)", "en_AI": "angličtina (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "angličtina (Zambia)", "en_ZW": "angličtina (Zimbabwe)", "eo": "esperanto", + "eo_001": "esperanto (svet)", "es": "španielčina", + "es_419": "španielčina (Latinská Amerika)", "es_AR": "španielčina (Argentína)", "es_BO": "španielčina (Bolívia)", "es_BR": "španielčina (Brazília)", @@ -329,6 +334,7 @@ "hy": "arménčina", "hy_AM": "arménčina (Arménsko)", "ia": "interlingua", + "ia_001": "interlingua (svet)", "id": "indonézština", "id_ID": "indonézština (Indonézia)", "ig": "igboština", @@ -574,6 +580,7 @@ "xh": "xhoština", "xh_ZA": "xhoština (Južná Afrika)", "yi": "jidiš", + "yi_001": "jidiš (svet)", "yo": "jorubčina", "yo_BJ": "jorubčina (Benin)", "yo_NG": "jorubčina (Nigéria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/sl.json b/src/Symfony/Component/Intl/Resources/data/locales/sl.json index 33d5ef5dde550..d555a710095b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/sl.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/sl.json @@ -8,6 +8,7 @@ "am": "amharščina", "am_ET": "amharščina (Etiopija)", "ar": "arabščina", + "ar_001": "arabščina (svet)", "ar_AE": "arabščina (Združeni arabski emirati)", "ar_BH": "arabščina (Bahrajn)", "ar_DJ": "arabščina (Džibuti)", @@ -94,6 +95,8 @@ "el_CY": "grščina (Ciper)", "el_GR": "grščina (Grčija)", "en": "angleščina", + "en_001": "angleščina (svet)", + "en_150": "angleščina (Evropa)", "en_AE": "angleščina (Združeni arabski emirati)", "en_AG": "angleščina (Antigva in Barbuda)", "en_AI": "angleščina (Angvila)", @@ -197,7 +200,9 @@ "en_ZM": "angleščina (Zambija)", "en_ZW": "angleščina (Zimbabve)", "eo": "esperanto", + "eo_001": "esperanto (svet)", "es": "španščina", + "es_419": "španščina (Latinska Amerika)", "es_AR": "španščina (Argentina)", "es_BO": "španščina (Bolivija)", "es_BR": "španščina (Brazilija)", @@ -329,6 +334,7 @@ "hy": "armenščina", "hy_AM": "armenščina (Armenija)", "ia": "interlingva", + "ia_001": "interlingva (svet)", "id": "indonezijščina", "id_ID": "indonezijščina (Indonezija)", "ig": "igboščina", @@ -574,6 +580,7 @@ "xh": "koščina", "xh_ZA": "koščina (Južnoafriška republika)", "yi": "jidiš", + "yi_001": "jidiš (svet)", "yo": "jorubščina", "yo_BJ": "jorubščina (Benin)", "yo_NG": "jorubščina (Nigerija)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/so.json b/src/Symfony/Component/Intl/Resources/data/locales/so.json index 4c9b59b7d5b2d..4a88e69bb59d0 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/so.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/so.json @@ -8,6 +8,7 @@ "am": "Axmaari", "am_ET": "Axmaari (Itoobiya)", "ar": "Carabi", + "ar_001": "Carabi (Dunida)", "ar_AE": "Carabi (Imaaraadka Carabta ee Midoobay)", "ar_BH": "Carabi (Baxreyn)", "ar_DJ": "Carabi (Jabuuti)", @@ -94,6 +95,8 @@ "el_CY": "Giriik (Qubrus)", "el_GR": "Giriik (Giriig)", "en": "Ingiriisi", + "en_001": "Ingiriisi (Dunida)", + "en_150": "Ingiriisi (Yurub)", "en_AE": "Ingiriisi (Imaaraadka Carabta ee Midoobay)", "en_AG": "Ingiriisi (Antigua & Barbuuda)", "en_AI": "Ingiriisi (Anguula)", @@ -196,7 +199,9 @@ "en_ZM": "Ingiriisi (Saambiya)", "en_ZW": "Ingiriisi (Simbaabwe)", "eo": "Isberaanto", + "eo_001": "Isberaanto (Dunida)", "es": "Isbaanish", + "es_419": "Isbaanish (Laatiin Ameerika)", "es_AR": "Isbaanish (Arjentiina)", "es_BO": "Isbaanish (Boliifiya)", "es_BR": "Isbaanish (Baraasiil)", @@ -327,6 +332,7 @@ "hy": "Armeeniyaan", "hy_AM": "Armeeniyaan (Armeeniya)", "ia": "Interlinguwa", + "ia_001": "Interlinguwa (Dunida)", "id": "Indunusiyaan", "id_ID": "Indunusiyaan (Indoneesiya)", "ig": "Igbo", @@ -564,6 +570,7 @@ "xh": "Hoosta", "xh_ZA": "Hoosta (Koonfur Afrika)", "yi": "Yadhish", + "yi_001": "Yadhish (Dunida)", "yo": "Yoruuba", "yo_BJ": "Yoruuba (Biniin)", "yo_NG": "Yoruuba (Nayjeeriya)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/sq.json b/src/Symfony/Component/Intl/Resources/data/locales/sq.json index c4021cdc2468b..0f6095064d2ce 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/sq.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/sq.json @@ -8,6 +8,7 @@ "am": "amarisht", "am_ET": "amarisht (Etiopi)", "ar": "arabisht", + "ar_001": "arabisht (Bota)", "ar_AE": "arabisht (Emiratet e Bashkuara Arabe)", "ar_BH": "arabisht (Bahrejn)", "ar_DJ": "arabisht (Xhibuti)", @@ -94,6 +95,8 @@ "el_CY": "greqisht (Qipro)", "el_GR": "greqisht (Greqi)", "en": "anglisht", + "en_001": "anglisht (Bota)", + "en_150": "anglisht (Evropë)", "en_AE": "anglisht (Emiratet e Bashkuara Arabe)", "en_AG": "anglisht (Antigua e Barbuda)", "en_AI": "anglisht (Anguilë)", @@ -197,7 +200,9 @@ "en_ZM": "anglisht (Zambi)", "en_ZW": "anglisht (Zimbabve)", "eo": "esperanto", + "eo_001": "esperanto (Bota)", "es": "spanjisht", + "es_419": "spanjisht (Amerika Latine)", "es_AR": "spanjisht (Argjentinë)", "es_BO": "spanjisht (Bolivi)", "es_BR": "spanjisht (Brazil)", @@ -329,6 +334,7 @@ "hy": "armenisht", "hy_AM": "armenisht (Armeni)", "ia": "interlingua", + "ia_001": "interlingua (Bota)", "id": "indonezisht", "id_ID": "indonezisht (Indonezi)", "ig": "igboisht", @@ -572,6 +578,7 @@ "xh": "xhosaisht", "xh_ZA": "xhosaisht (Afrika e Jugut)", "yi": "jidisht", + "yi_001": "jidisht (Bota)", "yo": "jorubaisht", "yo_BJ": "jorubaisht (Benin)", "yo_NG": "jorubaisht (Nigeri)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/sr.json b/src/Symfony/Component/Intl/Resources/data/locales/sr.json index 8fe00414b75c9..6d4128c8f074c 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/sr.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/sr.json @@ -8,6 +8,7 @@ "am": "амхарски", "am_ET": "амхарски (Етиопија)", "ar": "арапски", + "ar_001": "арапски (свет)", "ar_AE": "арапски (Уједињени Арапски Емирати)", "ar_BH": "арапски (Бахреин)", "ar_DJ": "арапски (Џибути)", @@ -94,6 +95,8 @@ "el_CY": "грчки (Кипар)", "el_GR": "грчки (Грчка)", "en": "енглески", + "en_001": "енглески (свет)", + "en_150": "енглески (Европа)", "en_AE": "енглески (Уједињени Арапски Емирати)", "en_AG": "енглески (Антигва и Барбуда)", "en_AI": "енглески (Ангвила)", @@ -197,7 +200,9 @@ "en_ZM": "енглески (Замбија)", "en_ZW": "енглески (Зимбабве)", "eo": "есперанто", + "eo_001": "есперанто (свет)", "es": "шпански", + "es_419": "шпански (Латинска Америка)", "es_AR": "шпански (Аргентина)", "es_BO": "шпански (Боливија)", "es_BR": "шпански (Бразил)", @@ -329,6 +334,7 @@ "hy": "јерменски", "hy_AM": "јерменски (Јерменија)", "ia": "интерлингва", + "ia_001": "интерлингва (свет)", "id": "индонежански", "id_ID": "индонежански (Индонезија)", "ig": "игбо", @@ -574,6 +580,7 @@ "xh": "коса", "xh_ZA": "коса (Јужноафричка Република)", "yi": "јидиш", + "yi_001": "јидиш (свет)", "yo": "јоруба", "yo_BJ": "јоруба (Бенин)", "yo_NG": "јоруба (Нигерија)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/sr_Latn.json b/src/Symfony/Component/Intl/Resources/data/locales/sr_Latn.json index 5c5ec8c0f9758..0a46e46eb3aa4 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/sr_Latn.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/sr_Latn.json @@ -8,6 +8,7 @@ "am": "amharski", "am_ET": "amharski (Etiopija)", "ar": "arapski", + "ar_001": "arapski (svet)", "ar_AE": "arapski (Ujedinjeni Arapski Emirati)", "ar_BH": "arapski (Bahrein)", "ar_DJ": "arapski (Džibuti)", @@ -94,6 +95,8 @@ "el_CY": "grčki (Kipar)", "el_GR": "grčki (Grčka)", "en": "engleski", + "en_001": "engleski (svet)", + "en_150": "engleski (Evropa)", "en_AE": "engleski (Ujedinjeni Arapski Emirati)", "en_AG": "engleski (Antigva i Barbuda)", "en_AI": "engleski (Angvila)", @@ -197,7 +200,9 @@ "en_ZM": "engleski (Zambija)", "en_ZW": "engleski (Zimbabve)", "eo": "esperanto", + "eo_001": "esperanto (svet)", "es": "španski", + "es_419": "španski (Latinska Amerika)", "es_AR": "španski (Argentina)", "es_BO": "španski (Bolivija)", "es_BR": "španski (Brazil)", @@ -329,6 +334,7 @@ "hy": "jermenski", "hy_AM": "jermenski (Jermenija)", "ia": "interlingva", + "ia_001": "interlingva (svet)", "id": "indonežanski", "id_ID": "indonežanski (Indonezija)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "kosa", "xh_ZA": "kosa (Južnoafrička Republika)", "yi": "jidiš", + "yi_001": "jidiš (svet)", "yo": "joruba", "yo_BJ": "joruba (Benin)", "yo_NG": "joruba (Nigerija)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/sv.json b/src/Symfony/Component/Intl/Resources/data/locales/sv.json index 870e10875b965..1abe9dd2a4797 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/sv.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/sv.json @@ -8,6 +8,7 @@ "am": "amhariska", "am_ET": "amhariska (Etiopien)", "ar": "arabiska", + "ar_001": "arabiska (världen)", "ar_AE": "arabiska (Förenade Arabemiraten)", "ar_BH": "arabiska (Bahrain)", "ar_DJ": "arabiska (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "grekiska (Cypern)", "el_GR": "grekiska (Grekland)", "en": "engelska", + "en_001": "engelska (världen)", + "en_150": "engelska (Europa)", "en_AE": "engelska (Förenade Arabemiraten)", "en_AG": "engelska (Antigua och Barbuda)", "en_AI": "engelska (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "engelska (Zambia)", "en_ZW": "engelska (Zimbabwe)", "eo": "esperanto", + "eo_001": "esperanto (världen)", "es": "spanska", + "es_419": "spanska (Latinamerika)", "es_AR": "spanska (Argentina)", "es_BO": "spanska (Bolivia)", "es_BR": "spanska (Brasilien)", @@ -329,6 +334,7 @@ "hy": "armeniska", "hy_AM": "armeniska (Armenien)", "ia": "interlingua", + "ia_001": "interlingua (världen)", "id": "indonesiska", "id_ID": "indonesiska (Indonesien)", "ig": "igbo", @@ -574,6 +580,7 @@ "xh": "xhosa", "xh_ZA": "xhosa (Sydafrika)", "yi": "jiddisch", + "yi_001": "jiddisch (världen)", "yo": "yoruba", "yo_BJ": "yoruba (Benin)", "yo_NG": "yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/sw.json b/src/Symfony/Component/Intl/Resources/data/locales/sw.json index 75d7a6e84b79e..115813c679382 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/sw.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/sw.json @@ -8,6 +8,7 @@ "am": "Kiamhari", "am_ET": "Kiamhari (Ethiopia)", "ar": "Kiarabu", + "ar_001": "Kiarabu (Dunia)", "ar_AE": "Kiarabu (Falme za Kiarabu)", "ar_BH": "Kiarabu (Bahareni)", "ar_DJ": "Kiarabu (Jibuti)", @@ -94,6 +95,8 @@ "el_CY": "Kigiriki (Cyprus)", "el_GR": "Kigiriki (Ugiriki)", "en": "Kiingereza", + "en_001": "Kiingereza (Dunia)", + "en_150": "Kiingereza (Ulaya)", "en_AE": "Kiingereza (Falme za Kiarabu)", "en_AG": "Kiingereza (Antigua na Barbuda)", "en_AI": "Kiingereza (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "Kiingereza (Zambia)", "en_ZW": "Kiingereza (Zimbabwe)", "eo": "Kiesperanto", + "eo_001": "Kiesperanto (Dunia)", "es": "Kihispania", + "es_419": "Kihispania (Amerika ya Kilatini)", "es_AR": "Kihispania (Ajentina)", "es_BO": "Kihispania (Bolivia)", "es_BR": "Kihispania (Brazil)", @@ -329,6 +334,7 @@ "hy": "Kiarmenia", "hy_AM": "Kiarmenia (Armenia)", "ia": "Kiintalingua", + "ia_001": "Kiintalingua (Dunia)", "id": "Kiindonesia", "id_ID": "Kiindonesia (Indonesia)", "ig": "Kiigbo", @@ -572,6 +578,7 @@ "xh": "Kixhosa", "xh_ZA": "Kixhosa (Afrika Kusini)", "yi": "Kiyiddi", + "yi_001": "Kiyiddi (Dunia)", "yo": "Kiyoruba", "yo_BJ": "Kiyoruba (Benin)", "yo_NG": "Kiyoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/sw_CD.json b/src/Symfony/Component/Intl/Resources/data/locales/sw_CD.json index 5d06054ffde8d..8771c795c0c73 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/sw_CD.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/sw_CD.json @@ -63,6 +63,7 @@ "uz_Arab_AF": "Kiuzbeki (Kiarabu, Afuganistani)", "vi_VN": "Kivietinamu (Vietnamu)", "yi": "Kiyidi", + "yi_001": "Kiyidi (Dunia)", "yo_BJ": "Kiyoruba (Benini)", "yo_NG": "Kiyoruba (Nijeria)" } diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ta.json b/src/Symfony/Component/Intl/Resources/data/locales/ta.json index 9970b4848e513..28906198c7f82 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ta.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ta.json @@ -8,6 +8,7 @@ "am": "அம்ஹாரிக்", "am_ET": "அம்ஹாரிக் (எத்தியோப்பியா)", "ar": "அரபிக்", + "ar_001": "அரபிக் (உலகம்)", "ar_AE": "அரபிக் (ஐக்கிய அரபு எமிரேட்ஸ்)", "ar_BH": "அரபிக் (பஹ்ரைன்)", "ar_DJ": "அரபிக் (ஜிபௌட்டி)", @@ -94,6 +95,8 @@ "el_CY": "கிரேக்கம் (சைப்ரஸ்)", "el_GR": "கிரேக்கம் (கிரீஸ்)", "en": "ஆங்கிலம்", + "en_001": "ஆங்கிலம் (உலகம்)", + "en_150": "ஆங்கிலம் (ஐரோப்பா)", "en_AE": "ஆங்கிலம் (ஐக்கிய அரபு எமிரேட்ஸ்)", "en_AG": "ஆங்கிலம் (ஆண்டிகுவா மற்றும் பார்புடா)", "en_AI": "ஆங்கிலம் (அங்கியுலா)", @@ -197,7 +200,9 @@ "en_ZM": "ஆங்கிலம் (ஜாம்பியா)", "en_ZW": "ஆங்கிலம் (ஜிம்பாப்வே)", "eo": "எஸ்பரேன்டோ", + "eo_001": "எஸ்பரேன்டோ (உலகம்)", "es": "ஸ்பானிஷ்", + "es_419": "ஸ்பானிஷ் (லத்தீன் அமெரிக்கா)", "es_AR": "ஸ்பானிஷ் (அர்ஜென்டினா)", "es_BO": "ஸ்பானிஷ் (பொலிவியா)", "es_BR": "ஸ்பானிஷ் (பிரேசில்)", @@ -329,6 +334,7 @@ "hy": "ஆர்மேனியன்", "hy_AM": "ஆர்மேனியன் (அர்மேனியா)", "ia": "இன்டர்லிங்வா", + "ia_001": "இன்டர்லிங்வா (உலகம்)", "id": "இந்தோனேஷியன்", "id_ID": "இந்தோனேஷியன் (இந்தோனேசியா)", "ig": "இக்போ", @@ -574,6 +580,7 @@ "xh": "ஹோசா", "xh_ZA": "ஹோசா (தென் ஆப்பிரிக்கா)", "yi": "யெட்டிஷ்", + "yi_001": "யெட்டிஷ் (உலகம்)", "yo": "யோருபா", "yo_BJ": "யோருபா (பெனின்)", "yo_NG": "யோருபா (நைஜீரியா)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/te.json b/src/Symfony/Component/Intl/Resources/data/locales/te.json index de9ff749034aa..a99d691570fc7 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/te.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/te.json @@ -8,6 +8,7 @@ "am": "అమ్హారిక్", "am_ET": "అమ్హారిక్ (ఇథియోపియా)", "ar": "అరబిక్", + "ar_001": "అరబిక్ (ప్రపంచం)", "ar_AE": "అరబిక్ (యునైటెడ్ అరబ్ ఎమిరేట్స్)", "ar_BH": "అరబిక్ (బహ్రెయిన్)", "ar_DJ": "అరబిక్ (జిబౌటి)", @@ -94,6 +95,8 @@ "el_CY": "గ్రీక్ (సైప్రస్)", "el_GR": "గ్రీక్ (గ్రీస్)", "en": "ఆంగ్లం", + "en_001": "ఆంగ్లం (ప్రపంచం)", + "en_150": "ఆంగ్లం (యూరోప్)", "en_AE": "ఆంగ్లం (యునైటెడ్ అరబ్ ఎమిరేట్స్)", "en_AG": "ఆంగ్లం (ఆంటిగ్వా మరియు బార్బుడా)", "en_AI": "ఆంగ్లం (ఆంగ్విల్లా)", @@ -197,7 +200,9 @@ "en_ZM": "ఆంగ్లం (జాంబియా)", "en_ZW": "ఆంగ్లం (జింబాబ్వే)", "eo": "ఎస్పెరాంటో", + "eo_001": "ఎస్పెరాంటో (ప్రపంచం)", "es": "స్పానిష్", + "es_419": "స్పానిష్ (లాటిన్ అమెరికా)", "es_AR": "స్పానిష్ (అర్జెంటీనా)", "es_BO": "స్పానిష్ (బొలీవియా)", "es_BR": "స్పానిష్ (బ్రెజిల్)", @@ -329,6 +334,7 @@ "hy": "ఆర్మేనియన్", "hy_AM": "ఆర్మేనియన్ (ఆర్మేనియా)", "ia": "ఇంటర్లింగ్వా", + "ia_001": "ఇంటర్లింగ్వా (ప్రపంచం)", "id": "ఇండోనేషియన్", "id_ID": "ఇండోనేషియన్ (ఇండోనేషియా)", "ig": "ఇగ్బో", @@ -574,6 +580,7 @@ "xh": "షోసా", "xh_ZA": "షోసా (దక్షిణ ఆఫ్రికా)", "yi": "ఇడ్డిష్", + "yi_001": "ఇడ్డిష్ (ప్రపంచం)", "yo": "యోరుబా", "yo_BJ": "యోరుబా (బెనిన్)", "yo_NG": "యోరుబా (నైజీరియా)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/th.json b/src/Symfony/Component/Intl/Resources/data/locales/th.json index 2ddc371ed0f4f..e9203e455a4d9 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/th.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/th.json @@ -8,6 +8,7 @@ "am": "อัมฮารา", "am_ET": "อัมฮารา (เอธิโอเปีย)", "ar": "อาหรับ", + "ar_001": "อาหรับ (โลก)", "ar_AE": "อาหรับ (สหรัฐอาหรับเอมิเรตส์)", "ar_BH": "อาหรับ (บาห์เรน)", "ar_DJ": "อาหรับ (จิบูตี)", @@ -94,6 +95,8 @@ "el_CY": "กรีก (ไซปรัส)", "el_GR": "กรีก (กรีซ)", "en": "อังกฤษ", + "en_001": "อังกฤษ (โลก)", + "en_150": "อังกฤษ (ยุโรป)", "en_AE": "อังกฤษ (สหรัฐอาหรับเอมิเรตส์)", "en_AG": "อังกฤษ (แอนติกาและบาร์บูดา)", "en_AI": "อังกฤษ (แองกวิลลา)", @@ -197,7 +200,9 @@ "en_ZM": "อังกฤษ (แซมเบีย)", "en_ZW": "อังกฤษ (ซิมบับเว)", "eo": "เอสเปรันโต", + "eo_001": "เอสเปรันโต (โลก)", "es": "สเปน", + "es_419": "สเปน (ละตินอเมริกา)", "es_AR": "สเปน (อาร์เจนตินา)", "es_BO": "สเปน (โบลิเวีย)", "es_BR": "สเปน (บราซิล)", @@ -329,6 +334,7 @@ "hy": "อาร์เมเนีย", "hy_AM": "อาร์เมเนีย (อาร์เมเนีย)", "ia": "อินเตอร์ลิงกัว", + "ia_001": "อินเตอร์ลิงกัว (โลก)", "id": "อินโดนีเซีย", "id_ID": "อินโดนีเซีย (อินโดนีเซีย)", "ig": "อิกโบ", @@ -574,6 +580,7 @@ "xh": "คะห์โอซา", "xh_ZA": "คะห์โอซา (แอฟริกาใต้)", "yi": "ยิดดิช", + "yi_001": "ยิดดิช (โลก)", "yo": "โยรูบา", "yo_BJ": "โยรูบา (เบนิน)", "yo_NG": "โยรูบา (ไนจีเรีย)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/tk.json b/src/Symfony/Component/Intl/Resources/data/locales/tk.json index 288964ebb572a..83d34d6fe862f 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/tk.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/tk.json @@ -8,6 +8,7 @@ "am": "amhar dili", "am_ET": "amhar dili (Efiopiýa)", "ar": "arap dili", + "ar_001": "arap dili (Dünýä)", "ar_AE": "arap dili (Birleşen Arap Emirlikleri)", "ar_BH": "arap dili (Bahreýn)", "ar_DJ": "arap dili (Jibuti)", @@ -94,6 +95,8 @@ "el_CY": "grek dili (Kipr)", "el_GR": "grek dili (Gresiýa)", "en": "iňlis dili", + "en_001": "iňlis dili (Dünýä)", + "en_150": "iňlis dili (Ýewropa)", "en_AE": "iňlis dili (Birleşen Arap Emirlikleri)", "en_AG": "iňlis dili (Antigua we Barbuda)", "en_AI": "iňlis dili (Angilýa)", @@ -197,7 +200,9 @@ "en_ZM": "iňlis dili (Zambiýa)", "en_ZW": "iňlis dili (Zimbabwe)", "eo": "esperanto dili", + "eo_001": "esperanto dili (Dünýä)", "es": "ispan dili", + "es_419": "ispan dili (Latyn Amerikasy)", "es_AR": "ispan dili (Argentina)", "es_BO": "ispan dili (Boliwiýa)", "es_BR": "ispan dili (Braziliýa)", @@ -329,6 +334,7 @@ "hy": "ermeni dili", "hy_AM": "ermeni dili (Ermenistan)", "ia": "interlingwa dili", + "ia_001": "interlingwa dili (Dünýä)", "id": "indonez dili", "id_ID": "indonez dili (Indoneziýa)", "ig": "igbo dili", @@ -568,6 +574,7 @@ "xh": "kosa dili", "xh_ZA": "kosa dili (Günorta Afrika)", "yi": "idiş dili", + "yi_001": "idiş dili (Dünýä)", "yo": "ýoruba dili", "yo_BJ": "ýoruba dili (Benin)", "yo_NG": "ýoruba dili (Nigeriýa)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/to.json b/src/Symfony/Component/Intl/Resources/data/locales/to.json index 795ed34b0e9b6..40b30e7eec9c1 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/to.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/to.json @@ -8,6 +8,7 @@ "am": "lea fakaʻameliki", "am_ET": "lea fakaʻameliki (ʻĪtiōpia)", "ar": "lea fakaʻalepea", + "ar_001": "lea fakaʻalepea (Māmani)", "ar_AE": "lea fakaʻalepea (ʻAlepea Fakatahataha)", "ar_BH": "lea fakaʻalepea (Paleini)", "ar_DJ": "lea fakaʻalepea (Siputi)", @@ -94,6 +95,8 @@ "el_CY": "lea fakakalisi (Saipalesi)", "el_GR": "lea fakakalisi (Kalisi)", "en": "lea fakapālangi", + "en_001": "lea fakapālangi (Māmani)", + "en_150": "lea fakapālangi (ʻEulope)", "en_AE": "lea fakapālangi (ʻAlepea Fakatahataha)", "en_AG": "lea fakapālangi (Anitikua mo Palaputa)", "en_AI": "lea fakapālangi (Anikuila)", @@ -197,7 +200,9 @@ "en_ZM": "lea fakapālangi (Semipia)", "en_ZW": "lea fakapālangi (Simipapuei)", "eo": "lea fakaʻesipulanito", + "eo_001": "lea fakaʻesipulanito (Māmani)", "es": "lea fakasipēnisi", + "es_419": "lea fakasipēnisi (ʻAmelika fakalatina)", "es_AR": "lea fakasipēnisi (ʻAsenitina)", "es_BO": "lea fakasipēnisi (Polīvia)", "es_BR": "lea fakasipēnisi (Palāsili)", @@ -329,6 +334,7 @@ "hy": "lea fakaʻāmenia", "hy_AM": "lea fakaʻāmenia (ʻĀmenia)", "ia": "lea fakavahaʻalea", + "ia_001": "lea fakavahaʻalea (Māmani)", "id": "lea fakaʻinitōnesia", "id_ID": "lea fakaʻinitōnesia (ʻInitonēsia)", "ig": "lea fakaʻikipō", @@ -574,6 +580,7 @@ "xh": "lea fakatōsa", "xh_ZA": "lea fakatōsa (ʻAfilika tonga)", "yi": "lea fakaītisi", + "yi_001": "lea fakaītisi (Māmani)", "yo": "lea fakaʻiōlupa", "yo_BJ": "lea fakaʻiōlupa (Penini)", "yo_NG": "lea fakaʻiōlupa (Naisilia)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/tr.json b/src/Symfony/Component/Intl/Resources/data/locales/tr.json index 28fab84f52d73..f4cf9d6bf3c5f 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/tr.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/tr.json @@ -8,6 +8,7 @@ "am": "Amharca", "am_ET": "Amharca (Etiyopya)", "ar": "Arapça", + "ar_001": "Arapça (Dünya)", "ar_AE": "Arapça (Birleşik Arap Emirlikleri)", "ar_BH": "Arapça (Bahreyn)", "ar_DJ": "Arapça (Cibuti)", @@ -94,6 +95,8 @@ "el_CY": "Yunanca (Kıbrıs)", "el_GR": "Yunanca (Yunanistan)", "en": "İngilizce", + "en_001": "İngilizce (Dünya)", + "en_150": "İngilizce (Avrupa)", "en_AE": "İngilizce (Birleşik Arap Emirlikleri)", "en_AG": "İngilizce (Antigua ve Barbuda)", "en_AI": "İngilizce (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "İngilizce (Zambiya)", "en_ZW": "İngilizce (Zimbabve)", "eo": "Esperanto", + "eo_001": "Esperanto (Dünya)", "es": "İspanyolca", + "es_419": "İspanyolca (Latin Amerika)", "es_AR": "İspanyolca (Arjantin)", "es_BO": "İspanyolca (Bolivya)", "es_BR": "İspanyolca (Brezilya)", @@ -329,6 +334,7 @@ "hy": "Ermenice", "hy_AM": "Ermenice (Ermenistan)", "ia": "İnterlingua", + "ia_001": "İnterlingua (Dünya)", "id": "Endonezce", "id_ID": "Endonezce (Endonezya)", "ig": "İbo dili", @@ -574,6 +580,7 @@ "xh": "Zosa dili", "xh_ZA": "Zosa dili (Güney Afrika)", "yi": "Yidiş", + "yi_001": "Yidiş (Dünya)", "yo": "Yorubaca", "yo_BJ": "Yorubaca (Benin)", "yo_NG": "Yorubaca (Nijerya)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ug.json b/src/Symfony/Component/Intl/Resources/data/locales/ug.json index 3d1e3dbe96543..83fe16a5a2b7b 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ug.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ug.json @@ -8,6 +8,7 @@ "am": "ئامھارچە", "am_ET": "ئامھارچە (ئېفىيوپىيە)", "ar": "ئەرەبچە", + "ar_001": "ئەرەبچە (دۇنيا)", "ar_AE": "ئەرەبچە (ئەرەب بىرلەشمە خەلىپىلىكى)", "ar_BH": "ئەرەبچە (بەھرەين)", "ar_DJ": "ئەرەبچە (جىبۇتى)", @@ -94,6 +95,8 @@ "el_CY": "گىرېكچە (سىپرۇس)", "el_GR": "گىرېكچە (گىرېتسىيە)", "en": "ئىنگلىزچە", + "en_001": "ئىنگلىزچە (دۇنيا)", + "en_150": "ئىنگلىزچە (ياۋروپا)", "en_AE": "ئىنگلىزچە (ئەرەب بىرلەشمە خەلىپىلىكى)", "en_AG": "ئىنگلىزچە (ئانتىگۇئا ۋە باربۇدا)", "en_AI": "ئىنگلىزچە (ئانگۋىللا)", @@ -197,7 +200,9 @@ "en_ZM": "ئىنگلىزچە (زامبىيە)", "en_ZW": "ئىنگلىزچە (زىمبابۋې)", "eo": "ئېسپرانتوچە", + "eo_001": "ئېسپرانتوچە (دۇنيا)", "es": "ئىسپانچە", + "es_419": "ئىسپانچە (لاتىن ئامېرىكا)", "es_AR": "ئىسپانچە (ئارگېنتىنا)", "es_BO": "ئىسپانچە (بولىۋىيە)", "es_BR": "ئىسپانچە (بىرازىلىيە)", @@ -329,6 +334,7 @@ "hy": "ئەرمېنچە", "hy_AM": "ئەرمېنچە (ئەرمېنىيە)", "ia": "ئارىلىق تىل", + "ia_001": "ئارىلىق تىل (دۇنيا)", "id": "ھىندونېزچە", "id_ID": "ھىندونېزچە (ھىندونېزىيە)", "ig": "ئىگبوچە", @@ -574,6 +580,7 @@ "xh": "خوساچە", "xh_ZA": "خوساچە (جەنۇبىي ئافرىقا)", "yi": "يىددىشچە", + "yi_001": "يىددىشچە (دۇنيا)", "yo": "يورۇباچە", "yo_BJ": "يورۇباچە (بېنىن)", "yo_NG": "يورۇباچە (نىگېرىيە)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/uk.json b/src/Symfony/Component/Intl/Resources/data/locales/uk.json index 2ed4735ea76b3..a4048c32e20b2 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/uk.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/uk.json @@ -8,6 +8,7 @@ "am": "амхарська", "am_ET": "амхарська (Ефіопія)", "ar": "арабська", + "ar_001": "арабська (Світ)", "ar_AE": "арабська (Обʼєднані Арабські Емірати)", "ar_BH": "арабська (Бахрейн)", "ar_DJ": "арабська (Джибуті)", @@ -94,6 +95,8 @@ "el_CY": "грецька (Кіпр)", "el_GR": "грецька (Греція)", "en": "англійська", + "en_001": "англійська (Світ)", + "en_150": "англійська (Європа)", "en_AE": "англійська (Обʼєднані Арабські Емірати)", "en_AG": "англійська (Антиґуа і Барбуда)", "en_AI": "англійська (Анґілья)", @@ -197,7 +200,9 @@ "en_ZM": "англійська (Замбія)", "en_ZW": "англійська (Зімбабве)", "eo": "есперанто", + "eo_001": "есперанто (Світ)", "es": "іспанська", + "es_419": "іспанська (Латинська Америка)", "es_AR": "іспанська (Аргентина)", "es_BO": "іспанська (Болівія)", "es_BR": "іспанська (Бразілія)", @@ -329,6 +334,7 @@ "hy": "вірменська", "hy_AM": "вірменська (Вірменія)", "ia": "інтерлінгва", + "ia_001": "інтерлінгва (Світ)", "id": "індонезійська", "id_ID": "індонезійська (Індонезія)", "ig": "ігбо", @@ -574,6 +580,7 @@ "xh": "кхоса", "xh_ZA": "кхоса (Південно-Африканська Республіка)", "yi": "їдиш", + "yi_001": "їдиш (Світ)", "yo": "йоруба", "yo_BJ": "йоруба (Бенін)", "yo_NG": "йоруба (Нігерія)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ur.json b/src/Symfony/Component/Intl/Resources/data/locales/ur.json index 070a0ddc4b4cd..abe4028f6159c 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ur.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ur.json @@ -8,6 +8,7 @@ "am": "امہاری", "am_ET": "امہاری (ایتھوپیا)", "ar": "عربی", + "ar_001": "عربی (دنیا)", "ar_AE": "عربی (متحدہ عرب امارات)", "ar_BH": "عربی (بحرین)", "ar_DJ": "عربی (جبوتی)", @@ -94,6 +95,8 @@ "el_CY": "یونانی (قبرص)", "el_GR": "یونانی (یونان)", "en": "انگریزی", + "en_001": "انگریزی (دنیا)", + "en_150": "انگریزی (یورپ)", "en_AE": "انگریزی (متحدہ عرب امارات)", "en_AG": "انگریزی (انٹیگوا اور باربودا)", "en_AI": "انگریزی (انگوئیلا)", @@ -197,7 +200,9 @@ "en_ZM": "انگریزی (زامبیا)", "en_ZW": "انگریزی (زمبابوے)", "eo": "ایسپرانٹو", + "eo_001": "ایسپرانٹو (دنیا)", "es": "ہسپانوی", + "es_419": "ہسپانوی (لاطینی امریکہ)", "es_AR": "ہسپانوی (ارجنٹینا)", "es_BO": "ہسپانوی (بولیویا)", "es_BR": "ہسپانوی (برازیل)", @@ -329,6 +334,7 @@ "hy": "آرمینیائی", "hy_AM": "آرمینیائی (آرمینیا)", "ia": "بین لسانیات", + "ia_001": "بین لسانیات (دنیا)", "id": "انڈونیثیائی", "id_ID": "انڈونیثیائی (انڈونیشیا)", "ig": "اِگبو", @@ -574,6 +580,7 @@ "xh": "ژوسا", "xh_ZA": "ژوسا (جنوبی افریقہ)", "yi": "یدش", + "yi_001": "یدش (دنیا)", "yo": "یوروبا", "yo_BJ": "یوروبا (بینن)", "yo_NG": "یوروبا (نائجیریا)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/uz.json b/src/Symfony/Component/Intl/Resources/data/locales/uz.json index 1f5a4ad0fac60..25799a73440a4 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/uz.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/uz.json @@ -8,6 +8,7 @@ "am": "amxar", "am_ET": "amxar (Efiopiya)", "ar": "arab", + "ar_001": "arab (Dunyo)", "ar_AE": "arab (Birlashgan Arab Amirliklari)", "ar_BH": "arab (Bahrayn)", "ar_DJ": "arab (Jibuti)", @@ -94,6 +95,8 @@ "el_CY": "grek (Kipr)", "el_GR": "grek (Gretsiya)", "en": "inglizcha", + "en_001": "inglizcha (Dunyo)", + "en_150": "inglizcha (Yevropa)", "en_AE": "inglizcha (Birlashgan Arab Amirliklari)", "en_AG": "inglizcha (Antigua va Barbuda)", "en_AI": "inglizcha (Angilya)", @@ -197,7 +200,9 @@ "en_ZM": "inglizcha (Zambiya)", "en_ZW": "inglizcha (Zimbabve)", "eo": "esperanto", + "eo_001": "esperanto (Dunyo)", "es": "ispancha", + "es_419": "ispancha (Lotin Amerikasi)", "es_AR": "ispancha (Argentina)", "es_BO": "ispancha (Boliviya)", "es_BR": "ispancha (Braziliya)", @@ -329,6 +334,7 @@ "hy": "arman", "hy_AM": "arman (Armaniston)", "ia": "interlingva", + "ia_001": "interlingva (Dunyo)", "id": "indonez", "id_ID": "indonez (Indoneziya)", "ig": "igbo", @@ -568,6 +574,7 @@ "xh": "kxosa", "xh_ZA": "kxosa (Janubiy Afrika Respublikasi)", "yi": "idish", + "yi_001": "idish (Dunyo)", "yo": "yoruba", "yo_BJ": "yoruba (Benin)", "yo_NG": "yoruba (Nigeriya)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/uz_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/locales/uz_Cyrl.json index a12288547ac00..2c3f67db0ebfb 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/uz_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/uz_Cyrl.json @@ -8,6 +8,7 @@ "am": "амхарча", "am_ET": "амхарча (Эфиопия)", "ar": "арабча", + "ar_001": "арабча (Дунё)", "ar_AE": "арабча (Бирлашган Араб Амирликлари)", "ar_BH": "арабча (Баҳрайн)", "ar_DJ": "арабча (Жибути)", @@ -94,6 +95,8 @@ "el_CY": "грекча (Кипр)", "el_GR": "грекча (Греция)", "en": "инглизча", + "en_001": "инглизча (Дунё)", + "en_150": "инглизча (Европа)", "en_AE": "инглизча (Бирлашган Араб Амирликлари)", "en_AG": "инглизча (Антигуа ва Барбуда)", "en_AI": "инглизча (Ангилья)", @@ -197,7 +200,9 @@ "en_ZM": "инглизча (Замбия)", "en_ZW": "инглизча (Зимбабве)", "eo": "эсперанто", + "eo_001": "эсперанто (Дунё)", "es": "испанча", + "es_419": "испанча (Лотин Америкаси)", "es_AR": "испанча (Аргентина)", "es_BO": "испанча (Боливия)", "es_BR": "испанча (Бразилия)", @@ -329,6 +334,7 @@ "hy": "арманча", "hy_AM": "арманча (Арманистон)", "ia": "интерлингва", + "ia_001": "интерлингва (Дунё)", "id": "индонезча", "id_ID": "индонезча (Индонезия)", "ig": "игбо", @@ -566,6 +572,7 @@ "xh": "хоса", "xh_ZA": "хоса (Жанубий Африка Республикаси)", "yi": "иддиш", + "yi_001": "иддиш (Дунё)", "yo": "йоруба", "yo_BJ": "йоруба (Бенин)", "yo_NG": "йоруба (Нигерия)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/vi.json b/src/Symfony/Component/Intl/Resources/data/locales/vi.json index 458d82538517f..43c46d0658c11 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/vi.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/vi.json @@ -8,6 +8,7 @@ "am": "Tiếng Amharic", "am_ET": "Tiếng Amharic (Ethiopia)", "ar": "Tiếng Ả Rập", + "ar_001": "Tiếng Ả Rập (Thế giới)", "ar_AE": "Tiếng Ả Rập (Các Tiểu Vương quốc Ả Rập Thống nhất)", "ar_BH": "Tiếng Ả Rập (Bahrain)", "ar_DJ": "Tiếng Ả Rập (Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "Tiếng Hy Lạp (Síp)", "el_GR": "Tiếng Hy Lạp (Hy Lạp)", "en": "Tiếng Anh", + "en_001": "Tiếng Anh (Thế giới)", + "en_150": "Tiếng Anh (Châu Âu)", "en_AE": "Tiếng Anh (Các Tiểu Vương quốc Ả Rập Thống nhất)", "en_AG": "Tiếng Anh (Antigua và Barbuda)", "en_AI": "Tiếng Anh (Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "Tiếng Anh (Zambia)", "en_ZW": "Tiếng Anh (Zimbabwe)", "eo": "Tiếng Quốc Tế Ngữ", + "eo_001": "Tiếng Quốc Tế Ngữ (Thế giới)", "es": "Tiếng Tây Ban Nha", + "es_419": "Tiếng Tây Ban Nha (Châu Mỹ La-tinh)", "es_AR": "Tiếng Tây Ban Nha (Argentina)", "es_BO": "Tiếng Tây Ban Nha (Bolivia)", "es_BR": "Tiếng Tây Ban Nha (Brazil)", @@ -329,6 +334,7 @@ "hy": "Tiếng Armenia", "hy_AM": "Tiếng Armenia (Armenia)", "ia": "Tiếng Khoa Học Quốc Tế", + "ia_001": "Tiếng Khoa Học Quốc Tế (Thế giới)", "id": "Tiếng Indonesia", "id_ID": "Tiếng Indonesia (Indonesia)", "ig": "Tiếng Igbo", @@ -574,6 +580,7 @@ "xh": "Tiếng Xhosa", "xh_ZA": "Tiếng Xhosa (Nam Phi)", "yi": "Tiếng Yiddish", + "yi_001": "Tiếng Yiddish (Thế giới)", "yo": "Tiếng Yoruba", "yo_BJ": "Tiếng Yoruba (Benin)", "yo_NG": "Tiếng Yoruba (Nigeria)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/yi.json b/src/Symfony/Component/Intl/Resources/data/locales/yi.json index 82b49d9b8a9c4..0eade723864d7 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/yi.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/yi.json @@ -6,6 +6,7 @@ "am": "אַמהאַריש", "am_ET": "אַמהאַריש (עטיאפּיע)", "ar": "אַראַביש", + "ar_001": "אַראַביש (וועלט)", "ar_DJ": "אַראַביש (דזשיבוטי)", "ar_EG": "אַראַביש (עגיפּטן)", "ar_ER": "אַראַביש (עריטרעע)", @@ -69,6 +70,8 @@ "el": "גריכיש", "el_GR": "גריכיש (גריכנלאַנד)", "en": "ענגליש", + "en_001": "ענגליש (וועלט)", + "en_150": "ענגליש (אייראפּע)", "en_AG": "ענגליש (אַנטיגוע און באַרבודע)", "en_AT": "ענגליש (עסטרייך)", "en_AU": "ענגליש (אויסטראַליע)", @@ -149,7 +152,9 @@ "en_ZM": "ענגליש (זאַמביע)", "en_ZW": "ענגליש (זימבאַבווע)", "eo": "עספּעראַנטא", + "eo_001": "עספּעראַנטא (וועלט)", "es": "שפּאַניש", + "es_419": "שפּאַניש (לאַטיין־אַמעריקע)", "es_AR": "שפּאַניש (אַרגענטינע)", "es_BO": "שפּאַניש (באליוויע)", "es_BR": "שפּאַניש (בראַזיל)", @@ -406,6 +411,7 @@ "vi": "וויעטנאַמעזיש", "vi_VN": "וויעטנאַמעזיש (וויעטנאַם)", "yi": "ייִדיש", + "yi_001": "ייִדיש (וועלט)", "zh": "כינעזיש", "zh_CN": "כינעזיש (כינע)", "zh_SG": "כינעזיש (סינגאַפּור)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/yo.json b/src/Symfony/Component/Intl/Resources/data/locales/yo.json index 65e9327d7f11b..c6ca6d02b3cb7 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/yo.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/yo.json @@ -177,6 +177,7 @@ "en_ZW": "Èdè Gẹ̀ẹ́sì (Orílẹ́ède ṣimibabe)", "eo": "Èdè Esperanto", "es": "Èdè Sípáníìṣì", + "es_419": "Èdè Sípáníìṣì (Látín Amẹ́ríkà)", "es_AR": "Èdè Sípáníìṣì (Orílẹ́ède Agentínà)", "es_BO": "Èdè Sípáníìṣì (Orílẹ́ède Bọ̀lífíyà)", "es_BR": "Èdè Sípáníìṣì (Orilẹ̀-èdè Bàràsílì)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/yo_BJ.json b/src/Symfony/Component/Intl/Resources/data/locales/yo_BJ.json index e6286184164bd..b70a30dcdbb7c 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/yo_BJ.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/yo_BJ.json @@ -157,6 +157,7 @@ "en_ZM": "Èdè Gɛ̀ɛ́sì (Orílɛ́ède shamibia)", "en_ZW": "Èdè Gɛ̀ɛ́sì (Orílɛ́ède shimibabe)", "es": "Èdè Sípáníìshì", + "es_419": "Èdè Sípáníìshì (Látín Amɛ́ríkà)", "es_AR": "Èdè Sípáníìshì (Orílɛ́ède Agentínà)", "es_BO": "Èdè Sípáníìshì (Orílɛ́ède Bɔ̀lífíyà)", "es_BR": "Èdè Sípáníìshì (Orilɛ̀-èdè Bàràsílì)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/zh.json b/src/Symfony/Component/Intl/Resources/data/locales/zh.json index dd63d33d5ff8b..e5e66b8950293 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/zh.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/zh.json @@ -8,6 +8,7 @@ "am": "阿姆哈拉语", "am_ET": "阿姆哈拉语(埃塞俄比亚)", "ar": "阿拉伯语", + "ar_001": "阿拉伯语(世界)", "ar_AE": "阿拉伯语(阿拉伯联合酋长国)", "ar_BH": "阿拉伯语(巴林)", "ar_DJ": "阿拉伯语(吉布提)", @@ -94,6 +95,8 @@ "el_CY": "希腊语(塞浦路斯)", "el_GR": "希腊语(希腊)", "en": "英语", + "en_001": "英语(世界)", + "en_150": "英语(欧洲)", "en_AE": "英语(阿拉伯联合酋长国)", "en_AG": "英语(安提瓜和巴布达)", "en_AI": "英语(安圭拉)", @@ -197,7 +200,9 @@ "en_ZM": "英语(赞比亚)", "en_ZW": "英语(津巴布韦)", "eo": "世界语", + "eo_001": "世界语(世界)", "es": "西班牙语", + "es_419": "西班牙语(拉丁美洲)", "es_AR": "西班牙语(阿根廷)", "es_BO": "西班牙语(玻利维亚)", "es_BR": "西班牙语(巴西)", @@ -329,6 +334,7 @@ "hy": "亚美尼亚语", "hy_AM": "亚美尼亚语(亚美尼亚)", "ia": "国际语", + "ia_001": "国际语(世界)", "id": "印度尼西亚语", "id_ID": "印度尼西亚语(印度尼西亚)", "ig": "伊博语", @@ -574,6 +580,7 @@ "xh": "科萨语", "xh_ZA": "科萨语(南非)", "yi": "意第绪语", + "yi_001": "意第绪语(世界)", "yo": "约鲁巴语", "yo_BJ": "约鲁巴语(贝宁)", "yo_NG": "约鲁巴语(尼日利亚)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/zh_Hant.json b/src/Symfony/Component/Intl/Resources/data/locales/zh_Hant.json index dd88572d8099f..39a02c9c581be 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/zh_Hant.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/zh_Hant.json @@ -8,6 +8,7 @@ "am": "阿姆哈拉文", "am_ET": "阿姆哈拉文(衣索比亞)", "ar": "阿拉伯文", + "ar_001": "阿拉伯文(世界)", "ar_AE": "阿拉伯文(阿拉伯聯合大公國)", "ar_BH": "阿拉伯文(巴林)", "ar_DJ": "阿拉伯文(吉布地)", @@ -94,6 +95,8 @@ "el_CY": "希臘文(賽普勒斯)", "el_GR": "希臘文(希臘)", "en": "英文", + "en_001": "英文(世界)", + "en_150": "英文(歐洲)", "en_AE": "英文(阿拉伯聯合大公國)", "en_AG": "英文(安地卡及巴布達)", "en_AI": "英文(安奎拉)", @@ -197,7 +200,9 @@ "en_ZM": "英文(尚比亞)", "en_ZW": "英文(辛巴威)", "eo": "世界文", + "eo_001": "世界文(世界)", "es": "西班牙文", + "es_419": "西班牙文(拉丁美洲)", "es_AR": "西班牙文(阿根廷)", "es_BO": "西班牙文(玻利維亞)", "es_BR": "西班牙文(巴西)", @@ -329,6 +334,7 @@ "hy": "亞美尼亞文", "hy_AM": "亞美尼亞文(亞美尼亞)", "ia": "國際文", + "ia_001": "國際文(世界)", "id": "印尼文", "id_ID": "印尼文(印尼)", "ig": "伊布文", @@ -574,6 +580,7 @@ "xh": "科薩文", "xh_ZA": "科薩文(南非)", "yi": "意第緒文", + "yi_001": "意第緒文(世界)", "yo": "約魯巴文", "yo_BJ": "約魯巴文(貝南)", "yo_NG": "約魯巴文(奈及利亞)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/zh_Hant_HK.json b/src/Symfony/Component/Intl/Resources/data/locales/zh_Hant_HK.json index b02a59ccc262c..280ad8cd180de 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/zh_Hant_HK.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/zh_Hant_HK.json @@ -82,6 +82,7 @@ "en_ZM": "英文(贊比亞)", "en_ZW": "英文(津巴布韋)", "eo": "世界語", + "eo_001": "世界語(世界)", "es_BZ": "西班牙文(伯利茲)", "es_CR": "西班牙文(哥斯達黎加)", "es_DO": "西班牙文(多米尼加共和國)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/zu.json b/src/Symfony/Component/Intl/Resources/data/locales/zu.json index 73b62266ed05e..239b886649dd8 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/zu.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/zu.json @@ -8,6 +8,7 @@ "am": "isi-Amharic", "am_ET": "isi-Amharic (i-Ethiopia)", "ar": "isi-Arabic", + "ar_001": "isi-Arabic (umhlaba)", "ar_AE": "isi-Arabic (i-United Arab Emirates)", "ar_BH": "isi-Arabic (i-Bahrain)", "ar_DJ": "isi-Arabic (i-Djibouti)", @@ -94,6 +95,8 @@ "el_CY": "isi-Greek (i-Cyprus)", "el_GR": "isi-Greek (i-Greece)", "en": "i-English", + "en_001": "i-English (umhlaba)", + "en_150": "i-English (i-Europe)", "en_AE": "i-English (i-United Arab Emirates)", "en_AG": "i-English (i-Antigua ne-Barbuda)", "en_AI": "i-English (i-Anguilla)", @@ -197,7 +200,9 @@ "en_ZM": "i-English (i-Zambia)", "en_ZW": "i-English (iZimbabwe)", "eo": "isi-Esperanto", + "eo_001": "isi-Esperanto (umhlaba)", "es": "isi-Spanish", + "es_419": "isi-Spanish (i-Latin America)", "es_AR": "isi-Spanish (i-Argentina)", "es_BO": "isi-Spanish (i-Bolivia)", "es_BR": "isi-Spanish (i-Brazil)", @@ -329,6 +334,7 @@ "hy": "isi-Armenia", "hy_AM": "isi-Armenia (i-Armenia)", "ia": "izilimi ezihlangene", + "ia_001": "izilimi ezihlangene (umhlaba)", "id": "isi-Indonesian", "id_ID": "isi-Indonesian (i-Indonesia)", "ig": "isi-Igbo", @@ -572,6 +578,7 @@ "xh": "isiXhosa", "xh_ZA": "isiXhosa (iNingizimu Afrika)", "yi": "isi-Yiddish", + "yi_001": "isi-Yiddish (umhlaba)", "yo": "isi-Yoruba", "yo_BJ": "isi-Yoruba (i-Benin)", "yo_NG": "isi-Yoruba (i-Nigeria)", diff --git a/src/Symfony/Component/Intl/Tests/LocalesTest.php b/src/Symfony/Component/Intl/Tests/LocalesTest.php index 3265c723d1663..ff53e72b52669 100644 --- a/src/Symfony/Component/Intl/Tests/LocalesTest.php +++ b/src/Symfony/Component/Intl/Tests/LocalesTest.php @@ -100,6 +100,7 @@ public function testExists() $this->assertTrue(Locales::exists('nl_NL')); $this->assertTrue(Locales::exists('tl_PH')); $this->assertTrue(Locales::exists('fil_PH')); // alias for "tl_PH" + $this->assertTrue(Locales::exists('es_419')); $this->assertFalse(Locales::exists('zxx_ZZ')); } } diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php index c2dbd622ffc1d..bd9df9e56ccdb 100644 --- a/src/Symfony/Component/Lock/Store/PdoStore.php +++ b/src/Symfony/Component/Lock/Store/PdoStore.php @@ -317,6 +317,7 @@ private function getDriver(): string } else { switch ($this->driver = $con->getDriver()->getName()) { case 'mysqli': + throw new NotSupportedException(sprintf('The store "%s" does not support the mysqli driver, use pdo_mysql instead.', \get_class($this))); case 'pdo_mysql': case 'drizzle_pdo_mysql': $this->driver = 'mysql'; diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiTransportTest.php index a1b0ae7f1a81e..254a1ff84eb09 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiTransportTest.php +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiTransportTest.php @@ -12,7 +12,13 @@ namespace Symfony\Component\Mailer\Bridge\Amazon\Tests\Transport; use PHPUnit\Framework\TestCase; +use Symfony\Component\HttpClient\MockHttpClient; +use Symfony\Component\HttpClient\Response\MockResponse; use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesApiTransport; +use Symfony\Component\Mailer\Exception\HttpTransportException; +use Symfony\Component\Mime\Address; +use Symfony\Component\Mime\Email; +use Symfony\Contracts\HttpClient\ResponseInterface; class SesApiTransportTest extends TestCase { @@ -45,4 +51,70 @@ public function getTransportData() ], ]; } + + public function testSend() + { + $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface { + $this->assertSame('POST', $method); + $this->assertSame('https://email.eu-west-1.amazonaws.com:8984/', $url); + $this->assertStringContainsStringIgnoringCase('X-Amzn-Authorization: AWS3-HTTPS AWSAccessKeyId=ACCESS_KEY,Algorithm=HmacSHA256,Signature=', $options['headers'][0] ?? $options['request_headers'][0]); + + parse_str($options['body'], $content); + + $this->assertSame('Hello!', $content['Message_Subject_Data']); + $this->assertSame('Saif Eddin ', $content['Destination_ToAddresses_member'][0]); + $this->assertSame('Fabien ', $content['Source']); + $this->assertSame('Hello There!', $content['Message_Body_Text_Data']); + + $xml = ' + + foobar + +'; + + return new MockResponse($xml, [ + 'http_code' => 200, + ]); + }); + $transport = new SesApiTransport('ACCESS_KEY', 'SECRET_KEY', null, $client); + $transport->setPort(8984); + + $mail = new Email(); + $mail->subject('Hello!') + ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin')) + ->from(new Address('fabpot@symfony.com', 'Fabien')) + ->text('Hello There!'); + + $message = $transport->send($mail); + + $this->assertSame('foobar', $message->getMessageId()); + } + + public function testSendThrowsForErrorResponse() + { + $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface { + $xml = " + + i'm a teapot + 418 + + "; + + return new MockResponse($xml, [ + 'http_code' => 418, + ]); + }); + $transport = new SesApiTransport('ACCESS_KEY', 'SECRET_KEY', null, $client); + $transport->setPort(8984); + + $mail = new Email(); + $mail->subject('Hello!') + ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin')) + ->from(new Address('fabpot@symfony.com', 'Fabien')) + ->text('Hello There!'); + + $this->expectException(HttpTransportException::class); + $this->expectExceptionMessage('Unable to send an email: i\'m a teapot (code 418).'); + $transport->send($mail); + } } diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpTransportTest.php index 4e7cbd66aa15b..c57d00469d443 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpTransportTest.php +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpTransportTest.php @@ -12,7 +12,13 @@ namespace Symfony\Component\Mailer\Bridge\Amazon\Tests\Transport; use PHPUnit\Framework\TestCase; +use Symfony\Component\HttpClient\MockHttpClient; +use Symfony\Component\HttpClient\Response\MockResponse; use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesHttpTransport; +use Symfony\Component\Mailer\Exception\HttpTransportException; +use Symfony\Component\Mime\Address; +use Symfony\Component\Mime\Email; +use Symfony\Contracts\HttpClient\ResponseInterface; class SesHttpTransportTest extends TestCase { @@ -45,4 +51,70 @@ public function getTransportData() ], ]; } + + public function testSend() + { + $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface { + $this->assertSame('POST', $method); + $this->assertSame('https://email.eu-west-1.amazonaws.com:8984/', $url); + $this->assertStringContainsString('AWS3-HTTPS AWSAccessKeyId=ACCESS_KEY,Algorithm=HmacSHA256,Signature=', $options['headers'][0] ?? $options['request_headers'][0]); + + parse_str($options['body'], $body); + $content = base64_decode($body['RawMessage_Data']); + + $this->assertStringContainsString('Hello!', $content); + $this->assertStringContainsString('Saif Eddin ', $content); + $this->assertStringContainsString('Fabien ', $content); + $this->assertStringContainsString('Hello There!', $content); + + $xml = ' + + foobar + +'; + + return new MockResponse($xml, [ + 'http_code' => 200, + ]); + }); + $transport = new SesHttpTransport('ACCESS_KEY', 'SECRET_KEY', null, $client); + $transport->setPort(8984); + + $mail = new Email(); + $mail->subject('Hello!') + ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin')) + ->from(new Address('fabpot@symfony.com', 'Fabien')) + ->text('Hello There!'); + + $message = $transport->send($mail); + + $this->assertSame('foobar', $message->getMessageId()); + } + + public function testSendThrowsForErrorResponse() + { + $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface { + $xml = " + + i'm a teapot + 418 + + "; + + return new MockResponse($xml, [ + 'http_code' => 418, + ]); + }); + $transport = new SesHttpTransport('ACCESS_KEY', 'SECRET_KEY', null, $client); + + $mail = new Email(); + $mail->subject('Hello!') + ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin')) + ->from(new Address('fabpot@symfony.com', 'Fabien')) + ->text('Hello There!'); + + $this->expectException(HttpTransportException::class); + $this->expectExceptionMessage('Unable to send an email: i\'m a teapot (code 418).'); + $transport->send($mail); + } } diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillApiTransportTest.php index af4cdbeebedfb..550663e1b893f 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillApiTransportTest.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillApiTransportTest.php @@ -12,10 +12,14 @@ namespace Symfony\Component\Mailer\Bridge\Mailchimp\Tests\Transport; use PHPUnit\Framework\TestCase; +use Symfony\Component\HttpClient\MockHttpClient; +use Symfony\Component\HttpClient\Response\MockResponse; use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillApiTransport; use Symfony\Component\Mailer\Envelope; +use Symfony\Component\Mailer\Exception\HttpTransportException; use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Email; +use Symfony\Contracts\HttpClient\ResponseInterface; class MandrillApiTransportTest extends TestCase { @@ -61,4 +65,59 @@ public function testCustomHeader() $this->assertCount(1, $payload['message']['headers']); $this->assertEquals('foo: bar', $payload['message']['headers'][0]); } + + public function testSend() + { + $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface { + $this->assertSame('POST', $method); + $this->assertSame('https://mandrillapp.com/api/1.0/messages/send.json', $url); + + $body = json_decode($options['body'], true); + $message = $body['message']; + $this->assertSame('KEY', $body['key']); + $this->assertSame('Fabien', $message['from_name']); + $this->assertSame('fabpot@symfony.com', $message['from_email']); + $this->assertSame('Saif Eddin', $message['to'][0]['name']); + $this->assertSame('saif.gmati@symfony.com', $message['to'][0]['email']); + $this->assertSame('Hello!', $message['subject']); + $this->assertSame('Hello There!', $message['text']); + + return new MockResponse(json_encode([['_id' => 'foobar']]), [ + 'http_code' => 200, + ]); + }); + + $transport = new MandrillApiTransport('KEY', $client); + + $mail = new Email(); + $mail->subject('Hello!') + ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin')) + ->from(new Address('fabpot@symfony.com', 'Fabien')) + ->text('Hello There!'); + + $message = $transport->send($mail); + + $this->assertSame('foobar', $message->getMessageId()); + } + + public function testSendThrowsForErrorResponse() + { + $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface { + return new MockResponse(json_encode(['status' => 'error', 'message' => 'i\'m a teapot', 'code' => 418]), [ + 'http_code' => 418, + ]); + }); + + $transport = new MandrillApiTransport('KEY', $client); + + $mail = new Email(); + $mail->subject('Hello!') + ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin')) + ->from(new Address('fabpot@symfony.com', 'Fabien')) + ->text('Hello There!'); + + $this->expectException(HttpTransportException::class); + $this->expectExceptionMessage('Unable to send an email: i\'m a teapot (code 418).'); + $transport->send($mail); + } } diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillHttpTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillHttpTransportTest.php index dd72c848f14fe..dd2851154e76d 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillHttpTransportTest.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillHttpTransportTest.php @@ -12,7 +12,13 @@ namespace Symfony\Component\Mailer\Bridge\Mailchimp\Tests\Transport; use PHPUnit\Framework\TestCase; +use Symfony\Component\HttpClient\MockHttpClient; +use Symfony\Component\HttpClient\Response\MockResponse; use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillHttpTransport; +use Symfony\Component\Mailer\Exception\HttpTransportException; +use Symfony\Component\Mime\Address; +use Symfony\Component\Mime\Email; +use Symfony\Contracts\HttpClient\ResponseInterface; class MandrillHttpTransportTest extends TestCase { @@ -41,4 +47,60 @@ public function getTransportData() ], ]; } + + public function testSend() + { + $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface { + $this->assertSame('POST', $method); + $this->assertSame('https://mandrillapp.com/api/1.0/messages/send-raw.json', $url); + + $body = json_decode($options['body'], true); + $message = $body['raw_message']; + $this->assertSame('KEY', $body['key']); + $this->assertSame('Saif Eddin ', $body['to'][0]); + $this->assertSame('Fabien ', $body['from_email']); + + $this->assertStringContainsString('Subject: Hello!', $message); + $this->assertStringContainsString('To: Saif Eddin ', $message); + $this->assertStringContainsString('From: Fabien ', $message); + $this->assertStringContainsString('Hello There!', $message); + + return new MockResponse(json_encode([['_id' => 'foobar']]), [ + 'http_code' => 200, + ]); + }); + + $transport = new MandrillHttpTransport('KEY', $client); + + $mail = new Email(); + $mail->subject('Hello!') + ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin')) + ->from(new Address('fabpot@symfony.com', 'Fabien')) + ->text('Hello There!'); + + $message = $transport->send($mail); + + $this->assertSame('foobar', $message->getMessageId()); + } + + public function testSendThrowsForErrorResponse() + { + $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface { + return new MockResponse(json_encode(['status' => 'error', 'message' => 'i\'m a teapot', 'code' => 418]), [ + 'http_code' => 418, + ]); + }); + + $transport = new MandrillHttpTransport('KEY', $client); + + $mail = new Email(); + $mail->subject('Hello!') + ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin')) + ->from(new Address('fabpot@symfony.com', 'Fabien')) + ->text('Hello There!'); + + $this->expectException(HttpTransportException::class); + $this->expectExceptionMessage('Unable to send an email: i\'m a teapot (code 418).'); + $transport->send($mail); + } } diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillSmtpTransport.php index 72d2e8a51ade6..fee4d4a1de1d0 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillSmtpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillSmtpTransport.php @@ -22,7 +22,7 @@ class MandrillSmtpTransport extends EsmtpTransport { public function __construct(string $username, string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) { - parent::__construct('smtp.mandrillapp.com', 587, true, $dispatcher, $logger); + parent::__construct('smtp.mandrillapp.com', 587, false, $dispatcher, $logger); $this->setUsername($username); $this->setPassword($password); diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunApiTransportTest.php index f30fa0285c059..b4d235671ccda 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunApiTransportTest.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunApiTransportTest.php @@ -12,10 +12,14 @@ namespace Symfony\Component\Mailer\Bridge\Mailgun\Tests\Transport; use PHPUnit\Framework\TestCase; +use Symfony\Component\HttpClient\MockHttpClient; +use Symfony\Component\HttpClient\Response\MockResponse; use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunApiTransport; use Symfony\Component\Mailer\Envelope; +use Symfony\Component\Mailer\Exception\HttpTransportException; use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Email; +use Symfony\Contracts\HttpClient\ResponseInterface; class MailgunApiTransportTest extends TestCase { @@ -64,4 +68,67 @@ public function testCustomHeader() $this->assertArrayHasKey('h:x-mailgun-variables', $payload); $this->assertEquals($json, $payload['h:x-mailgun-variables']); } + + public function testSend() + { + $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface { + $this->assertSame('POST', $method); + $this->assertSame('https://api.us-east-1.mailgun.net:8984/v3/symfony/messages', $url); + $this->assertStringContainsString('Basic YXBpOkFDQ0VTU19LRVk=', $options['headers'][2] ?? $options['request_headers'][1]); + + $content = ''; + while ($chunk = $options['body']()) { + $content .= $chunk; + } + + $this->assertStringContainsString('Hello!', $content); + $this->assertStringContainsString('Saif Eddin ', $content); + $this->assertStringContainsString('Fabien ', $content); + $this->assertStringContainsString('Hello There!', $content); + + return new MockResponse(json_encode(['id' => 'foobar']), [ + 'http_code' => 200, + ]); + }); + $transport = new MailgunApiTransport('ACCESS_KEY', 'symfony', 'us-east-1', $client); + $transport->setPort(8984); + + $mail = new Email(); + $mail->subject('Hello!') + ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin')) + ->from(new Address('fabpot@symfony.com', 'Fabien')) + ->text('Hello There!'); + + $message = $transport->send($mail); + + $this->assertSame('foobar', $message->getMessageId()); + } + + public function testSendThrowsForErrorResponse() + { + $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface { + $this->assertSame('POST', $method); + $this->assertSame('https://api.mailgun.net:8984/v3/symfony/messages', $url); + $this->assertStringContainsStringIgnoringCase('Authorization: Basic YXBpOkFDQ0VTU19LRVk=', $options['headers'][2] ?? $options['request_headers'][1]); + + return new MockResponse(json_encode(['message' => 'i\'m a teapot']), [ + 'http_code' => 418, + 'response_headers' => [ + 'content-type' => 'application/json', + ], + ]); + }); + $transport = new MailgunApiTransport('ACCESS_KEY', 'symfony', 'us', $client); + $transport->setPort(8984); + + $mail = new Email(); + $mail->subject('Hello!') + ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin')) + ->from(new Address('fabpot@symfony.com', 'Fabien')) + ->text('Hello There!'); + + $this->expectException(HttpTransportException::class); + $this->expectExceptionMessage('Unable to send an email: i\'m a teapot (code 418).'); + $transport->send($mail); + } } diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunHttpTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunHttpTransportTest.php index 9b57b2b35e770..a50f1ffdeb0c8 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunHttpTransportTest.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunHttpTransportTest.php @@ -12,7 +12,13 @@ namespace Symfony\Component\Mailer\Bridge\Mailgun\Tests\Transport; use PHPUnit\Framework\TestCase; +use Symfony\Component\HttpClient\MockHttpClient; +use Symfony\Component\HttpClient\Response\MockResponse; use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunHttpTransport; +use Symfony\Component\Mailer\Exception\HttpTransportException; +use Symfony\Component\Mime\Address; +use Symfony\Component\Mime\Email; +use Symfony\Contracts\HttpClient\ResponseInterface; class MailgunHttpTransportTest extends TestCase { @@ -45,4 +51,67 @@ public function getTransportData() ], ]; } + + public function testSend() + { + $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface { + $this->assertSame('POST', $method); + $this->assertSame('https://api.us-east-1.mailgun.net:8984/v3/symfony/messages.mime', $url); + $this->assertStringContainsString('Basic YXBpOkFDQ0VTU19LRVk=', $options['headers'][2] ?? $options['request_headers'][1]); + + $content = ''; + while ($chunk = $options['body']()) { + $content .= $chunk; + } + + $this->assertStringContainsString('Subject: Hello!', $content); + $this->assertStringContainsString('To: Saif Eddin ', $content); + $this->assertStringContainsString('From: Fabien ', $content); + $this->assertStringContainsString('Hello There!', $content); + + return new MockResponse(json_encode(['id' => 'foobar']), [ + 'http_code' => 200, + ]); + }); + $transport = new MailgunHttpTransport('ACCESS_KEY', 'symfony', 'us-east-1', $client); + $transport->setPort(8984); + + $mail = new Email(); + $mail->subject('Hello!') + ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin')) + ->from(new Address('fabpot@symfony.com', 'Fabien')) + ->text('Hello There!'); + + $message = $transport->send($mail); + + $this->assertSame('foobar', $message->getMessageId()); + } + + public function testSendThrowsForErrorResponse() + { + $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface { + $this->assertSame('POST', $method); + $this->assertSame('https://api.mailgun.net:8984/v3/symfony/messages.mime', $url); + $this->assertStringContainsString('Basic YXBpOkFDQ0VTU19LRVk=', $options['headers'][2] ?? $options['request_headers'][1]); + + return new MockResponse(json_encode(['message' => 'i\'m a teapot']), [ + 'http_code' => 418, + 'response_headers' => [ + 'content-type' => 'application/json', + ], + ]); + }); + $transport = new MailgunHttpTransport('ACCESS_KEY', 'symfony', 'us', $client); + $transport->setPort(8984); + + $mail = new Email(); + $mail->subject('Hello!') + ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin')) + ->from(new Address('fabpot@symfony.com', 'Fabien')) + ->text('Hello There!'); + + $this->expectException(HttpTransportException::class); + $this->expectExceptionMessage('Unable to send an email: i\'m a teapot (code 418).'); + $transport->send($mail); + } } diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkApiTransportTest.php index 6996997b659c2..356880bc20e63 100644 --- a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkApiTransportTest.php +++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkApiTransportTest.php @@ -12,10 +12,14 @@ namespace Symfony\Component\Mailer\Bridge\Postmark\Tests\Transport; use PHPUnit\Framework\TestCase; +use Symfony\Component\HttpClient\MockHttpClient; +use Symfony\Component\HttpClient\Response\MockResponse; use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkApiTransport; use Symfony\Component\Mailer\Envelope; +use Symfony\Component\Mailer\Exception\HttpTransportException; use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Email; +use Symfony\Contracts\HttpClient\ResponseInterface; class PostmarkApiTransportTest extends TestCase { @@ -61,4 +65,59 @@ public function testCustomHeader() $this->assertEquals(['Name' => 'foo', 'Value' => 'bar'], $payload['Headers'][0]); } + + public function testSend() + { + $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface { + $this->assertSame('POST', $method); + $this->assertSame('https://api.postmarkapp.com/email', $url); + $this->assertStringContainsStringIgnoringCase('X-Postmark-Server-Token: KEY', $options['headers'][1] ?? $options['request_headers'][1]); + + $body = json_decode($options['body'], true); + $this->assertSame('Fabien ', $body['From']); + $this->assertSame('Saif Eddin ', $body['To']); + $this->assertSame('Hello!', $body['Subject']); + $this->assertSame('Hello There!', $body['TextBody']); + + return new MockResponse(json_encode(['MessageID' => 'foobar']), [ + 'http_code' => 200, + ]); + }); + + $transport = new PostmarkApiTransport('KEY', $client); + + $mail = new Email(); + $mail->subject('Hello!') + ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin')) + ->from(new Address('fabpot@symfony.com', 'Fabien')) + ->text('Hello There!'); + + $message = $transport->send($mail); + + $this->assertSame('foobar', $message->getMessageId()); + } + + public function testSendThrowsForErrorResponse() + { + $client = new MockHttpClient(static function (string $method, string $url, array $options): ResponseInterface { + return new MockResponse(json_encode(['Message' => 'i\'m a teapot', 'ErrorCode' => 418]), [ + 'http_code' => 418, + 'response_headers' => [ + 'content-type' => 'application/json', + ], + ]); + }); + $transport = new PostmarkApiTransport('KEY', $client); + $transport->setPort(8984); + + $mail = new Email(); + $mail->subject('Hello!') + ->to(new Address('saif.gmati@symfony.com', 'Saif Eddin')) + ->from(new Address('fabpot@symfony.com', 'Fabien')) + ->text('Hello There!'); + + $this->expectException(HttpTransportException::class); + $this->expectExceptionMessage('Unable to send an email: i\'m a teapot (code 418).'); + $transport->send($mail); + } } diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php index b6d9ba2827501..bd955934b04ce 100644 --- a/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php @@ -26,7 +26,7 @@ class PostmarkSmtpTransport extends EsmtpTransport { public function __construct(string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) { - parent::__construct('smtp.postmarkapp.com', 587, true, $dispatcher, $logger); + parent::__construct('smtp.postmarkapp.com', 587, false, $dispatcher, $logger); $this->setUsername($id); $this->setPassword($id); diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php index ae9a76fe2208d..b73a3a196b504 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php @@ -207,7 +207,40 @@ public function testEncodedSkipsNonEncodeableStamps() $encoded = $serializer->encode($envelope); $this->assertStringNotContainsString('DummySymfonySerializerNonSendableStamp', print_r($encoded['headers'], true)); } + + public function testDecodingFailedConstructorDeserialization() + { + $serializer = new Serializer(); + + $this->expectException(MessageDecodingFailedException::class); + + $serializer->decode([ + 'body' => '{}', + 'headers' => ['type' => DummySymfonySerializerInvalidConstructor::class], + ]); + } + + public function testDecodingStampFailedDeserialization() + { + $serializer = new Serializer(); + + $this->expectException(MessageDecodingFailedException::class); + + $serializer->decode([ + 'body' => '{"message":"hello"}', + 'headers' => [ + 'type' => DummyMessage::class, + 'X-Message-Stamp-'.SerializerStamp::class => '[{}]', + ], + ]); + } } class DummySymfonySerializerNonSendableStamp implements NonSendableStampInterface { } +class DummySymfonySerializerInvalidConstructor +{ + public function __construct(string $missingArgument) + { + } +} diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php index d5d4d74031dfd..2b4017e946ce5 100644 --- a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php +++ b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php @@ -85,13 +85,13 @@ public static function buildConfiguration(string $dsn, array $options = []): arr // check for extra keys in options $optionsExtraKeys = array_diff(array_keys($options), array_keys(self::DEFAULT_OPTIONS)); if (0 < \count($optionsExtraKeys)) { - throw new InvalidArgumentException(sprintf('Unknown option found : [%s]. Allowed options are [%s]', implode(', ', $optionsExtraKeys), implode(', ', self::DEFAULT_OPTIONS))); + throw new InvalidArgumentException(sprintf('Unknown option found : [%s]. Allowed options are [%s]', implode(', ', $optionsExtraKeys), implode(', ', array_keys(self::DEFAULT_OPTIONS)))); } // check for extra keys in options $queryExtraKeys = array_diff(array_keys($query), array_keys(self::DEFAULT_OPTIONS)); if (0 < \count($queryExtraKeys)) { - throw new InvalidArgumentException(sprintf('Unknown option found in DSN: [%s]. Allowed options are [%s]', implode(', ', $queryExtraKeys), implode(', ', self::DEFAULT_OPTIONS))); + throw new InvalidArgumentException(sprintf('Unknown option found in DSN: [%s]. Allowed options are [%s]', implode(', ', $queryExtraKeys), implode(', ', array_keys(self::DEFAULT_OPTIONS)))); } return $configuration; diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php index 2dfcb1bb83692..8d466500fd9a6 100644 --- a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php +++ b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php @@ -19,7 +19,7 @@ use Symfony\Component\Messenger\Stamp\StampInterface; use Symfony\Component\Serializer\Encoder\JsonEncoder; use Symfony\Component\Serializer\Encoder\XmlEncoder; -use Symfony\Component\Serializer\Exception\UnexpectedValueException; +use Symfony\Component\Serializer\Exception\ExceptionInterface; use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer; use Symfony\Component\Serializer\Normalizer\ObjectNormalizer; use Symfony\Component\Serializer\Serializer as SymfonySerializer; @@ -79,7 +79,7 @@ public function decode(array $encodedEnvelope): Envelope try { $message = $this->serializer->deserialize($encodedEnvelope['body'], $encodedEnvelope['headers']['type'], $this->format, $context); - } catch (UnexpectedValueException $e) { + } catch (ExceptionInterface $e) { throw new MessageDecodingFailedException(sprintf('Could not decode message: %s.', $e->getMessage()), $e->getCode(), $e); } @@ -117,7 +117,7 @@ private function decodeStamps(array $encodedEnvelope): array try { $stamps[] = $this->serializer->deserialize($value, substr($name, \strlen(self::STAMP_HEADER_PREFIX)).'[]', $this->format, $this->context); - } catch (UnexpectedValueException $e) { + } catch (ExceptionInterface $e) { throw new MessageDecodingFailedException(sprintf('Could not decode stamp: %s.', $e->getMessage()), $e->getCode(), $e); } } diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php index dd1009142b14f..19dad6889bd55 100644 --- a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php +++ b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php @@ -58,7 +58,7 @@ public function __construct(iterable $voters = [], string $strategy = self::STRA public function decide(TokenInterface $token, array $attributes, $object = null) { if (\count($attributes) > 1) { - @trigger_error(sprintf('Passing more than one Security attribute to %s() is deprecated since Symfony 4.4. Use multiple decide() calls or the expression language (e.g. "has_role(...) or has_role(...)") instead.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('Passing more than one Security attribute to %s() is deprecated since Symfony 4.4. Use multiple decide() calls or the expression language (e.g. "is_granted(...) or is_granted(...)") instead.', __METHOD__), E_USER_DEPRECATED); } return $this->{$this->strategy}($token, $attributes, $object); diff --git a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php index a17ef2337cc84..21f06a1a66d8b 100644 --- a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php +++ b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php @@ -56,7 +56,7 @@ final public function isGranted($attributes, $subject = null): bool if (!\is_array($attributes)) { $attributes = [$attributes]; } else { - @trigger_error(sprintf('Passing an array of Security attributes to %s() is deprecated since Symfony 4.4. Use multiple isGranted() calls or the expression language (e.g. "has_role(...) or has_role(...)") instead.', __METHOD__), E_USER_DEPRECATED); + @trigger_error(sprintf('Passing an array of Security attributes to %s() is deprecated since Symfony 4.4. Use multiple isGranted() calls or the expression language (e.g. "is_granted(...) or is_granted(...)") instead.', __METHOD__), E_USER_DEPRECATED); } return $this->accessDecisionManager->decide($token, $attributes, $subject); diff --git a/src/Symfony/Component/Security/Core/User/ChainUserProvider.php b/src/Symfony/Component/Security/Core/User/ChainUserProvider.php index 16bdcc5a63447..cdce7a9bf677b 100644 --- a/src/Symfony/Component/Security/Core/User/ChainUserProvider.php +++ b/src/Symfony/Component/Security/Core/User/ChainUserProvider.php @@ -91,7 +91,7 @@ public function refreshUser(UserInterface $user) $e->setUsername($user->getUsername()); throw $e; } else { - throw new UnsupportedUserException(sprintf('The account "%s" is not supported.', \get_class($user))); + throw new UnsupportedUserException(sprintf('There is no user provider for user "%s". Shouldn\'t the "supportsClass()" method of your user provider return true for this classname?', \get_class($user))); } } diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php index 9193a5c5c48e5..9243119acb1cf 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php @@ -292,7 +292,7 @@ protected function refreshUser(TokenInterface $token) return null; } - throw new \RuntimeException(sprintf('There is no user provider for user "%s".', $userClass)); + throw new \RuntimeException(sprintf('There is no user provider for user "%s". Shouldn\'t the "supportsClass()" method of your user provider return true for this classname?', $userClass)); } private function safelyUnserialize(string $serializedToken) diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php index 9c9e1c07cc527..869195995bfd3 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php @@ -234,7 +234,7 @@ final protected function getUserProvider(string $class): UserProviderInterface } } - throw new UnsupportedUserException(sprintf('There is no user provider that supports class "%s".', $class)); + throw new UnsupportedUserException(sprintf('There is no user provider for user "%s". Shouldn\'t the "supportsClass()" method of your user provider return true for this classname?', $class)); } /** diff --git a/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php b/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php index 74ecf02cf39c1..2a8d3f4f56eeb 100644 --- a/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php +++ b/src/Symfony/Component/Validator/Mapping/PropertyMetadata.php @@ -48,7 +48,13 @@ public function __construct(string $class, string $name) */ public function getPropertyValue($object) { - return $this->getReflectionMember($object)->getValue($object); + $reflProperty = $this->getReflectionMember($object); + + if (\PHP_VERSION_ID >= 70400 && !$reflProperty->isInitialized($object)) { + return null; + } + + return $reflProperty->getValue($object); } /** diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/Entity_74.php b/src/Symfony/Component/Validator/Tests/Fixtures/Entity_74.php new file mode 100644 index 0000000000000..cb22fb7f72410 --- /dev/null +++ b/src/Symfony/Component/Validator/Tests/Fixtures/Entity_74.php @@ -0,0 +1,8 @@ +expectException('Symfony\Component\Validator\Exception\ValidatorException'); $metadata->getPropertyValue($entity); } + + /** + * @requires PHP 7.4 + */ + public function testGetPropertyValueFromUninitializedProperty() + { + $entity = new Entity_74(); + $metadata = new PropertyMetadata(self::CLASSNAME_74, 'uninitialized'); + + $this->assertNull($metadata->getPropertyValue($entity)); + } } diff --git a/src/Symfony/Component/VarDumper/Caster/ClassStub.php b/src/Symfony/Component/VarDumper/Caster/ClassStub.php index 758fe57bb4a1b..c998b49f2cc47 100644 --- a/src/Symfony/Component/VarDumper/Caster/ClassStub.php +++ b/src/Symfony/Component/VarDumper/Caster/ClassStub.php @@ -56,7 +56,7 @@ public function __construct(string $identifier, $callable = null) } if (false !== strpos($identifier, "class@anonymous\0")) { - $this->value = $identifier = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[0-9a-fA-F]++/', function ($m) { + $this->value = $identifier = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) { return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0]; }, $identifier); } diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php index a2a21a56ea8ce..9fe1e39ae49e0 100644 --- a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php +++ b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php @@ -283,7 +283,7 @@ private static function filterExceptionArray(string $xClass, array $a, string $x unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']); if (isset($a[Caster::PREFIX_PROTECTED.'message']) && false !== strpos($a[Caster::PREFIX_PROTECTED.'message'], "class@anonymous\0")) { - $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:)[0-9a-fA-F]++/', function ($m) { + $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/class@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) { return class_exists($m[0], false) ? get_parent_class($m[0]).'@anonymous' : $m[0]; }, $a[Caster::PREFIX_PROTECTED.'message']); }