diff --git a/CHANGELOG-4.2.md b/CHANGELOG-4.2.md index 5f18cce5375ef..f45e7e7273ab4 100644 --- a/CHANGELOG-4.2.md +++ b/CHANGELOG-4.2.md @@ -7,6 +7,25 @@ in 4.2 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.2.0...v4.2.1 +* 4.2.8 (2019-05-01) + + * bug #31338 Revert "bug #30620 [FrameworkBundle][HttpFoundation] make session service resettable (dmaicher)" (nicolas-grekas) + * bug #31326 fix ConsoleFormatter - call to a member function format() on string (keksa) + * bug #31331 [Workflow] Fixed dumping when many transition with same name exist (lyrixx) + * bug #31302 [FramworkBundle] mark any env vars found in the ide setting as used (nicolas-grekas) + * bug #31290 [TwigBundle] Use the apply tag instead of the filter tag (greg0ire) + * bug #31275 [Translator] Preserve default domain when extracting strings from php files (Stadly) + * bug #31240 Fix url matcher edge cases with trailing slash (arjenm) + * bug #31201 [Form] resolve class name parameters (xabbuh) + * bug #31213 [WebProfilerBundle] Intercept redirections only for HTML format (javiereguiluz) + * bug #31210 [PhpUnitBridge] fix reading phpunit.xml on bootstrap (nicolas-grekas) + * bug #31023 [Routing] Fix route URL generation in CLI context (X-Coder264) + * bug #31117 [FrameworkBundle] fix math depth handler configuration (Raulnet) + * bug #31182 [Routing] fix trailing slash matching with empty-matching trailing vars (nicolas-grekas) + * bug #31167 [Routing] fix matching trailing vars with defaults (nicolas-grekas) + * bug #31164 [Validator] fix LegacyTranslatorProxy (nicolas-grekas) + * bug #31156 [FrameworkBundle] call method with Translator component only (xabbuh) + * 4.2.7 (2019-04-17) * bug #31107 [Routing] fix trailing slash redirection with non-greedy trailing vars (nicolas-grekas) diff --git a/composer.json b/composer.json index b0fcede7bf746..b1fde067a7c1c 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "doctrine/event-manager": "~1.0", "doctrine/persistence": "~1.0", "fig/link-util": "^1.0", - "twig/twig": "^1.35|^2.4.4", + "twig/twig": "^1.40|^2.9", "psr/cache": "~1.0", "psr/container": "^1.0", "psr/link": "^1.0", diff --git a/phpunit b/phpunit index ade55fab342c1..5bbbf0ded1863 100755 --- a/phpunit +++ b/phpunit @@ -1,7 +1,7 @@ #!/usr/bin/env php options['format'], [ - '%datetime%' => $record['datetime']->format($this->options['date_format']), + '%datetime%' => $record['datetime'] instanceof \DateTimeInterface + ? $record['datetime']->format($this->options['date_format']) + : $record['datetime'], '%start_tag%' => sprintf('<%s>', $levelColor), '%level_name%' => sprintf($this->options['level_name_format'], $record['level_name']), '%end_tag%' => '', diff --git a/src/Symfony/Bridge/Monolog/Tests/Formatter/ConsoleFormatterTest.php b/src/Symfony/Bridge/Monolog/Tests/Formatter/ConsoleFormatterTest.php new file mode 100644 index 0000000000000..c09597e916cfc --- /dev/null +++ b/src/Symfony/Bridge/Monolog/Tests/Formatter/ConsoleFormatterTest.php @@ -0,0 +1,66 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\Monolog\Tests\Formatter; + +use Monolog\Logger; +use PHPUnit\Framework\TestCase; +use Symfony\Bridge\Monolog\Formatter\ConsoleFormatter; + +class ConsoleFormatterTest extends TestCase +{ + /** + * @dataProvider providerFormatTests + */ + public function testFormat(array $record, $expectedMessage) + { + $formatter = new ConsoleFormatter(); + self::assertSame($expectedMessage, $formatter->format($record)); + } + + /** + * @return array + */ + public function providerFormatTests() + { + $currentDateTime = new \DateTime(); + + return [ + 'record with DateTime object in datetime field' => [ + 'record' => [ + 'message' => 'test', + 'context' => [], + 'level' => Logger::WARNING, + 'level_name' => Logger::getLevelName(Logger::WARNING), + 'channel' => 'test', + 'datetime' => $currentDateTime, + 'extra' => [], + ], + 'expectedMessage' => sprintf( + "%s WARNING [test] test\n", + $currentDateTime->format(ConsoleFormatter::SIMPLE_DATE) + ), + ], + 'record with string in datetime field' => [ + 'record' => [ + 'message' => 'test', + 'context' => [], + 'level' => Logger::WARNING, + 'level_name' => Logger::getLevelName(Logger::WARNING), + 'channel' => 'test', + 'datetime' => '2019-01-01T00:42:00+00:00', + 'extra' => [], + ], + 'expectedMessage' => "2019-01-01T00:42:00+00:00 WARNING [test] test\n", + ], + ]; + } +} diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit index d918e8a0a2041..399866eb86d90 100755 --- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit +++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit @@ -37,6 +37,9 @@ $getEnvVar = function ($name, $default = false) { } if (false !== $phpunitConfig) { $var = new DOMXpath($phpunitConfig); + foreach ($var->query('//php/server[@name="'.$name.'"]') as $var) { + return $var->getAttribute('value'); + } foreach ($var->query('//php/env[@name="'.$name.'"]') as $var) { return $var->getAttribute('value'); } @@ -92,7 +95,7 @@ $COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar') || ($COMPOSER = rt : 'composer'; -$SYMFONY_PHPUNIT_REMOVE = $getEnvVar('SYMFONY_PHPUNIT_REMOVE', 'phpspec/prophecy symfony/yaml'); +$SYMFONY_PHPUNIT_REMOVE = $getEnvVar('SYMFONY_PHPUNIT_REMOVE', 'phpspec/prophecy'.($PHPUNIT_VERSION < 6.0 ? ' symfony/yaml': '')); if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__FILE__)."\n".$SYMFONY_PHPUNIT_REMOVE !== @file_get_contents("$PHPUNIT_DIR/.$PHPUNIT_VERSION.md5")) { // Build a standalone phpunit without symfony/yaml nor prophecy by default diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php index 5beae16dba3f7..04b68ef6be199 100644 --- a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php +++ b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php @@ -95,7 +95,7 @@ protected function doEnterNode(Node $node, Environment $env) protected function doLeaveNode(Node $node, Environment $env) { if ($node instanceof TransDefaultDomainNode) { - return false; + return null; } if ($node instanceof BlockNode || $node instanceof ModuleNode) { diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php index 3bf3d5ed41359..64f178cc39e58 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php @@ -2413,11 +2413,7 @@ public function testTimezone() [@name="name"] [@class="my&class form-control"] [not(@required)] - [./optgroup - [@label="Europe"] - [./option[@value="Europe/Vienna"][@selected="selected"][.="Vienna"]] - ] - [count(./optgroup)>10] + [.//option[@value="Europe/Vienna"][@selected="selected"]] [count(.//option)>200] ' ); @@ -2434,7 +2430,6 @@ public function testTimezoneWithPlaceholder() '/select [@class="my&class form-control"] [./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Timezone[/trans]"]] - [count(./optgroup)>10] [count(.//option)>201] ' ); diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 9405dc2c9c3f4..9674f21031509 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -18,7 +18,7 @@ "require": { "php": "^7.1.3", "symfony/contracts": "^1.0.2", - "twig/twig": "^1.38.1|^2.7.1" + "twig/twig": "^1.40|^2.9" }, "require-dev": { "symfony/asset": "~3.4|~4.0", diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php index 9b5193d63bcea..9debddcad771b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php @@ -220,6 +220,8 @@ protected function getContainerBuilder() private function findProperServiceName(InputInterface $input, SymfonyStyle $io, ContainerBuilder $builder, string $name, bool $showHidden) { + $name = ltrim($name, '\\'); + if ($builder->has($name) || !$input->isInteractive()) { return $name; } diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index a52caa46c032d..cee4b1d2883fa 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -95,6 +95,7 @@ use Symfony\Component\Stopwatch\Stopwatch; use Symfony\Component\Translation\Command\XliffLintCommand as BaseXliffLintCommand; use Symfony\Component\Translation\Translator; +use Symfony\Component\Translation\TranslatorInterface; use Symfony\Component\Validator\ConstraintValidatorInterface; use Symfony\Component\Validator\ObjectInitializerInterface; use Symfony\Component\Validator\Util\LegacyTranslatorProxy; @@ -192,6 +193,8 @@ public function load(array $configs, ContainerBuilder $container) 'vscode' => 'vscode://file/%%f:%%l', ]; $ide = $config['ide']; + // mark any env vars found in the ide setting as used + $container->resolveEnvPlaceholders($ide); $container->setParameter('templating.helper.code.file_link_format', str_replace('%', '%%', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')) ?: (isset($links[$ide]) ? $links[$ide] : $ide)); } @@ -1108,7 +1111,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder $validatorBuilder = $container->getDefinition('validator.builder'); - if (class_exists(LegacyTranslatorProxy::class)) { + if (interface_exists(TranslatorInterface::class) && class_exists(LegacyTranslatorProxy::class)) { $calls = $validatorBuilder->getMethodCalls(); $calls[1] = ['setTranslator', [new Definition(LegacyTranslatorProxy::class, [new Reference('translator')])]]; $validatorBuilder->setMethodCalls($calls); @@ -1409,7 +1412,9 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder } if ($config['max_depth_handler'] ?? false) { - $container->getDefinition('serializer.normalizer.object')->addMethodCall('setMaxDepthHandler', [new Reference($config['max_depth_handler'])]); + $defaultContext = $container->getDefinition('serializer.normalizer.object')->getArgument(6); + $defaultContext += ['max_depth_handler' => new Reference($config['max_depth_handler'])]; + $container->getDefinition('serializer.normalizer.object')->replaceArgument(6, $defaultContext); } } diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml index 9cad97d984e11..ea12c693d7d0a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml @@ -71,6 +71,7 @@ + %kernel.default_locale% diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml index 2c1665bea4965..df4e209f6e775 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml @@ -62,6 +62,8 @@ + null + diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml index fd251629d9fd8..020e29e7211f6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml @@ -15,7 +15,6 @@ - diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php index 6bea82e1ef13f..93e6c3ad85f83 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php @@ -43,7 +43,7 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI * @param ContainerInterface|null $parameters A ContainerInterface instance allowing to fetch parameters * @param LoggerInterface|null $logger */ - public function __construct(ContainerInterface $container, $resource, array $options = [], RequestContext $context = null, ContainerInterface $parameters = null, LoggerInterface $logger = null) + public function __construct(ContainerInterface $container, $resource, array $options = [], RequestContext $context = null, ContainerInterface $parameters = null, LoggerInterface $logger = null, string $defaultLocale = null) { $this->container = $container; $this->resource = $resource; @@ -58,6 +58,8 @@ public function __construct(ContainerInterface $container, $resource, array $opt } else { throw new \LogicException(sprintf('You should either pass a "%s" instance or provide the $parameters argument of the "%s" method.', SymfonyContainerInterface::class, __METHOD__)); } + + $this->defaultLocale = $defaultLocale; } /** diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index b6b520daa19cb..0b27dbff63d5f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -49,6 +49,7 @@ use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer; use Symfony\Component\Serializer\Serializer; use Symfony\Component\Translation\DependencyInjection\TranslatorPass; +use Symfony\Component\Translation\TranslatorInterface; use Symfony\Component\Validator\DependencyInjection\AddConstraintValidatorsPass; use Symfony\Component\Validator\Util\LegacyTranslatorProxy; use Symfony\Component\Workflow; @@ -819,7 +820,7 @@ public function testValidation() $this->assertSame('setConstraintValidatorFactory', $calls[0][0]); $this->assertEquals([new Reference('validator.validator_factory')], $calls[0][1]); $this->assertSame('setTranslator', $calls[1][0]); - if (class_exists(LegacyTranslatorProxy::class)) { + if (interface_exists(TranslatorInterface::class) && class_exists(LegacyTranslatorProxy::class)) { $this->assertEquals([new Definition(LegacyTranslatorProxy::class, [new Reference('translator')])], $calls[1][1]); } else { $this->assertEquals([new Reference('translator')], $calls[1][1]); @@ -1072,7 +1073,8 @@ public function testSerializerEnabled() $this->assertEquals(new Reference('serializer.name_converter.camel_case_to_snake_case'), $container->getDefinition('serializer.name_converter.metadata_aware')->getArgument(1)); $this->assertEquals(new Reference('property_info', ContainerBuilder::IGNORE_ON_INVALID_REFERENCE), $container->getDefinition('serializer.normalizer.object')->getArgument(3)); $this->assertEquals(['setCircularReferenceHandler', [new Reference('my.circular.reference.handler')]], $container->getDefinition('serializer.normalizer.object')->getMethodCalls()[0]); - $this->assertEquals(['setMaxDepthHandler', [new Reference('my.max.depth.handler')]], $container->getDefinition('serializer.normalizer.object')->getMethodCalls()[1]); + $this->assertArrayHasKey('max_depth_handler', $container->getDefinition('serializer.normalizer.object')->getArgument(6)); + $this->assertEquals($container->getDefinition('serializer.normalizer.object')->getArgument(6)['max_depth_handler'], new Reference('my.max.depth.handler')); } public function testRegisterSerializerExtractor() diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php index ee13386a4b767..61ffa68aed44f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php @@ -85,6 +85,7 @@ public function provideIgnoreBackslashWhenFindingService() return [ [BackslashClass::class], ['FixturesBackslashClass'], + ['\\'.BackslashClass::class], ]; } } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php index 329f1e7cbaf78..3f04e46dd57e7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php @@ -82,6 +82,32 @@ public function testGenerateWithServiceParamWithSfContainer() $this->assertSame('"bar" == "bar"', $router->getRouteCollection()->get('foo')->getCondition()); } + public function testGenerateWithDefaultLocale() + { + $routes = new RouteCollection(); + + $route = new Route(''); + + $name = 'testFoo'; + + foreach (['hr' => '/test-hr', 'en' => '/test-en'] as $locale => $path) { + $localizedRoute = clone $route; + $localizedRoute->setDefault('_locale', $locale); + $localizedRoute->setDefault('_canonical_route', $name); + $localizedRoute->setPath($path); + $routes->add($name.'.'.$locale, $localizedRoute); + } + + $sc = $this->getServiceContainer($routes); + + $router = new Router($sc, '', [], null, null, null, 'hr'); + + $this->assertSame('/test-hr', $router->generate($name)); + + $this->assertSame('/test-en', $router->generate($name, ['_locale' => 'en'])); + $this->assertSame('/test-hr', $router->generate($name, ['_locale' => 'hr'])); + } + public function testDefaultsPlaceholders() { $routes = new RouteCollection(); diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 44bb6b0396190..dbf22c2f33fc1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -28,7 +28,7 @@ "symfony/polyfill-mbstring": "~1.0", "symfony/filesystem": "~3.4|~4.0", "symfony/finder": "~3.4|~4.0", - "symfony/routing": "^4.1" + "symfony/routing": "^4.2.8" }, "require-dev": { "doctrine/cache": "~1.0", diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig index d35f7602304e8..e7c835b926121 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig @@ -19,9 +19,9 @@ {% if exception.trace|length %} 
-                {%- filter escape('html') -%}
+                {%- apply escape('html') -%}
                     {{- include('@Twig/Exception/traces.txt.twig', { exception: exception, format: 'html' }, with_context = false) }}
-                {%- endfilter -%}
+                {%- endapply -%}
{% endif %} diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index 6bd99f01cea17..4e163c2eedec4 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -22,7 +22,7 @@ "symfony/http-foundation": "~4.1", "symfony/http-kernel": "~4.1", "symfony/polyfill-ctype": "~1.8", - "twig/twig": "~1.34|~2.4" + "twig/twig": "~1.40|~2.9" }, "require-dev": { "symfony/asset": "~3.4|~4.0", diff --git a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php index 4dd4438ed9061..3b80024bcc5b3 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php +++ b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php @@ -85,7 +85,7 @@ public function onKernelResponse(FilterResponseEvent $event) return; } - if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects) { + if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects && 'html' === $request->getRequestFormat()) { $session = $request->getSession(); if (null !== $session && $session->isStarted() && $session->getFlashBag() instanceof AutoExpireFlashBag) { // keep current flashes for one more request if using AutoExpireFlashBag diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php index 1d6bd12daee56..6dde6e413ad19 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php @@ -58,7 +58,7 @@ public function getInjectToolbarTests() /** * @dataProvider provideRedirects */ - public function testRedirectionIsIntercepted($statusCode, $hasSession) + public function testHtmlRedirectionIsIntercepted($statusCode, $hasSession) { $response = new Response('Some content', $statusCode); $response->headers->set('X-Debug-Token', 'xxxxxxxx'); @@ -71,6 +71,19 @@ public function testRedirectionIsIntercepted($statusCode, $hasSession) $this->assertEquals('Redirection', $response->getContent()); } + public function testNonHtmlRedirectionIsNotIntercepted() + { + $response = new Response('Some content', '301'); + $response->headers->set('X-Debug-Token', 'xxxxxxxx'); + $event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'json', true), HttpKernelInterface::MASTER_REQUEST, $response); + + $listener = new WebDebugToolbarListener($this->getTwigMock('Redirection'), true); + $listener->onKernelResponse($event); + + $this->assertEquals(301, $response->getStatusCode()); + $this->assertEquals('Some content', $response->getContent()); + } + public function testToolbarIsInjected() { $response = new Response(''); diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index 251eeb8321a62..497064cdddb47 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -1483,13 +1483,13 @@ public function getRemovedBindingIds() } /** - * Adds a removed binding id. + * Removes bindings for a service. * - * @param int $id + * @param string $id The service identifier * * @internal */ - public function addRemovedBindingIds($id) + public function removeBindings($id) { if ($this->hasDefinition($id)) { foreach ($this->getDefinition($id)->getBindings() as $key => $binding) { diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php index 066baa662121d..cf76e3642b138 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php @@ -59,7 +59,7 @@ public function __destruct() { parent::__destruct(); - $this->container->addRemovedBindingIds($this->id); + $this->container->removeBindings($this->id); if (!$this->definition instanceof ChildDefinition) { $this->container->setDefinition($this->id, $this->definition->setInstanceofConditionals($this->instanceof)); diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php index 0ccaf22e399b2..149a07ceeda44 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php @@ -91,7 +91,7 @@ public function registerClasses(Definition $prototype, $namespace, $resource, $e */ protected function setDefinition($id, Definition $definition) { - $this->container->addRemovedBindingIds($id); + $this->container->removeBindings($id); if ($this->isLoadingInstanceof) { if (!$definition instanceof ChildDefinition) { diff --git a/src/Symfony/Component/Form/DependencyInjection/FormPass.php b/src/Symfony/Component/Form/DependencyInjection/FormPass.php index 358bf71205b70..f3cb08577eb76 100644 --- a/src/Symfony/Component/Form/DependencyInjection/FormPass.php +++ b/src/Symfony/Component/Form/DependencyInjection/FormPass.php @@ -92,18 +92,20 @@ private function processFormTypeExtensions(ContainerBuilder $container) $serviceDefinition = $container->getDefinition($serviceId); $tag = $serviceDefinition->getTag($this->formTypeExtensionTag); + $typeExtensionClass = $container->getParameterBag()->resolveValue($serviceDefinition->getClass()); + if (isset($tag[0]['extended_type'])) { - if (!method_exists($serviceDefinition->getClass(), 'getExtendedTypes')) { - @trigger_error(sprintf('Not implementing the static getExtendedTypes() method in %s when implementing the %s is deprecated since Symfony 4.2. The method will be added to the interface in 5.0.', $serviceDefinition->getClass(), FormTypeExtensionInterface::class), E_USER_DEPRECATED); + if (!method_exists($typeExtensionClass, 'getExtendedTypes')) { + @trigger_error(sprintf('Not implementing the static getExtendedTypes() method in %s when implementing the %s is deprecated since Symfony 4.2. The method will be added to the interface in 5.0.', $typeExtensionClass, FormTypeExtensionInterface::class), E_USER_DEPRECATED); } $typeExtensions[$tag[0]['extended_type']][] = new Reference($serviceId); - $typeExtensionsClasses[] = $serviceDefinition->getClass(); - } elseif (method_exists($serviceDefinition->getClass(), 'getExtendedTypes')) { + $typeExtensionsClasses[] = $typeExtensionClass; + } elseif (method_exists($typeExtensionClass, 'getExtendedTypes')) { $extendsTypes = false; - $typeExtensionsClasses[] = $serviceDefinition->getClass(); - foreach ($serviceDefinition->getClass()::getExtendedTypes() as $extendedType) { + $typeExtensionsClasses[] = $typeExtensionClass; + foreach ($typeExtensionClass::getExtendedTypes() as $extendedType) { $typeExtensions[$extendedType][] = new Reference($serviceId); $extendsTypes = true; } @@ -112,7 +114,7 @@ private function processFormTypeExtensions(ContainerBuilder $container) throw new InvalidArgumentException(sprintf('The getExtendedTypes() method for service "%s" does not return any extended types.', $serviceId)); } } else { - throw new InvalidArgumentException(sprintf('"%s" tagged services have to implement the static getExtendedTypes() method. The class for service "%s" does not implement it.', $this->formTypeExtensionTag, $serviceId)); + throw new InvalidArgumentException(sprintf('"%s" tagged services have to implement the static getExtendedTypes() method. Class "%s" for service "%s" does not implement it.', $this->formTypeExtensionTag, $typeExtensionClass, $serviceId)); } } diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeZoneToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeZoneToStringTransformer.php index e319a89076b0e..d04488f094b05 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeZoneToStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeZoneToStringTransformer.php @@ -17,7 +17,7 @@ /** * Transforms between a timezone identifier string and a DateTimeZone object. * - * @author Roland Franssen + * @author Roland Franssen */ class DateTimeZoneToStringTransformer implements DataTransformerInterface { @@ -39,14 +39,14 @@ public function transform($dateTimeZone) if ($this->multiple) { if (!\is_array($dateTimeZone)) { - throw new TransformationFailedException('Expected an array.'); + throw new TransformationFailedException('Expected an array of \DateTimeZone objects.'); } return array_map([new self(), 'transform'], $dateTimeZone); } if (!$dateTimeZone instanceof \DateTimeZone) { - throw new TransformationFailedException('Expected a \DateTimeZone.'); + throw new TransformationFailedException('Expected a \DateTimeZone object.'); } return $dateTimeZone->getName(); @@ -63,14 +63,14 @@ public function reverseTransform($value) if ($this->multiple) { if (!\is_array($value)) { - throw new TransformationFailedException('Expected an array.'); + throw new TransformationFailedException('Expected an array of timezone identifier strings.'); } return array_map([new self(), 'reverseTransform'], $value); } if (!\is_string($value)) { - throw new TransformationFailedException('Expected a string.'); + throw new TransformationFailedException('Expected a timezone identifier string.'); } try { diff --git a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php index 5d0518689a0f8..28e1fde10f126 100644 --- a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php +++ b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php @@ -97,10 +97,14 @@ public function testAddTaggedTypesToDebugCommand() /** * @dataProvider addTaggedTypeExtensionsDataProvider */ - public function testAddTaggedTypeExtensions(array $extensions, array $expectedRegisteredExtensions) + public function testAddTaggedTypeExtensions(array $extensions, array $expectedRegisteredExtensions, array $parameters = []) { $container = $this->createContainerBuilder(); + foreach ($parameters as $name => $value) { + $container->setParameter($name, $value); + } + $container->setDefinition('form.extension', $this->createExtensionDefinition()); foreach ($extensions as $serviceId => $config) { @@ -191,6 +195,27 @@ public function addTaggedTypeExtensionsDataProvider() ]), ], ], + [ + [ + 'my.type_extension1' => [ + 'class' => '%type1_extension_class%', + 'tag' => ['extended_type' => 'type1'], + ], + 'my.type_extension2' => [ + 'class' => '%type1_extension_class%', + 'tag' => [], + ], + ], + [ + 'type1' => new IteratorArgument([ + new Reference('my.type_extension1'), + new Reference('my.type_extension2'), + ]), + ], + [ + 'type1_extension_class' => Type1TypeExtension::class, + ], + ], ]; } @@ -261,7 +286,7 @@ public function addLegacyTaggedTypeExtensionsDataProvider() /** * @expectedException \InvalidArgumentException - * @expectedExceptionMessage "form.type_extension" tagged services have to implement the static getExtendedTypes() method. The class for service "my.type_extension" does not implement it. + * @expectedExceptionMessage "form.type_extension" tagged services have to implement the static getExtendedTypes() method. Class "stdClass" for service "my.type_extension" does not implement it. */ public function testAddTaggedFormTypeExtensionWithoutExtendedTypeAttributeNorImplementingGetExtendedTypes() { diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php index 62ce948b6828b..867ceba97f8db 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Session.php +++ b/src/Symfony/Component/HttpFoundation/Session/Session.php @@ -193,9 +193,7 @@ public function migrate($destroy = false, $lifetime = null) */ public function save() { - if ($this->isStarted()) { - $this->storage->save(); - } + $this->storage->save(); } /** diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php index adfae08b9e812..7856a77c038be 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php @@ -1004,14 +1004,15 @@ public function ianaCodesReasonPhrasesProvider() $ianaHttpStatusCodes = new \DOMDocument(); - libxml_set_streams_context(stream_context_create([ + $context = stream_context_create([ 'http' => [ 'method' => 'GET', 'timeout' => 30, + 'user_agent' => __METHOD__, ], - ])); + ]); - $ianaHttpStatusCodes->load('https://www.iana.org/assignments/http-status-codes/http-status-codes.xml'); + $ianaHttpStatusCodes->loadXML(file_get_contents('https://www.iana.org/assignments/http-status-codes/http-status-codes.xml', false, $context)); if (!$ianaHttpStatusCodes->relaxNGValidate(__DIR__.'/schema/http-status-codes.rng')) { self::fail('Invalid IANA\'s HTTP status code list.'); } diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php index e75b3321b035e..afa00fc7c3046 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php @@ -260,14 +260,4 @@ public function testIsEmpty() $flash->get('hello'); $this->assertTrue($this->session->isEmpty()); } - - public function testSaveIfNotStarted() - { - $storage = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface')->getMock(); - $session = new Session($storage); - - $storage->expects($this->once())->method('isStarted')->willReturn(false); - $storage->expects($this->never())->method('save'); - $session->save(); - } } diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 94e87d880b323..cf8c24fb0f660 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -73,11 +73,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private $requestStackSize = 0; private $resetServices = false; - const VERSION = '4.2.7'; - const VERSION_ID = 40207; + const VERSION = '4.2.8'; + const VERSION_ID = 40208; const MAJOR_VERSION = 4; const MINOR_VERSION = 2; - const RELEASE_VERSION = 7; + const RELEASE_VERSION = 8; const EXTRA_VERSION = ''; const END_OF_MAINTENANCE = '07/2019'; diff --git a/src/Symfony/Component/Intl/Intl.php b/src/Symfony/Component/Intl/Intl.php index 70fc55697a841..960a18d7cf231 100644 --- a/src/Symfony/Component/Intl/Intl.php +++ b/src/Symfony/Component/Intl/Intl.php @@ -235,7 +235,7 @@ public static function getIcuDataVersion() */ public static function getIcuStubVersion() { - return '64.1'; + return '64.2'; } /** diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/am.json b/src/Symfony/Component/Intl/Resources/data/currencies/am.json index 62f877f7b3e81..8c94a7c159d09 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/am.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/am.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.18", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ar.json b/src/Symfony/Component/Intl/Resources/data/currencies/ar.json index 8880a2250bcc2..7a6758b0ff269 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ar.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ar.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.22", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/az.json b/src/Symfony/Component/Intl/Resources/data/currencies/az.json index 77209ad3e6a31..125b34f0a9a64 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/az.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/az.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/be.json b/src/Symfony/Component/Intl/Resources/data/currencies/be.json index 9d9641f611508..a91e4016cfd65 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/be.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/be.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bs.json b/src/Symfony/Component/Intl/Resources/data/currencies/bs.json index d21469170eff2..f39221d85b543 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/bs.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/bs.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json index 7bafd72cc5fe0..cc7731e61b141 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/cy.json b/src/Symfony/Component/Intl/Resources/data/currencies/cy.json index 16cb33450a533..c031933ee3c7f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/cy.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/cy.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/da.json b/src/Symfony/Component/Intl/Resources/data/currencies/da.json index 5c23ce00618d8..8ff3d8fed1f02 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/da.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/da.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/el.json b/src/Symfony/Component/Intl/Resources/data/currencies/el.json index b4e30732a3117..0f5cb07b8cf7e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/el.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/el.json @@ -1,5 +1,5 @@ { - "Version": "2.1.49.26", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/es.json b/src/Symfony/Component/Intl/Resources/data/currencies/es.json index 526a9a30b0784..ec2b5c413e81a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/es.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/es.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/eu.json b/src/Symfony/Component/Intl/Resources/data/currencies/eu.json index 425dfc7a890f0..fbe84a4ede6c9 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/eu.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/eu.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fa.json b/src/Symfony/Component/Intl/Resources/data/currencies/fa.json index 67ad93bdf112f..333d1a64c49d3 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fa.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fa.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/fr.json b/src/Symfony/Component/Intl/Resources/data/currencies/fr.json index f1dec48a13666..66ff99851e244 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/fr.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/fr.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.43", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ga.json b/src/Symfony/Component/Intl/Resources/data/currencies/ga.json index ee1dc19e0c7e7..516710191f817 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ga.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ga.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/gd.json b/src/Symfony/Component/Intl/Resources/data/currencies/gd.json index 82fa4cc60f41e..a642fd8ffc0ae 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/gd.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/gd.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/gl.json b/src/Symfony/Component/Intl/Resources/data/currencies/gl.json index 01fb0e710a8e3..5799c84aa4ede 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/gl.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/gl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/hi.json b/src/Symfony/Component/Intl/Resources/data/currencies/hi.json index 0a132b4f97994..102f9d19bac30 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/hi.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/hi.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/hy.json b/src/Symfony/Component/Intl/Resources/data/currencies/hy.json index 87293287f0c97..4163abbe3136f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/hy.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/hy.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/is.json b/src/Symfony/Component/Intl/Resources/data/currencies/is.json index cb3baed333ee5..1b57b6759f2e4 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/is.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/is.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ja.json b/src/Symfony/Component/Intl/Resources/data/currencies/ja.json index 7ffce19dffe7c..7230c5fe32824 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ja.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ja.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/kk.json b/src/Symfony/Component/Intl/Resources/data/currencies/kk.json index 8996b7a1c7ed2..b7b4344296e41 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/kk.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/kk.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/km.json b/src/Symfony/Component/Intl/Resources/data/currencies/km.json index a97a736c2bc5a..4365e6cca0805 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/km.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/km.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ko.json b/src/Symfony/Component/Intl/Resources/data/currencies/ko.json index 6fddd507f8394..f34790506f6b3 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ko.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ko.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ky.json b/src/Symfony/Component/Intl/Resources/data/currencies/ky.json index 4ee7ef31f1e60..3623d41848d94 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ky.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ky.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/lb.json b/src/Symfony/Component/Intl/Resources/data/currencies/lb.json index 5081729941d2b..aa4960499ef81 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/lb.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/lb.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/meta.json b/src/Symfony/Component/Intl/Resources/data/currencies/meta.json index 22da4e4730c0e..30ef740551a97 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/meta.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/meta.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Currencies": [ "ADP", "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/mi.json b/src/Symfony/Component/Intl/Resources/data/currencies/mi.json index eaf433ee23533..e01eb18191b32 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/mi.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/mi.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.85", + "Version": "2.1.49.82", "Names": { "ANG": [ "ANG", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/mo.json b/src/Symfony/Component/Intl/Resources/data/currencies/mo.json index cfefc06aae953..038864be3058a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/mo.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/mo.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/mt.json b/src/Symfony/Component/Intl/Resources/data/currencies/mt.json index b2cedaf617cfb..7ce6159e3a402 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/mt.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/mt.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.72", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/my.json b/src/Symfony/Component/Intl/Resources/data/currencies/my.json index b5fb198f9c226..8792b39066e04 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/my.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/my.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.36", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ne.json b/src/Symfony/Component/Intl/Resources/data/currencies/ne.json index eb41449e144cb..ce3587e3aa84f 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ne.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ne.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/nl.json b/src/Symfony/Component/Intl/Resources/data/currencies/nl.json index 105b18a9fadd1..4d75999ba9476 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/nl.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/nl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/nn.json b/src/Symfony/Component/Intl/Resources/data/currencies/nn.json index 7b44b0a50f4a4..c27d8917e359a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/nn.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/nn.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/or.json b/src/Symfony/Component/Intl/Resources/data/currencies/or.json index 3dec5c3832fee..7f9d14cf1370d 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/or.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/or.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ps.json b/src/Symfony/Component/Intl/Resources/data/currencies/ps.json index abc861a020ca4..8ee38d901aa10 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ps.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ps.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AFA": [ "AFA", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/pt_PT.json b/src/Symfony/Component/Intl/Resources/data/currencies/pt_PT.json index 8d3873830d5e9..06d15e22632e2 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/pt_PT.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/pt_PT.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.89", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/qu.json b/src/Symfony/Component/Intl/Resources/data/currencies/qu.json index e383846a6a137..5360878514661 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/qu.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/qu.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "PEN": [ "S\/", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ro.json b/src/Symfony/Component/Intl/Resources/data/currencies/ro.json index cfefc06aae953..038864be3058a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ro.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ro.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/root.json b/src/Symfony/Component/Intl/Resources/data/currencies/root.json index 82c72b3edcd05..24a42df8326eb 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/root.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/root.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "AUD": [ "A$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ru.json b/src/Symfony/Component/Intl/Resources/data/currencies/ru.json index 6d90bf15fe515..aef8fe8a032ec 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ru.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ru.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/rw.json b/src/Symfony/Component/Intl/Resources/data/currencies/rw.json index 98a9dcecb01b7..7966d513541ac 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/rw.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/rw.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "RWF": [ "RF", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sd.json b/src/Symfony/Component/Intl/Resources/data/currencies/sd.json index a2f54d4fc4f98..e7682f7545309 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sd.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sd.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sh.json b/src/Symfony/Component/Intl/Resources/data/currencies/sh.json index 14f28a1460c39..e8985a17074a8 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sh.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sh.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.77", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/so.json b/src/Symfony/Component/Intl/Resources/data/currencies/so.json index a06b671dd9563..5ccf238e0ad9c 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/so.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/so.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sr.json b/src/Symfony/Component/Intl/Resources/data/currencies/sr.json index 4725b5923ccd3..4cfab3cd8e471 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sr.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sr.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/sr_Latn.json b/src/Symfony/Component/Intl/Resources/data/currencies/sr_Latn.json index 14f28a1460c39..e8985a17074a8 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/sr_Latn.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/sr_Latn.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.77", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/tg.json b/src/Symfony/Component/Intl/Resources/data/currencies/tg.json index 5f89a11b6cd39..1125e09e85cca 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/tg.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/tg.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.96", + "Version": "2.1.49.82", "Names": { "BRL": [ "R$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/th.json b/src/Symfony/Component/Intl/Resources/data/currencies/th.json index 88e4083980f6c..701d76f5035f4 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/th.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/th.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ti.json b/src/Symfony/Component/Intl/Resources/data/currencies/ti.json index 9446dd6868f30..dffce35a5a5c2 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ti.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ti.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "BRL": [ "R$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/tk.json b/src/Symfony/Component/Intl/Resources/data/currencies/tk.json index 30179ef6196c5..63c822eb4366b 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/tk.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/tk.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/tl.json b/src/Symfony/Component/Intl/Resources/data/currencies/tl.json index d9b3a09c355ed..8ab93c6d94579 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/tl.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/tl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/tt.json b/src/Symfony/Component/Intl/Resources/data/currencies/tt.json index cd4b4f83b56b3..781e870afa549 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/tt.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/tt.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.85", + "Version": "2.1.49.82", "Names": { "BRL": [ "R$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ug.json b/src/Symfony/Component/Intl/Resources/data/currencies/ug.json index 9374ed0a050ce..0534af4bdf56a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ug.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ug.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/uk.json b/src/Symfony/Component/Intl/Resources/data/currencies/uk.json index 758a6a3eb4333..efc92b4baf650 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/uk.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/uk.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/ur.json b/src/Symfony/Component/Intl/Resources/data/currencies/ur.json index 37252a666e60b..75035e4d6ecb0 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/ur.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/ur.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/uz.json b/src/Symfony/Component/Intl/Resources/data/currencies/uz.json index c931700c42177..497ef5749f0ec 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/uz.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/uz.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AED": [ "AED", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/uz_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/currencies/uz_Cyrl.json index 38e7dd3d52230..12e20a4ee2d36 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/uz_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/uz_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "ANG": [ "ANG", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/vi.json b/src/Symfony/Component/Intl/Resources/data/currencies/vi.json index ddfd7adf627e4..f0c17d25aa26a 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/vi.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/vi.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/wo.json b/src/Symfony/Component/Intl/Resources/data/currencies/wo.json index 0352d0b79edb3..315d6d2c123e4 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/wo.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/wo.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.84", + "Version": "2.1.49.82", "Names": { "BRL": [ "R$", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/xh.json b/src/Symfony/Component/Intl/Resources/data/currencies/xh.json index 0ca80d289a457..bb1767c34ef62 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/xh.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/xh.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.89", + "Version": "2.1.49.82", "Names": { "ZAR": [ "R", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/zh.json b/src/Symfony/Component/Intl/Resources/data/currencies/zh.json index 101ff1afc2618..9fe714ba86b1e 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/zh.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/zh.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant.json b/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant.json index 7f1add19dfd60..63b1ef2144a49 100644 --- a/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant.json +++ b/src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "ADP": [ "ADP", diff --git a/src/Symfony/Component/Intl/Resources/data/git-info.txt b/src/Symfony/Component/Intl/Resources/data/git-info.txt index 918280227be4a..98b38eb10afee 100644 --- a/src/Symfony/Component/Intl/Resources/data/git-info.txt +++ b/src/Symfony/Component/Intl/Resources/data/git-info.txt @@ -2,6 +2,6 @@ Git information =============== URL: https://github.com/unicode-org/icu.git -Revision: 2f2aec5f91cffe49b7526d9b0d18a9acbdd0cc89 -Author: yumaoka -Date: 2019-03-25T16:18:16-04:00 +Revision: e2d85306162d3a0691b070b4f0a73e4012433444 +Author: Steven R. Loomis +Date: 2019-04-17T08:58:08-07:00 diff --git a/src/Symfony/Component/Intl/Resources/data/languages/am.json b/src/Symfony/Component/Intl/Resources/data/languages/am.json index c70864bb58559..611eb778d5b65 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/am.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/am.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.18", + "Version": "2.1.49.82", "Names": { "aa": "አፋርኛ", "ab": "አብሐዚኛ", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ar.json b/src/Symfony/Component/Intl/Resources/data/languages/ar.json index 20e24bb1928cb..c64e550d82817 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ar.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ar.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.22", + "Version": "2.1.49.82", "Names": { "aa": "الأفارية", "ab": "الأبخازية", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/az.json b/src/Symfony/Component/Intl/Resources/data/languages/az.json index 54360c4f99db2..e97fd942493b0 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/az.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/az.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "afar", "ab": "abxaz", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/be.json b/src/Symfony/Component/Intl/Resources/data/languages/be.json index 51a6f634d783a..aa9bbc986c92d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/be.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/be.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "афарская", "ab": "абхазская", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/bs.json b/src/Symfony/Component/Intl/Resources/data/languages/bs.json index e3d811d8e530e..9dec9c9783a2b 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/bs.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/bs.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "afarski", "ab": "abhaski", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/bs_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/languages/bs_Cyrl.json index 6c883a63aa8bd..225906f2c4fb9 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/bs_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/bs_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "афарски", "ab": "абказијски", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/cy.json b/src/Symfony/Component/Intl/Resources/data/languages/cy.json index e3398fc2f49d2..aff04d92b0d29 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/cy.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/cy.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "Affareg", "ab": "Abchaseg", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/da.json b/src/Symfony/Component/Intl/Resources/data/languages/da.json index 64970f6c27ce0..3e2a3de56f78d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/da.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/da.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "afar", "ab": "abkhasisk", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/el.json b/src/Symfony/Component/Intl/Resources/data/languages/el.json index f6cbf45b1c4e6..0b5875a155890 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/el.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/el.json @@ -1,5 +1,5 @@ { - "Version": "2.1.49.26", + "Version": "2.1.49.82", "Names": { "aa": "Αφάρ", "ab": "Αμπχαζικά", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/es.json b/src/Symfony/Component/Intl/Resources/data/languages/es.json index 4f70c2718d5f6..be56bf61e503a 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/es.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/es.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "aa": "afar", "ab": "abjasio", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/eu.json b/src/Symfony/Component/Intl/Resources/data/languages/eu.json index ead72f84ac92b..3ac813c06bd1b 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/eu.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/eu.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "afarera", "ab": "abkhaziera", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/fa.json b/src/Symfony/Component/Intl/Resources/data/languages/fa.json index 117038f2d1bab..8c6e45cab80f6 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/fa.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/fa.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "aa": "آفاری", "ab": "آبخازی", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/fr.json b/src/Symfony/Component/Intl/Resources/data/languages/fr.json index f9d91a31c1aa4..bbd11e20a6c6f 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/fr.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/fr.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.43", + "Version": "2.1.49.82", "Names": { "aa": "afar", "ab": "abkhaze", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ga.json b/src/Symfony/Component/Intl/Resources/data/languages/ga.json index 7bb68d2529752..40161afc00d75 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ga.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ga.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "Afáiris", "ab": "Abcáisis", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/gd.json b/src/Symfony/Component/Intl/Resources/data/languages/gd.json index e1de2cd328ce4..b8fa8f537fbb0 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/gd.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/gd.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "aa": "Afar", "ab": "Abchasais", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/gl.json b/src/Symfony/Component/Intl/Resources/data/languages/gl.json index abc4b17b58082..1395df4a9e91a 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/gl.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/gl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "afar", "ab": "abkhazo", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/hi.json b/src/Symfony/Component/Intl/Resources/data/languages/hi.json index 58dd92c52f91a..81f25edfd2961 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/hi.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/hi.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "अफ़ार", "ab": "अब्ख़ाज़ियन", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/hy.json b/src/Symfony/Component/Intl/Resources/data/languages/hy.json index a3be9e1643cd3..c053ffafdf70a 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/hy.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/hy.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "աֆարերեն", "ab": "աբխազերեն", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/is.json b/src/Symfony/Component/Intl/Resources/data/languages/is.json index 42be79d00cacf..0aa3b3066bb30 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/is.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/is.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "afár", "ab": "abkasíska", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ja.json b/src/Symfony/Component/Intl/Resources/data/languages/ja.json index e0fa3a7937736..c2105159435f5 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ja.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ja.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "aa": "アファル語", "ab": "アブハズ語", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/kk.json b/src/Symfony/Component/Intl/Resources/data/languages/kk.json index bd4bd9f2b7983..9aa050ec9639f 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/kk.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/kk.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "афар тілі", "ab": "абхаз тілі", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/km.json b/src/Symfony/Component/Intl/Resources/data/languages/km.json index 01575f6ba5bd1..669906d84f289 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/km.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/km.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "អាហ្វារ", "ab": "អាប់ខាហ៊្សាន", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ko.json b/src/Symfony/Component/Intl/Resources/data/languages/ko.json index 98de6fa73b1ca..7a268a9ee48c7 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ko.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ko.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "아파르어", "ab": "압카즈어", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ky.json b/src/Symfony/Component/Intl/Resources/data/languages/ky.json index c3fd0535f053b..1325d63b81b99 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ky.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ky.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "афарча", "ab": "абхазча", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/lb.json b/src/Symfony/Component/Intl/Resources/data/languages/lb.json index 79fc45851639b..2a31595e20c79 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/lb.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/lb.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "aa": "Afar", "ab": "Abchasesch", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/meta.json b/src/Symfony/Component/Intl/Resources/data/languages/meta.json index 7e4f58e38812e..8b2308aea924e 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/meta.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/meta.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Languages": [ "aa", "ab", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/mi.json b/src/Symfony/Component/Intl/Resources/data/languages/mi.json index 62f1019387748..a8eb9868dfc43 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/mi.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/mi.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.85", + "Version": "2.1.49.82", "Names": { "de": "Tiamana", "de_AT": "Tiamana Atiria", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/mo.json b/src/Symfony/Component/Intl/Resources/data/languages/mo.json index f3790cad5d8be..fe4ce5d33ab1d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/mo.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/mo.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "aa": "afar", "ab": "abhază", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/mt.json b/src/Symfony/Component/Intl/Resources/data/languages/mt.json index 6db23b04dbcc9..8bb281e0b925e 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/mt.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/mt.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.72", + "Version": "2.1.49.82", "Names": { "aa": "Afar", "ab": "Abkażjan", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/my.json b/src/Symfony/Component/Intl/Resources/data/languages/my.json index 5d84b6de5d8f5..0309ac26a5cdb 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/my.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/my.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.36", + "Version": "2.1.49.82", "Names": { "aa": "အာဖာ", "ab": "အဘ်ခါဇီရာ", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ne.json b/src/Symfony/Component/Intl/Resources/data/languages/ne.json index a7aa37d10982f..f0b711414a59e 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ne.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ne.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "अफार", "ab": "अब्खाजियाली", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/nl.json b/src/Symfony/Component/Intl/Resources/data/languages/nl.json index 3cf2c586ba490..8b6d8dfea56a2 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/nl.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/nl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "aa": "Afar", "ab": "Abchazisch", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/nn.json b/src/Symfony/Component/Intl/Resources/data/languages/nn.json index 65ce468f3b7c1..2986ad4b015c8 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/nn.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/nn.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "aa": "afar", "ab": "abkhasisk", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/or.json b/src/Symfony/Component/Intl/Resources/data/languages/or.json index a1870c45e2313..c8eaab8bb01f0 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/or.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/or.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "ଅଫାର୍", "ab": "ଆବ୍ଖାଜିଆନ୍", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ps.json b/src/Symfony/Component/Intl/Resources/data/languages/ps.json index d6ac6f47b0d62..1d0e19995ee98 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ps.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ps.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "افري", "ab": "ابخازي", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/pt_PT.json b/src/Symfony/Component/Intl/Resources/data/languages/pt_PT.json index 73068d0e07246..2af54f5400c1d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/pt_PT.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/pt_PT.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.89", + "Version": "2.1.49.82", "Names": { "af": "africanês", "alt": "altai do sul", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/qu.json b/src/Symfony/Component/Intl/Resources/data/languages/qu.json index 4a7f22609c793..b4d5f83d19977 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/qu.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/qu.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "af": "Afrikaans Simi", "am": "Amarico Simi", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ro.json b/src/Symfony/Component/Intl/Resources/data/languages/ro.json index f3790cad5d8be..fe4ce5d33ab1d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ro.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ro.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "aa": "afar", "ab": "abhază", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ru.json b/src/Symfony/Component/Intl/Resources/data/languages/ru.json index aad6bb7a8d479..b14cad21a64e3 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ru.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ru.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "aa": "афарский", "ab": "абхазский", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/rw.json b/src/Symfony/Component/Intl/Resources/data/languages/rw.json index 32d7e31d66011..bb41cb5881728 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/rw.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/rw.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "af": "Ikinyafurikaneri", "am": "Inyamuhariki", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sd.json b/src/Symfony/Component/Intl/Resources/data/languages/sd.json index 9c7367d9de60a..2d9b0c5b19d09 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sd.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sd.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "افار", "ab": "ابقازیان", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sh.json b/src/Symfony/Component/Intl/Resources/data/languages/sh.json index 6ad4e26f56a9a..8dd7fb35723aa 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sh.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sh.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.77", + "Version": "2.1.49.82", "Names": { "aa": "afarski", "ab": "abhaski", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/so.json b/src/Symfony/Component/Intl/Resources/data/languages/so.json index 6bf5fc1ea6a7f..ace929b5156a2 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/so.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/so.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "af": "Afrikaanka", "agq": "Ageem", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sr.json b/src/Symfony/Component/Intl/Resources/data/languages/sr.json index a10480f0b7edc..700706f9a1497 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sr.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sr.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "aa": "афарски", "ab": "абхаски", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn.json b/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn.json index 6ad4e26f56a9a..8dd7fb35723aa 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/sr_Latn.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.77", + "Version": "2.1.49.82", "Names": { "aa": "afarski", "ab": "abhaski", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/tg.json b/src/Symfony/Component/Intl/Resources/data/languages/tg.json index 6eadb07b84fb0..767014ccd7e42 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/tg.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/tg.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.96", + "Version": "2.1.49.82", "Names": { "af": "африкаанс", "am": "амҳарӣ", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/th.json b/src/Symfony/Component/Intl/Resources/data/languages/th.json index 1b7011950d798..8e3a65017ccb1 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/th.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/th.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "aa": "อะฟาร์", "ab": "อับฮาเซีย", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ti.json b/src/Symfony/Component/Intl/Resources/data/languages/ti.json index cc6387dcae85b..c57f7e1fdc8b6 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ti.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ti.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "af": "አፍሪቃንሰኛ", "am": "አምሐረኛ", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/tk.json b/src/Symfony/Component/Intl/Resources/data/languages/tk.json index 0b50cd074f670..54c1801b740dc 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/tk.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/tk.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "aa": "afar dili", "ab": "abhaz dili", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/tl.json b/src/Symfony/Component/Intl/Resources/data/languages/tl.json index 668d3abeda8ca..1bad7c4c306bc 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/tl.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/tl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "aa": "Afar", "ab": "Abkhazian", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/tt.json b/src/Symfony/Component/Intl/Resources/data/languages/tt.json index c1df125e71c56..589a076b18d50 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/tt.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/tt.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.85", + "Version": "2.1.49.82", "Names": { "af": "африкаанс", "am": "амхар", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ug.json b/src/Symfony/Component/Intl/Resources/data/languages/ug.json index 99f6efd816aff..338baa5254a25 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ug.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ug.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "aa": "ئافارچە", "ab": "ئابخازچە", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/uk.json b/src/Symfony/Component/Intl/Resources/data/languages/uk.json index ea96dd2948bdd..a72f99e8d1c3b 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/uk.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/uk.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "aa": "афарська", "ab": "абхазька", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/ur.json b/src/Symfony/Component/Intl/Resources/data/languages/ur.json index 777f77d5316e9..fce461e58e94e 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/ur.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/ur.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "aa": "افار", "ab": "ابقازیان", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/uz.json b/src/Symfony/Component/Intl/Resources/data/languages/uz.json index 432fe76bed447..1361187740184 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/uz.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/uz.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "afar", "ab": "abxaz", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/uz_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/languages/uz_Cyrl.json index 9748ab8a26f20..8986d272387ef 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/uz_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/uz_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "aa": "афарча", "ab": "абхазча", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/vi.json b/src/Symfony/Component/Intl/Resources/data/languages/vi.json index 9737d7b4242c9..fff99f48d9f49 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/vi.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/vi.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "aa": "Tiếng Afar", "ab": "Tiếng Abkhazia", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/wo.json b/src/Symfony/Component/Intl/Resources/data/languages/wo.json index 5c2e1a2cba3d5..766c61ac5668d 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/wo.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/wo.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.84", + "Version": "2.1.49.82", "Names": { "af": "Afrikaans", "am": "Amharik", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/xh.json b/src/Symfony/Component/Intl/Resources/data/languages/xh.json index 7c6fcdb193e70..711b2fe0ce2ec 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/xh.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/xh.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.89", + "Version": "2.1.49.82", "Names": { "xh": "isiXhosa" } diff --git a/src/Symfony/Component/Intl/Resources/data/languages/zh.json b/src/Symfony/Component/Intl/Resources/data/languages/zh.json index 1e577869e675b..0e12978c3ca76 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/zh.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/zh.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "aa": "阿法尔语", "ab": "阿布哈西亚语", diff --git a/src/Symfony/Component/Intl/Resources/data/languages/zh_Hant.json b/src/Symfony/Component/Intl/Resources/data/languages/zh_Hant.json index 8cb2159a3f821..3c2da540a61ea 100644 --- a/src/Symfony/Component/Intl/Resources/data/languages/zh_Hant.json +++ b/src/Symfony/Component/Intl/Resources/data/languages/zh_Hant.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "aa": "阿法文", "ab": "阿布哈茲文", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/am.json b/src/Symfony/Component/Intl/Resources/data/locales/am.json index 00cf18cc0a476..0f590533e4581 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/am.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/am.json @@ -393,7 +393,7 @@ "mi": "ማኦሪኛ", "mi_NZ": "ማኦሪኛ (ኒው ዚላንድ)", "mk": "ማሴዶንኛ", - "mk_MK": "ማሴዶንኛ (መቄዶንያ)", + "mk_MK": "ማሴዶንኛ (ሰሜን መቄዶንያ)", "ml": "ማላያላምኛ", "ml_IN": "ማላያላምኛ (ህንድ)", "mn": "ሞንጎሊያኛ", @@ -506,7 +506,7 @@ "so_SO": "ሱማልኛ (ሱማሌ)", "sq": "አልባንያንኛ", "sq_AL": "አልባንያንኛ (አልባኒያ)", - "sq_MK": "አልባንያንኛ (መቄዶንያ)", + "sq_MK": "አልባንያንኛ (ሰሜን መቄዶንያ)", "sq_XK": "አልባንያንኛ (ኮሶቮ)", "sr": "ሰርብያኛ", "sr_BA": "ሰርብያኛ (ቦስኒያ እና ሄርዞጎቪኒያ)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ar.json b/src/Symfony/Component/Intl/Resources/data/locales/ar.json index 0b7c31d2dbf6a..cf80b7b721c69 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ar.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ar.json @@ -393,7 +393,7 @@ "mi": "الماورية", "mi_NZ": "الماورية (نيوزيلندا)", "mk": "المقدونية", - "mk_MK": "المقدونية (مقدونيا)", + "mk_MK": "المقدونية (مقدونيا الشمالية)", "ml": "المالايالامية", "ml_IN": "المالايالامية (الهند)", "mn": "المنغولية", @@ -506,7 +506,7 @@ "so_SO": "الصومالية (الصومال)", "sq": "الألبانية", "sq_AL": "الألبانية (ألبانيا)", - "sq_MK": "الألبانية (مقدونيا)", + "sq_MK": "الألبانية (مقدونيا الشمالية)", "sq_XK": "الألبانية (كوسوفو)", "sr": "الصربية", "sr_BA": "الصربية (البوسنة والهرسك)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/az.json b/src/Symfony/Component/Intl/Resources/data/locales/az.json index 0780c052e6f5a..8aa2b22d889a7 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/az.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/az.json @@ -393,7 +393,7 @@ "mi": "maori", "mi_NZ": "maori (Yeni Zelandiya)", "mk": "makedon", - "mk_MK": "makedon (Makedoniya)", + "mk_MK": "makedon (Şimali Makedoniya)", "ml": "malayalam", "ml_IN": "malayalam (Hindistan)", "mn": "monqol", @@ -506,7 +506,7 @@ "so_SO": "somali (Somali)", "sq": "alban", "sq_AL": "alban (Albaniya)", - "sq_MK": "alban (Makedoniya)", + "sq_MK": "alban (Şimali Makedoniya)", "sq_XK": "alban (Kosovo)", "sr": "serb", "sr_BA": "serb (Bosniya və Herseqovina)", 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 c4e43208e748a..a6f8d7c0cbd80 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/az_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/az_Cyrl.json @@ -392,7 +392,7 @@ "mi": "маори", "mi_NZ": "маори (Јени Зеландија)", "mk": "македон", - "mk_MK": "македон (Makedoniya)", + "mk_MK": "македон (Şimali Makedoniya)", "ml": "малајалам", "ml_IN": "малајалам (Һиндистан)", "mn": "монгол", @@ -503,7 +503,7 @@ "so_SO": "сомали (Сомали)", "sq": "албан", "sq_AL": "албан (Албанија)", - "sq_MK": "албан (Makedoniya)", + "sq_MK": "албан (Şimali Makedoniya)", "sq_XK": "албан (Косово)", "sr": "серб", "sr_BA": "серб (Боснија вә Һерсеговина)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/be.json b/src/Symfony/Component/Intl/Resources/data/locales/be.json index cb14964710ed5..77035917f4b8d 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/be.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/be.json @@ -393,7 +393,7 @@ "mi": "маары", "mi_NZ": "маары (Новая Зеландыя)", "mk": "македонская", - "mk_MK": "македонская (Македонія)", + "mk_MK": "македонская (Паўночная Македонія)", "ml": "малаялам", "ml_IN": "малаялам (Індыя)", "mn": "мангольская", @@ -506,7 +506,7 @@ "so_SO": "самалі (Самалі)", "sq": "албанская", "sq_AL": "албанская (Албанія)", - "sq_MK": "албанская (Македонія)", + "sq_MK": "албанская (Паўночная Македонія)", "sq_XK": "албанская (Косава)", "sr": "сербская", "sr_BA": "сербская (Боснія і Герцагавіна)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/bs.json b/src/Symfony/Component/Intl/Resources/data/locales/bs.json index 476b53ab132a0..96adfc995ff15 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/bs.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/bs.json @@ -393,7 +393,7 @@ "mi": "maorski", "mi_NZ": "maorski (Novi Zeland)", "mk": "makedonski", - "mk_MK": "makedonski (Makedonija)", + "mk_MK": "makedonski (Sjeverna Makedonija)", "ml": "malajalam", "ml_IN": "malajalam (Indija)", "mn": "mongolski", @@ -506,7 +506,7 @@ "so_SO": "somalski (Somalija)", "sq": "albanski", "sq_AL": "albanski (Albanija)", - "sq_MK": "albanski (Makedonija)", + "sq_MK": "albanski (Sjeverna Makedonija)", "sq_XK": "albanski (Kosovo)", "sr": "srpski", "sr_BA": "srpski (Bosna i Hercegovina)", 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 6542369ed5634..d2f09e0f0c565 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/bs_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/bs_Cyrl.json @@ -393,7 +393,7 @@ "mi": "маорски", "mi_NZ": "маорски (Нови Зеланд)", "mk": "македонски", - "mk_MK": "македонски (Македонија)", + "mk_MK": "македонски (Сјеверна Македонија)", "ml": "малајалам", "ml_IN": "малајалам (Индија)", "mn": "монголски", @@ -506,7 +506,7 @@ "so_SO": "сомалски (Сомалија)", "sq": "албански", "sq_AL": "албански (Албанија)", - "sq_MK": "албански (Македонија)", + "sq_MK": "албански (Сјеверна Македонија)", "sq_XK": "албански (Косово)", "sr": "српски", "sr_BA": "српски (Босна и Херцеговина)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/cy.json b/src/Symfony/Component/Intl/Resources/data/locales/cy.json index 76a3f6231ca5f..9fb02d9893a99 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/cy.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/cy.json @@ -393,7 +393,7 @@ "mi": "Maori", "mi_NZ": "Maori (Seland Newydd)", "mk": "Macedoneg", - "mk_MK": "Macedoneg (Macedonia)", + "mk_MK": "Macedoneg (Gogledd Macedonia)", "ml": "Malayalam", "ml_IN": "Malayalam (India)", "mn": "Mongoleg", @@ -506,7 +506,7 @@ "so_SO": "Somaleg (Somalia)", "sq": "Albaneg", "sq_AL": "Albaneg (Albania)", - "sq_MK": "Albaneg (Macedonia)", + "sq_MK": "Albaneg (Gogledd Macedonia)", "sq_XK": "Albaneg (Kosovo)", "sr": "Serbeg", "sr_BA": "Serbeg (Bosnia & Herzegovina)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/da.json b/src/Symfony/Component/Intl/Resources/data/locales/da.json index d484be943c6cf..df90d11b58be1 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/da.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/da.json @@ -393,7 +393,7 @@ "mi": "maori", "mi_NZ": "maori (New Zealand)", "mk": "makedonsk", - "mk_MK": "makedonsk (Makedonien)", + "mk_MK": "makedonsk (Nordmakedonien)", "ml": "malayalam", "ml_IN": "malayalam (Indien)", "mn": "mongolsk", @@ -506,7 +506,7 @@ "so_SO": "somali (Somalia)", "sq": "albansk", "sq_AL": "albansk (Albanien)", - "sq_MK": "albansk (Makedonien)", + "sq_MK": "albansk (Nordmakedonien)", "sq_XK": "albansk (Kosovo)", "sr": "serbisk", "sr_BA": "serbisk (Bosnien-Hercegovina)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/es.json b/src/Symfony/Component/Intl/Resources/data/locales/es.json index 2f88dbb7b1c77..7f0fd854f180d 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/es.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/es.json @@ -393,7 +393,7 @@ "mi": "maorí", "mi_NZ": "maorí (Nueva Zelanda)", "mk": "macedonio", - "mk_MK": "macedonio (Macedonia)", + "mk_MK": "macedonio (Macedonia del Norte)", "ml": "malayalam", "ml_IN": "malayalam (India)", "mn": "mongol", @@ -506,7 +506,7 @@ "so_SO": "somalí (Somalia)", "sq": "albanés", "sq_AL": "albanés (Albania)", - "sq_MK": "albanés (Macedonia)", + "sq_MK": "albanés (Macedonia del Norte)", "sq_XK": "albanés (Kosovo)", "sr": "serbio", "sr_BA": "serbio (Bosnia y Herzegovina)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/eu.json b/src/Symfony/Component/Intl/Resources/data/locales/eu.json index ef90efd437090..5859ed54f97eb 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/eu.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/eu.json @@ -393,7 +393,7 @@ "mi": "maoriera", "mi_NZ": "maoriera (Zeelanda Berria)", "mk": "mazedoniera", - "mk_MK": "mazedoniera (Mazedonia)", + "mk_MK": "mazedoniera (Ipar Mazedonia)", "ml": "malabarera", "ml_IN": "malabarera (India)", "mn": "mongoliera", @@ -506,7 +506,7 @@ "so_SO": "somaliera (Somalia)", "sq": "albaniera", "sq_AL": "albaniera (Albania)", - "sq_MK": "albaniera (Mazedonia)", + "sq_MK": "albaniera (Ipar Mazedonia)", "sq_XK": "albaniera (Kosovo)", "sr": "serbiera", "sr_BA": "serbiera (Bosnia-Herzegovina)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/fr.json b/src/Symfony/Component/Intl/Resources/data/locales/fr.json index c36a1685fbce6..c387f3b97ba7b 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/fr.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/fr.json @@ -393,7 +393,7 @@ "mi": "maori", "mi_NZ": "maori (Nouvelle-Zélande)", "mk": "macédonien", - "mk_MK": "macédonien (Macédoine)", + "mk_MK": "macédonien (Macédoine du Nord)", "ml": "malayalam", "ml_IN": "malayalam (Inde)", "mn": "mongol", @@ -506,7 +506,7 @@ "so_SO": "somali (Somalie)", "sq": "albanais", "sq_AL": "albanais (Albanie)", - "sq_MK": "albanais (Macédoine)", + "sq_MK": "albanais (Macédoine du Nord)", "sq_XK": "albanais (Kosovo)", "sr": "serbe", "sr_BA": "serbe (Bosnie-Herzégovine)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ga.json b/src/Symfony/Component/Intl/Resources/data/locales/ga.json index d44d3b355a3d5..e4ce33c0bc987 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ga.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ga.json @@ -393,7 +393,7 @@ "mi": "Maorais", "mi_NZ": "Maorais (an Nua-Shéalainn)", "mk": "Macadóinis", - "mk_MK": "Macadóinis (an Mhacadóin)", + "mk_MK": "Macadóinis (an Mhacadóin Thuaidh)", "ml": "Mailéalaimis", "ml_IN": "Mailéalaimis (an India)", "mn": "Mongóilis", @@ -506,7 +506,7 @@ "so_SO": "Somáilis (an tSomáil)", "sq": "Albáinis", "sq_AL": "Albáinis (an Albáin)", - "sq_MK": "Albáinis (an Mhacadóin)", + "sq_MK": "Albáinis (an Mhacadóin Thuaidh)", "sq_XK": "Albáinis (an Chosaiv)", "sr": "Seirbis", "sr_BA": "Seirbis (an Bhoisnia agus an Heirseagaivéin)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/gd.json b/src/Symfony/Component/Intl/Resources/data/locales/gd.json index 682459c52b0b2..0609235e847ed 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/gd.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/gd.json @@ -393,7 +393,7 @@ "mi": "Māori", "mi_NZ": "Māori (Sealainn Nuadh)", "mk": "Masadonais", - "mk_MK": "Masadonais (A’ Mhasadon)", + "mk_MK": "Masadonais (A’ Mhasadon a Tuath)", "ml": "Malayalam", "ml_IN": "Malayalam (Na h-Innseachan)", "mn": "Mongolais", @@ -506,7 +506,7 @@ "so_SO": "Somàilis (Somàilia)", "sq": "Albàinis", "sq_AL": "Albàinis (Albàinia)", - "sq_MK": "Albàinis (A’ Mhasadon)", + "sq_MK": "Albàinis (A’ Mhasadon a Tuath)", "sq_XK": "Albàinis (A’ Chosobho)", "sr": "Sèirbis", "sr_BA": "Sèirbis (Bosna is Hearsagobhana)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/gl.json b/src/Symfony/Component/Intl/Resources/data/locales/gl.json index 61d68e02ef68a..f59c004a264fd 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/gl.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/gl.json @@ -393,7 +393,7 @@ "mi": "maorí", "mi_NZ": "maorí (Nova Zelandia)", "mk": "macedonio", - "mk_MK": "macedonio (Macedonia)", + "mk_MK": "macedonio (Macedonia do Norte)", "ml": "malabar", "ml_IN": "malabar (A India)", "mn": "mongol", @@ -506,7 +506,7 @@ "so_SO": "somalí (Somalia)", "sq": "albanés", "sq_AL": "albanés (Albania)", - "sq_MK": "albanés (Macedonia)", + "sq_MK": "albanés (Macedonia do Norte)", "sq_XK": "albanés (Kosovo)", "sr": "serbio", "sr_BA": "serbio (Bosnia e Hercegovina)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/hy.json b/src/Symfony/Component/Intl/Resources/data/locales/hy.json index fa8fcff9adfb7..66d86fe33a448 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/hy.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/hy.json @@ -393,7 +393,7 @@ "mi": "մաորի", "mi_NZ": "մաորի (Նոր Զելանդիա)", "mk": "մակեդոներեն", - "mk_MK": "մակեդոներեն (Մակեդոնիա)", + "mk_MK": "մակեդոներեն (Հյուսիսային Մակեդոնիա)", "ml": "մալայալամ", "ml_IN": "մալայալամ (Հնդկաստան)", "mn": "մոնղոլերեն", @@ -506,7 +506,7 @@ "so_SO": "սոմալիերեն (Սոմալի)", "sq": "ալբաներեն", "sq_AL": "ալբաներեն (Ալբանիա)", - "sq_MK": "ալբաներեն (Մակեդոնիա)", + "sq_MK": "ալբաներեն (Հյուսիսային Մակեդոնիա)", "sq_XK": "ալբաներեն (Կոսովո)", "sr": "սերբերեն", "sr_BA": "սերբերեն (Բոսնիա և Հերցեգովինա)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/is.json b/src/Symfony/Component/Intl/Resources/data/locales/is.json index 3252530ebe128..c9c9b378d1e98 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/is.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/is.json @@ -393,7 +393,7 @@ "mi": "maorí", "mi_NZ": "maorí (Nýja-Sjáland)", "mk": "makedónska", - "mk_MK": "makedónska (Makedónía)", + "mk_MK": "makedónska (Norður-Makedónía)", "ml": "malajalam", "ml_IN": "malajalam (Indland)", "mn": "mongólska", @@ -506,7 +506,7 @@ "so_SO": "sómalska (Sómalía)", "sq": "albanska", "sq_AL": "albanska (Albanía)", - "sq_MK": "albanska (Makedónía)", + "sq_MK": "albanska (Norður-Makedónía)", "sq_XK": "albanska (Kósóvó)", "sr": "serbneska", "sr_BA": "serbneska (Bosnía og Hersegóvína)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/kk.json b/src/Symfony/Component/Intl/Resources/data/locales/kk.json index 2d1759eb0a0e5..3209f14810336 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/kk.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/kk.json @@ -393,7 +393,7 @@ "mi": "маори тілі", "mi_NZ": "маори тілі (Жаңа Зеландия)", "mk": "македон тілі", - "mk_MK": "македон тілі (Македония)", + "mk_MK": "македон тілі (Солтүстік Македония)", "ml": "малаялам тілі", "ml_IN": "малаялам тілі (Үндістан)", "mn": "моңғол тілі", @@ -506,7 +506,7 @@ "so_SO": "сомали тілі (Сомали)", "sq": "албан тілі", "sq_AL": "албан тілі (Албания)", - "sq_MK": "албан тілі (Македония)", + "sq_MK": "албан тілі (Солтүстік Македония)", "sq_XK": "албан тілі (Косово)", "sr": "серб тілі", "sr_BA": "серб тілі (Босния және Герцеговина)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/km.json b/src/Symfony/Component/Intl/Resources/data/locales/km.json index 0b26b482dc9bd..5bbc0b2de8850 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/km.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/km.json @@ -393,7 +393,7 @@ "mi": "ម៉ោរី", "mi_NZ": "ម៉ោរី (នូវែល​សេឡង់)", "mk": "ម៉ាសេដូនី", - "mk_MK": "ម៉ាសេដូនី (ម៉ាសេដ្វាន)", + "mk_MK": "ម៉ាសេដូនី (ម៉ាសេដ្វានខាងជើង)", "ml": "ម៉ាឡាយ៉ាឡាម", "ml_IN": "ម៉ាឡាយ៉ាឡាម (ឥណ្ឌា)", "mn": "ម៉ុងហ្គោលី", @@ -506,7 +506,7 @@ "so_SO": "សូម៉ាលី (សូម៉ាលី)", "sq": "អាល់បានី", "sq_AL": "អាល់បានី (អាល់បានី)", - "sq_MK": "អាល់បានី (ម៉ាសេដ្វាន)", + "sq_MK": "អាល់បានី (ម៉ាសេដ្វានខាងជើង)", "sq_XK": "អាល់បានី (កូសូវ៉ូ)", "sr": "ស៊ែប", "sr_BA": "ស៊ែប (បូស្នី និងហឺហ្សីហ្គូវីណា)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ko.json b/src/Symfony/Component/Intl/Resources/data/locales/ko.json index 9263b01b4240a..fbd893be3f0e1 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ko.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ko.json @@ -393,7 +393,7 @@ "mi": "마오리어", "mi_NZ": "마오리어 (뉴질랜드)", "mk": "마케도니아어", - "mk_MK": "마케도니아어 (마케도니아)", + "mk_MK": "마케도니아어 (북마케도니아)", "ml": "말라얄람어", "ml_IN": "말라얄람어 (인도)", "mn": "몽골어", @@ -506,7 +506,7 @@ "so_SO": "소말리아어 (소말리아)", "sq": "알바니아어", "sq_AL": "알바니아어 (알바니아)", - "sq_MK": "알바니아어 (마케도니아)", + "sq_MK": "알바니아어 (북마케도니아)", "sq_XK": "알바니아어 (코소보)", "sr": "세르비아어", "sr_BA": "세르비아어 (보스니아 헤르체고비나)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ky.json b/src/Symfony/Component/Intl/Resources/data/locales/ky.json index dad00b2dbea21..6705edd96a5e9 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ky.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ky.json @@ -393,7 +393,7 @@ "mi": "маориче", "mi_NZ": "маориче (Жаңы Зеландия)", "mk": "македончо", - "mk_MK": "македончо (Македония)", + "mk_MK": "македончо (Түндүк Македония)", "ml": "малайаламча", "ml_IN": "малайаламча (Индия)", "mn": "монголчо", @@ -506,7 +506,7 @@ "so_SO": "сомаличе (Сомали)", "sq": "албанча", "sq_AL": "албанча (Албания)", - "sq_MK": "албанча (Македония)", + "sq_MK": "албанча (Түндүк Македония)", "sq_XK": "албанча (Косово)", "sr": "сербче", "sr_BA": "сербче (Босния жана Герцеговина)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/lb.json b/src/Symfony/Component/Intl/Resources/data/locales/lb.json index b74f767316613..a1c784dea2686 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/lb.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/lb.json @@ -393,7 +393,7 @@ "mi": "Maori", "mi_NZ": "Maori (Neiséiland)", "mk": "Mazedonesch", - "mk_MK": "Mazedonesch (Mazedonien)", + "mk_MK": "Mazedonesch (Nordmazedonien)", "ml": "Malayalam", "ml_IN": "Malayalam (Indien)", "mn": "Mongolesch", @@ -506,7 +506,7 @@ "so_SO": "Somali (Somalia)", "sq": "Albanesch", "sq_AL": "Albanesch (Albanien)", - "sq_MK": "Albanesch (Mazedonien)", + "sq_MK": "Albanesch (Nordmazedonien)", "sq_XK": "Albanesch (Kosovo)", "sr": "Serbesch", "sr_BA": "Serbesch (Bosnien an Herzegowina)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/mt.json b/src/Symfony/Component/Intl/Resources/data/locales/mt.json index affa0e95f5367..da732854a7d30 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/mt.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/mt.json @@ -393,7 +393,7 @@ "mi": "Maori", "mi_NZ": "Maori (New Zealand)", "mk": "Maċedonjan", - "mk_MK": "Maċedonjan (l-Eks-Repubblika Jugoslava tal-Maċedonia)", + "mk_MK": "Maċedonjan (il-Maċedonja ta’ Fuq)", "ml": "Malayalam", "ml_IN": "Malayalam (l-Indja)", "mn": "Mongoljan", @@ -504,7 +504,7 @@ "so_SO": "Somali (is-Somalja)", "sq": "Albaniż", "sq_AL": "Albaniż (l-Albanija)", - "sq_MK": "Albaniż (l-Eks-Repubblika Jugoslava tal-Maċedonia)", + "sq_MK": "Albaniż (il-Maċedonja ta’ Fuq)", "sq_XK": "Albaniż (il-Kosovo)", "sr": "Serb", "sr_BA": "Serb (il-Bożnija-Ħerzegovina)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/my.json b/src/Symfony/Component/Intl/Resources/data/locales/my.json index ea602c6b04271..bdea732d92510 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/my.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/my.json @@ -393,7 +393,7 @@ "mi": "မာအိုရီ", "mi_NZ": "မာအိုရီ (နယူးဇီလန်)", "mk": "မက်ဆီဒိုးနီးယား", - "mk_MK": "မက်ဆီဒိုးနီးယား (မက်ဆီဒိုးနီးယား)", + "mk_MK": "မက်ဆီဒိုးနီးယား (မြောက် မက်ဆီဒိုးနီးယား)", "ml": "မလေယာလမ်", "ml_IN": "မလေယာလမ် (အိန္ဒိယ)", "mn": "မွန်ဂိုလီးယား", @@ -504,7 +504,7 @@ "so_SO": "ဆိုမာလီ (ဆိုမာလီယာ)", "sq": "အယ်လ်ဘေးနီးယား", "sq_AL": "အယ်လ်ဘေးနီးယား (အယ်လ်ဘေးနီးယား)", - "sq_MK": "အယ်လ်ဘေးနီးယား (မက်ဆီဒိုးနီးယား)", + "sq_MK": "အယ်လ်ဘေးနီးယား (မြောက် မက်ဆီဒိုးနီးယား)", "sq_XK": "အယ်လ်ဘေးနီးယား (ကိုဆိုဗို)", "sr": "ဆားဘီးယား", "sr_BA": "ဆားဘီးယား (ဘော့စနီးယားနှင့် ဟာဇီဂိုဗီနား)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ne.json b/src/Symfony/Component/Intl/Resources/data/locales/ne.json index d46d508708267..846359e0e43e6 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ne.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ne.json @@ -393,7 +393,7 @@ "mi": "माओरी", "mi_NZ": "माओरी (न्युजिल्याण्ड)", "mk": "म्यासेडोनियन", - "mk_MK": "म्यासेडोनियन (म्यासेडोनिया)", + "mk_MK": "म्यासेडोनियन (उत्तर म्यासेडोनिया)", "ml": "मलयालम", "ml_IN": "मलयालम (भारत)", "mn": "मङ्गोलियाली", @@ -504,7 +504,7 @@ "so_SO": "सोमाली (सोमालिया)", "sq": "अल्बानियाली", "sq_AL": "अल्बानियाली (अल्बेनिया)", - "sq_MK": "अल्बानियाली (म्यासेडोनिया)", + "sq_MK": "अल्बानियाली (उत्तर म्यासेडोनिया)", "sq_XK": "अल्बानियाली (कोसोभो)", "sr": "सर्बियाली", "sr_BA": "सर्बियाली (बोस्निया एण्ड हर्जगोभिनिया)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/nn.json b/src/Symfony/Component/Intl/Resources/data/locales/nn.json index 6694f1a5cd3bf..1abaa128d24d8 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/nn.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/nn.json @@ -393,7 +393,7 @@ "mi": "maori", "mi_NZ": "maori (New Zealand)", "mk": "makedonsk", - "mk_MK": "makedonsk (Makedonia)", + "mk_MK": "makedonsk (Nord-Makedonia)", "ml": "malayalam", "ml_IN": "malayalam (India)", "mn": "mongolsk", @@ -506,7 +506,7 @@ "so_SO": "somali (Somalia)", "sq": "albansk", "sq_AL": "albansk (Albania)", - "sq_MK": "albansk (Makedonia)", + "sq_MK": "albansk (Nord-Makedonia)", "sq_XK": "albansk (Kosovo)", "sr": "serbisk", "sr_BA": "serbisk (Bosnia-Hercegovina)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/or.json b/src/Symfony/Component/Intl/Resources/data/locales/or.json index a235e8de9e14a..d515bd76b129a 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/or.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/or.json @@ -393,7 +393,7 @@ "mi": "ମାଓରୀ", "mi_NZ": "ମାଓରୀ (ନ୍ୟୁଜିଲାଣ୍ଡ)", "mk": "ମାସେଡୋନିଆନ୍", - "mk_MK": "ମାସେଡୋନିଆନ୍ (ମାସେଡୋନିଆ)", + "mk_MK": "ମାସେଡୋନିଆନ୍ (ଉତ୍ତର ମାସେଡୋନିଆ)", "ml": "ମାଲାୟଲମ୍", "ml_IN": "ମାଲାୟଲମ୍ (ଭାରତ)", "mn": "ମଙ୍ଗୋଳିୟ", @@ -506,7 +506,7 @@ "so_SO": "ସୋମାଲିଆ (ସୋମାଲିଆ)", "sq": "ଆଲବାନିଆନ୍", "sq_AL": "ଆଲବାନିଆନ୍ (ଆଲବାନିଆ)", - "sq_MK": "ଆଲବାନିଆନ୍ (ମାସେଡୋନିଆ)", + "sq_MK": "ଆଲବାନିଆନ୍ (ଉତ୍ତର ମାସେଡୋନିଆ)", "sq_XK": "ଆଲବାନିଆନ୍ (କୋସୋଭୋ)", "sr": "ସର୍ବିୟ", "sr_BA": "ସର୍ବିୟ (ବୋସନିଆ ଏବଂ ହର୍ଜଗୋଭିନା)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ps.json b/src/Symfony/Component/Intl/Resources/data/locales/ps.json index 8cbcc367c93d6..8fab2d1539446 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ps.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ps.json @@ -393,7 +393,7 @@ "mi": "ماوري", "mi_NZ": "ماوري (نیوزیلنډ)", "mk": "مقدوني", - "mk_MK": "مقدوني (مقدونیه)", + "mk_MK": "مقدوني (شمالي مقدونيه)", "ml": "مالايالم", "ml_IN": "مالايالم (هند)", "mn": "منګولیایی", @@ -502,7 +502,7 @@ "so_SO": "سومالي (سومالیا)", "sq": "الباني", "sq_AL": "الباني (البانیه)", - "sq_MK": "الباني (مقدونیه)", + "sq_MK": "الباني (شمالي مقدونيه)", "sq_XK": "الباني (کوسوو)", "sr": "سربيائي", "sr_BA": "سربيائي (بوسنيا او هېرزګوينا)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/pt_PT.json b/src/Symfony/Component/Intl/Resources/data/locales/pt_PT.json index 189633858d559..6a290c8b93191 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/pt_PT.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/pt_PT.json @@ -81,7 +81,7 @@ "lv_LV": "letão (Letónia)", "mg_MG": "malgaxe (Madagáscar)", "mk": "macedónio", - "mk_MK": "macedónio (Macedónia)", + "mk_MK": "macedónio (Macedónia do Norte)", "mr": "marata", "mr_IN": "marata (Índia)", "nb": "norueguês bokmål", @@ -122,7 +122,7 @@ "sn_ZW": "shona (Zimbabué)", "so_DJ": "somali (Jibuti)", "so_KE": "somali (Quénia)", - "sq_MK": "albanês (Macedónia)", + "sq_MK": "albanês (Macedónia do Norte)", "sv_AX": "sueco (Alanda)", "sw_CD": "suaíli (Congo-Kinshasa)", "sw_KE": "suaíli (Quénia)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/qu.json b/src/Symfony/Component/Intl/Resources/data/locales/qu.json index cde7d7d9129fe..30b1538732adf 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/qu.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/qu.json @@ -280,7 +280,7 @@ "lv_LV": "Leton Simi (Letonia)", "mi": "Maori Simi", "mk": "Macedonio Simi", - "mk_MK": "Macedonio Simi (ERY Macedonia)", + "mk_MK": "Macedonio Simi (Macedonia del Norte)", "ml": "Malayalam Simi", "ml_IN": "Malayalam Simi (India)", "mn": "Mongol Simi", @@ -355,7 +355,7 @@ "sl_SI": "Esloveno Simi (Eslovenia)", "sq": "Albanes Simi", "sq_AL": "Albanes Simi (Albania)", - "sq_MK": "Albanes Simi (ERY Macedonia)", + "sq_MK": "Albanes Simi (Macedonia del Norte)", "sr": "Serbio Simi", "sr_RS": "Serbio Simi (Serbia)", "sv": "Sueco Simi", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ro.json b/src/Symfony/Component/Intl/Resources/data/locales/ro.json index b890d3c2a3f78..bc8db4e66cc1e 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ro.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ro.json @@ -393,7 +393,7 @@ "mi": "maori", "mi_NZ": "maori (Noua Zeelandă)", "mk": "macedoneană", - "mk_MK": "macedoneană (Republica Macedonia)", + "mk_MK": "macedoneană (Macedonia de Nord)", "ml": "malayalam", "ml_IN": "malayalam (India)", "mn": "mongolă", @@ -506,7 +506,7 @@ "so_SO": "somaleză (Somalia)", "sq": "albaneză", "sq_AL": "albaneză (Albania)", - "sq_MK": "albaneză (Republica Macedonia)", + "sq_MK": "albaneză (Macedonia de Nord)", "sq_XK": "albaneză (Kosovo)", "sr": "sârbă", "sr_BA": "sârbă (Bosnia și Herțegovina)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/rw.json b/src/Symfony/Component/Intl/Resources/data/locales/rw.json index e4db52759fa2c..af62962720186 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/rw.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/rw.json @@ -55,6 +55,7 @@ "lt": "Ikilituwaniya", "lv": "Ikinyaletoviyani", "mk": "Ikimasedoniya", + "mk_MK": "Ikimasedoniya (Masedoniya y'Amajyaruguru)", "ml": "Ikimalayalami", "mn": "Ikimongoli", "mr": "Ikimarati", @@ -80,6 +81,7 @@ "sl": "Ikinyasiloveniya", "so": "Igisomali", "sq": "Icyalubaniya", + "sq_MK": "Icyalubaniya (Masedoniya y'Amajyaruguru)", "sr": "Igiseribe", "sv": "Igisuweduwa", "sw": "Igiswahili", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/so.json b/src/Symfony/Component/Intl/Resources/data/locales/so.json index 0c34859e0143f..5b8f99db7ba5f 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/so.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/so.json @@ -393,7 +393,7 @@ "mi": "Maaoori", "mi_NZ": "Maaoori (Niyuusiilaand)", "mk": "Masadooniyaan", - "mk_MK": "Masadooniyaan (Masedooniya)", + "mk_MK": "Masadooniyaan (Masedooniya Waqooyi)", "ml": "Malayalam", "ml_IN": "Malayalam (Hindiya)", "mn": "Mangooli", @@ -502,7 +502,7 @@ "so_SO": "Soomaali (Soomaaliya)", "sq": "Albeeniyaan", "sq_AL": "Albeeniyaan (Albaaniya)", - "sq_MK": "Albeeniyaan (Masedooniya)", + "sq_MK": "Albeeniyaan (Masedooniya Waqooyi)", "sq_XK": "Albeeniyaan (Koosofo)", "sr": "Seerbiyaan", "sr_BA": "Seerbiyaan (Boosniya & Harsegofina)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/tg.json b/src/Symfony/Component/Intl/Resources/data/locales/tg.json index 5d9f3a8d4309b..f064ec64ce85f 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/tg.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/tg.json @@ -354,7 +354,7 @@ "mi": "маорӣ", "mi_NZ": "маорӣ (Зеландияи Нав)", "mk": "мақдунӣ", - "mk_MK": "мақдунӣ (Мақдун)", + "mk_MK": "мақдунӣ (Македонияи Шимолӣ)", "ml": "малаяламӣ", "ml_IN": "малаяламӣ (Ҳиндустон)", "mn": "муғулӣ", @@ -446,7 +446,7 @@ "so_SO": "сомалӣ (Сомалӣ)", "sq": "албанӣ", "sq_AL": "албанӣ (Албания)", - "sq_MK": "албанӣ (Мақдун)", + "sq_MK": "албанӣ (Македонияи Шимолӣ)", "sq_XK": "албанӣ (Косово)", "sr": "сербӣ", "sr_BA": "сербӣ (Босния ва Ҳерсеговина)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ti.json b/src/Symfony/Component/Intl/Resources/data/locales/ti.json index 25da779a6dba2..3802358c2acdc 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ti.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ti.json @@ -314,7 +314,7 @@ "lv": "ላቲቪያን", "lv_LV": "ላቲቪያን (ላትቪያ)", "mk": "ማክዶኒኛ", - "mk_MK": "ማክዶኒኛ (ማከዶኒያ)", + "mk_MK": "ማክዶኒኛ (ሰሜን መቆዶንያ)", "ml": "ማላያላምኛ", "ml_IN": "ማላያላምኛ (ህንዲ)", "mr": "ማራቲኛ", @@ -383,7 +383,7 @@ "sl_SI": "ስቁቪኛ (ስሎቬኒያ)", "sq": "አልቤኒኛ", "sq_AL": "አልቤኒኛ (አልባኒያ)", - "sq_MK": "አልቤኒኛ (ማከዶኒያ)", + "sq_MK": "አልቤኒኛ (ሰሜን መቆዶንያ)", "sq_XK": "አልቤኒኛ (ኮሶቮ)", "sr": "ሰርቢኛ", "sr_BA": "ሰርቢኛ (ቦዝንያን ሄርዘጎቪናን)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/tk.json b/src/Symfony/Component/Intl/Resources/data/locales/tk.json index 9c7a5a984e397..72d04e39a310f 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/tk.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/tk.json @@ -393,7 +393,7 @@ "mi": "maori dili", "mi_NZ": "maori dili (Täze Zelandiýa)", "mk": "makedon dili", - "mk_MK": "makedon dili (Makedoniýa)", + "mk_MK": "makedon dili (Demirgazyk Makedoniýa)", "ml": "malaýalam dili", "ml_IN": "malaýalam dili (Hindistan)", "mn": "mongol dili", @@ -502,7 +502,7 @@ "so_SO": "somali dili (Somali)", "sq": "alban dili", "sq_AL": "alban dili (Albaniýa)", - "sq_MK": "alban dili (Makedoniýa)", + "sq_MK": "alban dili (Demirgazyk Makedoniýa)", "sq_XK": "alban dili (Kosowo)", "sr": "serb dili", "sr_BA": "serb dili (Bosniýa we Gersegowina)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/tt.json b/src/Symfony/Component/Intl/Resources/data/locales/tt.json index 3f4b6154b5ca5..28bcbd6c5dae1 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/tt.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/tt.json @@ -350,6 +350,7 @@ "mi": "маори", "mi_NZ": "маори (Яңа Зеландия)", "mk": "македон", + "mk_MK": "македон (Төньяк Македония)", "ml": "малаялам", "ml_IN": "малаялам (Индия)", "mn": "монгол", @@ -438,6 +439,7 @@ "so_SO": "сомали (Сомали)", "sq": "албан", "sq_AL": "албан (Албания)", + "sq_MK": "албан (Төньяк Македония)", "sq_XK": "албан (Косово)", "sr": "серб", "sr_BA": "серб (Босния һәм Герцеговина)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ug.json b/src/Symfony/Component/Intl/Resources/data/locales/ug.json index 3f7f2a376d92d..e5163cdf1e510 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ug.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ug.json @@ -393,7 +393,7 @@ "mi": "ماۋرىچە", "mi_NZ": "ماۋرىچە (يېڭى زېلاندىيە)", "mk": "ماكېدونچە", - "mk_MK": "ماكېدونچە (ماكېدونىيە)", + "mk_MK": "ماكېدونچە (شىمالىي ماكېدونىيە)", "ml": "مالايالامچە", "ml_IN": "مالايالامچە (ھىندىستان)", "mn": "موڭغۇلچە", @@ -506,7 +506,7 @@ "so_SO": "سومالىچە (سومالى)", "sq": "ئالبانچە", "sq_AL": "ئالبانچە (ئالبانىيە)", - "sq_MK": "ئالبانچە (ماكېدونىيە)", + "sq_MK": "ئالبانچە (شىمالىي ماكېدونىيە)", "sq_XK": "ئالبانچە (كوسوۋو)", "sr": "سېربچە", "sr_BA": "سېربچە (بوسىنىيە ۋە گېرتسېگوۋىنا)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/ur.json b/src/Symfony/Component/Intl/Resources/data/locales/ur.json index ce32181a35351..a1f1c07cfd596 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/ur.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/ur.json @@ -393,7 +393,7 @@ "mi": "ماؤری", "mi_NZ": "ماؤری (نیوزی لینڈ)", "mk": "مقدونیائی", - "mk_MK": "مقدونیائی (مقدونیہ)", + "mk_MK": "مقدونیائی (شمالی مقدونیہ)", "ml": "مالایالم", "ml_IN": "مالایالم (بھارت)", "mn": "منگولین", @@ -506,7 +506,7 @@ "so_SO": "صومالی (صومالیہ)", "sq": "البانی", "sq_AL": "البانی (البانیہ)", - "sq_MK": "البانی (مقدونیہ)", + "sq_MK": "البانی (شمالی مقدونیہ)", "sq_XK": "البانی (کوسووو)", "sr": "سربین", "sr_BA": "سربین (بوسنیا اور ہرزیگووینا)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/uz.json b/src/Symfony/Component/Intl/Resources/data/locales/uz.json index 358cfb896816f..54333338e4dc9 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/uz.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/uz.json @@ -393,7 +393,7 @@ "mi": "maori", "mi_NZ": "maori (Yangi Zelandiya)", "mk": "makedon", - "mk_MK": "makedon (Makedoniya)", + "mk_MK": "makedon (Shimoliy Makedoniya)", "ml": "malayalam", "ml_IN": "malayalam (Hindiston)", "mn": "mongol", @@ -502,7 +502,7 @@ "so_SO": "somalicha (Somali)", "sq": "alban", "sq_AL": "alban (Albaniya)", - "sq_MK": "alban (Makedoniya)", + "sq_MK": "alban (Shimoliy Makedoniya)", "sq_XK": "alban (Kosovo)", "sr": "serbcha", "sr_BA": "serbcha (Bosniya va Gertsegovina)", 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 0186aa8d6875c..7f42046343f2a 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/uz_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/uz_Cyrl.json @@ -392,7 +392,7 @@ "mi": "маори", "mi_NZ": "маори (Янги Зеландия)", "mk": "македонча", - "mk_MK": "македонча (Македония)", + "mk_MK": "македонча (Шимолий Македония)", "ml": "малаялам", "ml_IN": "малаялам (Ҳиндистон)", "mn": "мўғулча", @@ -500,7 +500,7 @@ "so_SO": "сомалича (Сомали)", "sq": "албанча", "sq_AL": "албанча (Албания)", - "sq_MK": "албанча (Македония)", + "sq_MK": "албанча (Шимолий Македония)", "sq_XK": "албанча (Косово)", "sr": "сербча", "sr_BA": "сербча (Босния ва Герцеговина)", diff --git a/src/Symfony/Component/Intl/Resources/data/locales/wo.json b/src/Symfony/Component/Intl/Resources/data/locales/wo.json index 660b39b0c5273..e42964cf50e0a 100644 --- a/src/Symfony/Component/Intl/Resources/data/locales/wo.json +++ b/src/Symfony/Component/Intl/Resources/data/locales/wo.json @@ -350,7 +350,7 @@ "mi": "Mawri", "mi_NZ": "Mawri (Nuwel Selànd)", "mk": "Maseduwaane", - "mk_MK": "Maseduwaane (Maseduwaan)", + "mk_MK": "Maseduwaane (Maseduwaan bëj Gànnaar)", "ml": "Malayalam", "ml_IN": "Malayalam (End)", "mn": "Mongoliye", @@ -441,7 +441,7 @@ "so_SO": "Somali (Somali)", "sq": "Albane", "sq_AL": "Albane (Albani)", - "sq_MK": "Albane (Maseduwaan)", + "sq_MK": "Albane (Maseduwaan bëj Gànnaar)", "sq_XK": "Albane (Kosowo)", "sr": "Serb", "sr_BA": "Serb (Bosni Ersegowin)", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/am.json b/src/Symfony/Component/Intl/Resources/data/regions/am.json index 9e6bf5dd6b5aa..5ea6d7ab10bf9 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/am.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/am.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.18", + "Version": "2.1.49.82", "Names": { "AC": "አሴንሽን ደሴት", "AD": "አንዶራ", @@ -146,7 +146,7 @@ "MF": "ሴንት ማርቲን", "MG": "ማዳጋስካር", "MH": "ማርሻል አይላንድ", - "MK": "መቄዶንያ", + "MK": "ሰሜን መቄዶንያ", "ML": "ማሊ", "MM": "ማይናማር(በርማ)", "MN": "ሞንጎሊያ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ar.json b/src/Symfony/Component/Intl/Resources/data/regions/ar.json index c29a81c8227e8..6f0b0c03725db 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ar.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ar.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.22", + "Version": "2.1.49.82", "Names": { "AC": "جزيرة أسينشيون", "AD": "أندورا", @@ -146,7 +146,7 @@ "MF": "سان مارتن", "MG": "مدغشقر", "MH": "جزر مارشال", - "MK": "مقدونيا", + "MK": "مقدونيا الشمالية", "ML": "مالي", "MM": "ميانمار (بورما)", "MN": "منغوليا", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/az.json b/src/Symfony/Component/Intl/Resources/data/regions/az.json index 9fa66243e0a7e..76251a04a6950 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/az.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/az.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Askenson adası", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "Sent Martin", "MG": "Madaqaskar", "MH": "Marşal adaları", - "MK": "Makedoniya", + "MK": "Şimali Makedoniya", "ML": "Mali", "MM": "Myanma", "MN": "Monqolustan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/be.json b/src/Symfony/Component/Intl/Resources/data/regions/be.json index 6661111014dca..e80965c3f5584 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/be.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/be.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Востраў Узнясення", "AD": "Андора", @@ -146,7 +146,7 @@ "MF": "Сен-Мартэн", "MG": "Мадагаскар", "MH": "Маршалавы астравы", - "MK": "Македонія", + "MK": "Паўночная Македонія", "ML": "Малі", "MM": "М’янма (Бірма)", "MN": "Манголія", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bs.json b/src/Symfony/Component/Intl/Resources/data/regions/bs.json index b3ee949d266a5..3cd97c23ce908 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/bs.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/bs.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Ostrvo Ascension", "AD": "Andora", @@ -146,7 +146,7 @@ "MF": "Sveti Martin", "MG": "Madagaskar", "MH": "Maršalova ostrva", - "MK": "Makedonija", + "MK": "Sjeverna Makedonija", "ML": "Mali", "MM": "Mjanmar", "MN": "Mongolija", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bs_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/regions/bs_Cyrl.json index 264360f945443..7811ea55ec810 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/bs_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/bs_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Острво Асенсион", "AD": "Андора", @@ -146,7 +146,7 @@ "MF": "Свети Мартин", "MG": "Мадагаскар", "MH": "Маршалска Острва", - "MK": "Македонија", + "MK": "Сјеверна Македонија", "ML": "Мали", "MM": "Мјанмар", "MN": "Монголија", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/cy.json b/src/Symfony/Component/Intl/Resources/data/regions/cy.json index 2383faaf8995c..f8bf7aab1d42e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/cy.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/cy.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Ynys Ascension", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "Saint Martin", "MG": "Madagascar", "MH": "Ynysoedd Marshall", - "MK": "Macedonia", + "MK": "Gogledd Macedonia", "ML": "Mali", "MM": "Myanmar (Burma)", "MN": "Mongolia", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/da.json b/src/Symfony/Component/Intl/Resources/data/regions/da.json index 33afad4e169b1..0d6b922fee7f8 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/da.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/da.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Ascensionøen", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "Saint Martin", "MG": "Madagaskar", "MH": "Marshalløerne", - "MK": "Makedonien", + "MK": "Nordmakedonien", "ML": "Mali", "MM": "Myanmar (Burma)", "MN": "Mongoliet", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/el.json b/src/Symfony/Component/Intl/Resources/data/regions/el.json index 6baa0f4ada54f..e2166265e48a9 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/el.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/el.json @@ -1,5 +1,5 @@ { - "Version": "2.1.49.26", + "Version": "2.1.49.82", "Names": { "AC": "Νήσος Ασενσιόν", "AD": "Ανδόρα", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es.json b/src/Symfony/Component/Intl/Resources/data/regions/es.json index 0b85dcc26c6a4..0277f4ce85c3b 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "AC": "Isla de la Ascensión", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "San Martín", "MG": "Madagascar", "MH": "Islas Marshall", - "MK": "Macedonia", + "MK": "Macedonia del Norte", "ML": "Mali", "MM": "Myanmar (Birmania)", "MN": "Mongolia", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/eu.json b/src/Symfony/Component/Intl/Resources/data/regions/eu.json index 3b33b4c200853..864be628aa749 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/eu.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/eu.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Ascension uhartea", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "San Martin", "MG": "Madagaskar", "MH": "Marshall Uharteak", - "MK": "Mazedonia", + "MK": "Ipar Mazedonia", "ML": "Mali", "MM": "Myanmar (Birmania)", "MN": "Mongolia", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fa.json b/src/Symfony/Component/Intl/Resources/data/regions/fa.json index 2a14864e7e3d8..02fa753c8e147 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/fa.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/fa.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "AC": "جزایر آسنسیون", "AD": "آندورا", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fr.json b/src/Symfony/Component/Intl/Resources/data/regions/fr.json index 19810bbe1ecd6..a1e7b62150865 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/fr.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/fr.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.43", + "Version": "2.1.49.82", "Names": { "AC": "Île de l’Ascension", "AD": "Andorre", @@ -146,7 +146,7 @@ "MF": "Saint-Martin", "MG": "Madagascar", "MH": "Îles Marshall", - "MK": "Macédoine", + "MK": "Macédoine du Nord", "ML": "Mali", "MM": "Myanmar (Birmanie)", "MN": "Mongolie", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ga.json b/src/Symfony/Component/Intl/Resources/data/regions/ga.json index c3ad8c6c5399e..21e60b33b2865 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ga.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ga.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Oileán na Deascabhála", "AD": "Andóra", @@ -146,7 +146,7 @@ "MF": "Saint-Martin", "MG": "Madagascar", "MH": "Oileáin Marshall", - "MK": "an Mhacadóin", + "MK": "an Mhacadóin Thuaidh", "ML": "Mailí", "MM": "Maenmar (Burma)", "MN": "an Mhongóil", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/gd.json b/src/Symfony/Component/Intl/Resources/data/regions/gd.json index 82fc118c83f6b..a88daa99b92e4 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/gd.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/gd.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "AC": "Eilean na Deasgabhalach", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "Naomh Màrtainn", "MG": "Madagasgar", "MH": "Eileanan Mharshall", - "MK": "A’ Mhasadon", + "MK": "A’ Mhasadon a Tuath", "ML": "Màili", "MM": "Miànmar", "MN": "Dùthaich nam Mongol", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/gl.json b/src/Symfony/Component/Intl/Resources/data/regions/gl.json index cfcc31ef4955d..f1e41cb1a9e07 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/gl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/gl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Illa de Ascensión", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "Saint Martin", "MG": "Madagascar", "MH": "Illas Marshall", - "MK": "Macedonia", + "MK": "Macedonia do Norte", "ML": "Malí", "MM": "Myanmar (Birmania)", "MN": "Mongolia", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/hi.json b/src/Symfony/Component/Intl/Resources/data/regions/hi.json index 5fc9f29296f1e..f2f93f931cc2e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/hi.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/hi.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "असेंशन द्वीप", "AD": "एंडोरा", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/hy.json b/src/Symfony/Component/Intl/Resources/data/regions/hy.json index 837b94148ec39..6f80901316dd1 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/hy.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/hy.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Համբարձման կղզի", "AD": "Անդորրա", @@ -146,7 +146,7 @@ "MF": "Սեն Մարտեն", "MG": "Մադագասկար", "MH": "Մարշալյան կղզիներ", - "MK": "Մակեդոնիա", + "MK": "Հյուսիսային Մակեդոնիա", "ML": "Մալի", "MM": "Մյանմա (Բիրմա)", "MN": "Մոնղոլիա", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/is.json b/src/Symfony/Component/Intl/Resources/data/regions/is.json index 1c11054acea9d..637cde04f2eda 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/is.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/is.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Ascension-eyja", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "St. Martin", "MG": "Madagaskar", "MH": "Marshalleyjar", - "MK": "Makedónía", + "MK": "Norður-Makedónía", "ML": "Malí", "MM": "Mjanmar (Búrma)", "MN": "Mongólía", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ja.json b/src/Symfony/Component/Intl/Resources/data/regions/ja.json index a03536a9a42ba..eec991c1fde2c 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ja.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ja.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "AC": "アセンション島", "AD": "アンドラ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/kk.json b/src/Symfony/Component/Intl/Resources/data/regions/kk.json index d287106cc3c2d..8c2e5b69f9011 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/kk.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/kk.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Әскенжін аралы", "AD": "Андорра", @@ -146,7 +146,7 @@ "MF": "Сен-Мартен", "MG": "Мадагаскар", "MH": "Маршалл аралдары", - "MK": "Македония", + "MK": "Солтүстік Македония", "ML": "Мали", "MM": "Мьянма (Бирма)", "MN": "Моңғолия", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/km.json b/src/Symfony/Component/Intl/Resources/data/regions/km.json index 422906b1ccdfb..065d759725b87 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/km.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/km.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "កោះ​អាសេនសិន", "AD": "អង់ដូរ៉ា", @@ -146,7 +146,7 @@ "MF": "សាំង​ម៉ាទីន", "MG": "ម៉ាដាហ្គាស្កា", "MH": "កោះ​ម៉ាស់សល", - "MK": "ម៉ាសេដ្វាន", + "MK": "ម៉ាសេដ្វានខាងជើង", "ML": "ម៉ាលី", "MM": "មីយ៉ាន់ម៉ា (ភូមា)", "MN": "ម៉ុងហ្គោលី", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ko.json b/src/Symfony/Component/Intl/Resources/data/regions/ko.json index 4a65ee4587940..452af11c8f688 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ko.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ko.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "어센션 섬", "AD": "안도라", @@ -146,7 +146,7 @@ "MF": "생마르탱", "MG": "마다가스카르", "MH": "마셜 제도", - "MK": "마케도니아", + "MK": "북마케도니아", "ML": "말리", "MM": "미얀마", "MN": "몽골", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ky.json b/src/Symfony/Component/Intl/Resources/data/regions/ky.json index 0f03ef6e3f2ab..e9c218bb3f317 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ky.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ky.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Вознесение аралы", "AD": "Андорра", @@ -146,7 +146,7 @@ "MF": "Сент-Мартин", "MG": "Мадагаскар", "MH": "Маршалл аралдары", - "MK": "Македония", + "MK": "Түндүк Македония", "ML": "Мали", "MM": "Мьянма (Бирма)", "MN": "Монголия", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/lb.json b/src/Symfony/Component/Intl/Resources/data/regions/lb.json index 26298216162d3..30bcc76e92dd4 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/lb.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/lb.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "AC": "Ascension", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "St. Martin", "MG": "Madagaskar", "MH": "Marshallinselen", - "MK": "Mazedonien", + "MK": "Nordmazedonien", "ML": "Mali", "MM": "Myanmar", "MN": "Mongolei", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/meta.json b/src/Symfony/Component/Intl/Resources/data/regions/meta.json index 34d174732f63c..462933f82a5ac 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/meta.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/meta.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Regions": [ "AC", "AD", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mi.json b/src/Symfony/Component/Intl/Resources/data/regions/mi.json index 4dff632533ec2..0d1836c511609 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/mi.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/mi.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.85", + "Version": "2.1.49.82", "Names": { "BR": "Parahi", "CN": "Haina", @@ -9,6 +9,7 @@ "IN": "Inia", "IT": "Itāria", "JP": "Hapani", + "MK": "Makerōnia ki te Raki", "NZ": "Aotearoa", "RU": "Rūhia", "US": "Hononga o Amerika" diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mo.json b/src/Symfony/Component/Intl/Resources/data/regions/mo.json index 5328076c047ee..f69a42be70d3c 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/mo.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/mo.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "AC": "Insula Ascension", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "Sfântul Martin", "MG": "Madagascar", "MH": "Insulele Marshall", - "MK": "Republica Macedonia", + "MK": "Macedonia de Nord", "ML": "Mali", "MM": "Myanmar (Birmania)", "MN": "Mongolia", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mt.json b/src/Symfony/Component/Intl/Resources/data/regions/mt.json index 0354bd5fa5dcc..47c90b38a47cd 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/mt.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/mt.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.72", + "Version": "2.1.49.82", "Names": { "AC": "Ascension Island", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "Saint Martin", "MG": "Madagascar", "MH": "Gżejjer Marshall", - "MK": "l-Eks-Repubblika Jugoslava tal-Maċedonia", + "MK": "il-Maċedonja ta’ Fuq", "ML": "il-Mali", "MM": "il-Myanmar\/Burma", "MN": "il-Mongolja", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/my.json b/src/Symfony/Component/Intl/Resources/data/regions/my.json index ac443d2404418..da59b10c20b29 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/my.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/my.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.36", + "Version": "2.1.49.82", "Names": { "AC": "အဆန်းရှင်းကျွန်း", "AD": "အန်ဒိုရာ", @@ -146,7 +146,7 @@ "MF": "စိန့်မာတင်", "MG": "မဒါဂတ်စကား", "MH": "မာရှယ် ကျွန်းစု", - "MK": "မက်ဆီဒိုးနီးယား", + "MK": "မြောက် မက်ဆီဒိုးနီးယား", "ML": "မာလီ", "MM": "မြန်မာ", "MN": "မွန်ဂိုးလီးယား", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ne.json b/src/Symfony/Component/Intl/Resources/data/regions/ne.json index f5b45dc71630e..3d6ad1bed46c0 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ne.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ne.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "असेन्सन टापु", "AD": "अन्डोर्रा", @@ -146,7 +146,7 @@ "MF": "सेन्ट मार्टिन", "MG": "माडागास्कर", "MH": "मार्शल टापुहरु", - "MK": "म्यासेडोनिया", + "MK": "उत्तर म्यासेडोनिया", "ML": "माली", "MM": "म्यान्मार (बर्मा)", "MN": "मङ्गोलिया", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/nl.json b/src/Symfony/Component/Intl/Resources/data/regions/nl.json index 467954a11d84a..ae6c73e6d6344 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/nl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/nl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "AC": "Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/nn.json b/src/Symfony/Component/Intl/Resources/data/regions/nn.json index 93ca5c77a78c9..6d3534a209ed1 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/nn.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/nn.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "AC": "Ascension", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "Saint Martin", "MG": "Madagaskar", "MH": "Marshalløyane", - "MK": "Makedonia", + "MK": "Nord-Makedonia", "ML": "Mali", "MM": "Myanmar (Burma)", "MN": "Mongolia", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/or.json b/src/Symfony/Component/Intl/Resources/data/regions/or.json index ea8e4a353c674..c25e74183bcdc 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/or.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/or.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "ଆସେନସିଅନ୍‌ ଦ୍ୱୀପ", "AD": "ଆଣ୍ଡୋରା", @@ -146,7 +146,7 @@ "MF": "ସେଣ୍ଟ ମାର୍ଟିନ୍", "MG": "ମାଡାଗାସ୍କର୍", "MH": "ମାର୍ଶାଲ୍ ଦ୍ୱୀପପୁଞ୍ଜ", - "MK": "ମାସେଡୋନିଆ", + "MK": "ଉତ୍ତର ମାସେଡୋନିଆ", "ML": "ମାଲି", "MM": "ମିଆଁମାର", "MN": "ମଙ୍ଗୋଲିଆ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ps.json b/src/Symfony/Component/Intl/Resources/data/regions/ps.json index 5f123787b779e..31e484303fa97 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ps.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ps.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "اسينشان ټاپو", "AD": "اندورا", @@ -146,7 +146,7 @@ "MF": "سینټ مارټن", "MG": "مدګاسکار", "MH": "مارشل ټاپوګان", - "MK": "مقدونیه", + "MK": "شمالي مقدونيه", "ML": "مالي", "MM": "ميانمار (برما)", "MN": "مغولستان", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/pt_PT.json b/src/Symfony/Component/Intl/Resources/data/regions/pt_PT.json index 6be498ec04b8b..2b8442a6eff79 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/pt_PT.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/pt_PT.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.89", + "Version": "2.1.49.82", "Names": { "AM": "Arménia", "AX": "Alanda", @@ -36,7 +36,7 @@ "MC": "Mónaco", "MD": "Moldávia", "MG": "Madagáscar", - "MK": "Macedónia", + "MK": "Macedónia do Norte", "MS": "Monserrate", "MU": "Maurícia", "MW": "Maláui", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/qu.json b/src/Symfony/Component/Intl/Resources/data/regions/qu.json index 559ef4709e479..d0944b4d40fdc 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/qu.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/qu.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "AD": "Andorra", "AF": "Afganistán", @@ -104,7 +104,7 @@ "MF": "San Martín", "MG": "Madagascar", "MH": "Islas Marshall", - "MK": "ERY Macedonia", + "MK": "Macedonia del Norte", "ML": "Malí", "MM": "Myanmar", "MO": "Macao RAE", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ro.json b/src/Symfony/Component/Intl/Resources/data/regions/ro.json index 5328076c047ee..f69a42be70d3c 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ro.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ro.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "AC": "Insula Ascension", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "Sfântul Martin", "MG": "Madagascar", "MH": "Insulele Marshall", - "MK": "Republica Macedonia", + "MK": "Macedonia de Nord", "ML": "Mali", "MM": "Myanmar (Birmania)", "MN": "Mongolia", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ru.json b/src/Symfony/Component/Intl/Resources/data/regions/ru.json index ae22b55fd507a..24e6a957c8034 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ru.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ru.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "AC": "о-в Вознесения", "AD": "Андорра", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/rw.json b/src/Symfony/Component/Intl/Resources/data/regions/rw.json index 9e0894705b5b1..36efa43ec04d9 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/rw.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/rw.json @@ -1,6 +1,7 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { + "MK": "Masedoniya y'Amajyaruguru", "RW": "U Rwanda", "TO": "Tonga" } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sd.json b/src/Symfony/Component/Intl/Resources/data/regions/sd.json index 7734791da2095..41806b36830ee 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sd.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sd.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "طلوع ٻيٽ", "AD": "اندورا", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sh.json b/src/Symfony/Component/Intl/Resources/data/regions/sh.json index b4ef7918504e6..cce36ed5766b0 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sh.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sh.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.77", + "Version": "2.1.49.82", "Names": { "AC": "Ostrvo Asension", "AD": "Andora", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/so.json b/src/Symfony/Component/Intl/Resources/data/regions/so.json index ee22c09b426e6..f283460fbb260 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/so.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/so.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Jasiiradda Asensiyoon", "AD": "Andora", @@ -146,7 +146,7 @@ "MF": "St. Maartin", "MG": "Madagaskar", "MH": "Jasiiradda Maarshal", - "MK": "Masedooniya", + "MK": "Masedooniya Waqooyi", "ML": "Maali", "MM": "Miyanmar", "MN": "Mongooliya", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr.json b/src/Symfony/Component/Intl/Resources/data/regions/sr.json index a299c77e41036..7d86cb4497b7d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "AC": "Острво Асенсион", "AD": "Андора", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn.json b/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn.json index b4ef7918504e6..cce36ed5766b0 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.77", + "Version": "2.1.49.82", "Names": { "AC": "Ostrvo Asension", "AD": "Andora", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/tg.json b/src/Symfony/Component/Intl/Resources/data/regions/tg.json index 2e94568c80dd6..9b2ea39a6f0e7 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/tg.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/tg.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.96", + "Version": "2.1.49.82", "Names": { "AC": "Асунсон", "AD": "Андорра", @@ -138,7 +138,7 @@ "MF": "Ҷазираи Сент-Мартин", "MG": "Мадагаскар", "MH": "Ҷазираҳои Маршалл", - "MK": "Мақдун", + "MK": "Македонияи Шимолӣ", "ML": "Мали", "MM": "Мянма", "MN": "Муғулистон", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/th.json b/src/Symfony/Component/Intl/Resources/data/regions/th.json index c5f3196214946..9e3acd99d5ad5 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/th.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/th.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "AC": "เกาะแอสเซนชัน", "AD": "อันดอร์รา", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ti.json b/src/Symfony/Component/Intl/Resources/data/regions/ti.json index bd4017146f557..ba32713810b31 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ti.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ti.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "AC": "አሴንሽን ደሴት", "AD": "አንዶራ", @@ -146,7 +146,7 @@ "MF": "ሴንት ማርቲን", "MG": "ማዳጋስካር", "MH": "ማርሻል አይላንድ", - "MK": "ማከዶኒያ", + "MK": "ሰሜን መቆዶንያ", "ML": "ማሊ", "MM": "ማያንማር", "MN": "ሞንጎሊያ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/tk.json b/src/Symfony/Component/Intl/Resources/data/regions/tk.json index 65962ee0ae945..a043701098fe3 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/tk.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/tk.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "AC": "Beýgeliş adasy", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "Sen-Marten", "MG": "Madagaskar", "MH": "Marşall adalary", - "MK": "Makedoniýa", + "MK": "Demirgazyk Makedoniýa", "ML": "Mali", "MM": "Mýanma (Burma)", "MN": "Mongoliýa", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/tl.json b/src/Symfony/Component/Intl/Resources/data/regions/tl.json index ac6311055ebb7..ca2ce9a01d57a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/tl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/tl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "AC": "Acsencion island", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "Saint Martin", "MG": "Madagascar", "MH": "Marshall Islands", - "MK": "Macedonia", + "MK": "North Macedonia", "ML": "Mali", "MM": "Myanmar (Burma)", "MN": "Mongolia", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/tt.json b/src/Symfony/Component/Intl/Resources/data/regions/tt.json index 9c41b31b57cf7..2281d5309134a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/tt.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/tt.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.85", + "Version": "2.1.49.82", "Names": { "AD": "Андорра", "AE": "Берләшкән Гарәп Әмирлекләре", @@ -137,6 +137,7 @@ "MF": "Сент-Мартин", "MG": "Мадагаскар", "MH": "Маршалл утраулары", + "MK": "Төньяк Македония", "ML": "Мали", "MN": "Монголия", "MO": "Макао Махсус Идарәле Төбәге", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ug.json b/src/Symfony/Component/Intl/Resources/data/regions/ug.json index 37a1ce586e6a7..5b0e45a3d8489 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ug.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ug.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "AC": "ئاسسېنسىيون ئارىلى", "AD": "ئاندوررا", @@ -146,7 +146,7 @@ "MF": "ساينت مارتىن", "MG": "ماداغاسقار", "MH": "مارشال ئاراللىرى", - "MK": "ماكېدونىيە", + "MK": "شىمالىي ماكېدونىيە", "ML": "مالى", "MM": "بىرما", "MN": "موڭغۇلىيە", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/uk.json b/src/Symfony/Component/Intl/Resources/data/regions/uk.json index eb61869123423..f345038cc2277 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/uk.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/uk.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "AC": "Острів Вознесіння", "AD": "Андорра", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ur.json b/src/Symfony/Component/Intl/Resources/data/regions/ur.json index 9fd613918af0f..4742bcc033152 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ur.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ur.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "AC": "اسینشن آئلینڈ", "AD": "انڈورا", @@ -146,7 +146,7 @@ "MF": "سینٹ مارٹن", "MG": "مڈغاسکر", "MH": "مارشل آئلینڈز", - "MK": "مقدونیہ", + "MK": "شمالی مقدونیہ", "ML": "مالی", "MM": "میانمار (برما)", "MN": "منگولیا", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/uz.json b/src/Symfony/Component/Intl/Resources/data/regions/uz.json index 2ff987c9e650e..fa9364d6a4201 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/uz.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/uz.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Me’roj oroli", "AD": "Andorra", @@ -146,7 +146,7 @@ "MF": "Sent-Martin", "MG": "Madagaskar", "MH": "Marshall orollari", - "MK": "Makedoniya", + "MK": "Shimoliy Makedoniya", "ML": "Mali", "MM": "Myanma (Birma)", "MN": "Mongoliya", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/uz_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/regions/uz_Cyrl.json index e2e66cb6bfb05..cb3188774fbd0 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/uz_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/uz_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "AC": "Меърож ороли", "AD": "Андорра", @@ -146,7 +146,7 @@ "MF": "Сент-Мартин", "MG": "Мадагаскар", "MH": "Маршал ороллари", - "MK": "Македония", + "MK": "Шимолий Македония", "ML": "Мали", "MM": "Мьянма (Бирма)", "MN": "Монголия", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/vi.json b/src/Symfony/Component/Intl/Resources/data/regions/vi.json index f8e13dcdaea63..f1463068ac761 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/vi.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/vi.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "AC": "Đảo Ascension", "AD": "Andorra", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/wo.json b/src/Symfony/Component/Intl/Resources/data/regions/wo.json index 82a2b033ef859..e56c869ba0d84 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/wo.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/wo.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.84", + "Version": "2.1.49.82", "Names": { "AD": "Andoor", "AE": "Emira Arab Ini", @@ -136,7 +136,7 @@ "MF": "Saŋ Marteŋ", "MG": "Madagaskaar", "MH": "Duni Marsaal", - "MK": "Maseduwaan", + "MK": "Maseduwaan bëj Gànnaar", "ML": "Mali", "MM": "Miyanmaar", "MN": "Mongoli", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/xh.json b/src/Symfony/Component/Intl/Resources/data/regions/xh.json index b3ee565dc5684..5b92b78e4c5cc 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/xh.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/xh.json @@ -1,6 +1,7 @@ { - "Version": "2.1.48.89", + "Version": "2.1.49.82", "Names": { + "MK": "uMntla Macedonia", "ZA": "eMzantsi Afrika" } } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/zh.json b/src/Symfony/Component/Intl/Resources/data/regions/zh.json index 99b0c63736087..14a28dc298c3f 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/zh.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/zh.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "AC": "阿森松岛", "AD": "安道尔", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant.json b/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant.json index 2347546962f8b..cfe3386b1951f 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "AC": "阿森松島", "AD": "安道爾", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/am.json b/src/Symfony/Component/Intl/Resources/data/scripts/am.json index 7277fe0a5294a..c778b78c1b55c 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/am.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/am.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.18", + "Version": "2.1.49.82", "Names": { "Arab": "ዓረብኛ", "Armn": "አርሜንያዊ", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ar.json b/src/Symfony/Component/Intl/Resources/data/scripts/ar.json index 66ff7fc918378..81806463f485b 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ar.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ar.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.22", + "Version": "2.1.49.82", "Names": { "Arab": "العربية", "Armn": "الأرمينية", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/az.json b/src/Symfony/Component/Intl/Resources/data/scripts/az.json index e295c1263bada..59b16e0fdb3ec 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/az.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/az.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "ərəb", "Armi": "armi", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/be.json b/src/Symfony/Component/Intl/Resources/data/scripts/be.json index 1500791d6bcc5..108b93c302c58 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/be.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/be.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "арабскае", "Armn": "армянскае", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/bs.json b/src/Symfony/Component/Intl/Resources/data/scripts/bs.json index 459cb117f67b0..ff2390d4d4cd9 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/bs.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/bs.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "arapsko pismo", "Armi": "imperijsko aramejsko pismo", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/bs_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/scripts/bs_Cyrl.json index 376ab73b71bfa..8ea6ba2c4d7de 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/bs_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/bs_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "арапско писмо", "Armi": "империјско арамејско писмо", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/cy.json b/src/Symfony/Component/Intl/Resources/data/scripts/cy.json index c451e9f624881..d94566c0fcbfe 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/cy.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/cy.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "Arabaidd", "Armn": "Armenaidd", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/da.json b/src/Symfony/Component/Intl/Resources/data/scripts/da.json index fdd18d3bfa058..5811a8a2377a7 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/da.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/da.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Afak": "afaka", "Arab": "arabisk", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/el.json b/src/Symfony/Component/Intl/Resources/data/scripts/el.json index 85552a86cd8d7..f65ffa75c359b 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/el.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/el.json @@ -1,5 +1,5 @@ { - "Version": "2.1.49.26", + "Version": "2.1.49.82", "Names": { "Arab": "Αραβικό", "Armi": "Αυτοκρατορικό Αραμαϊκό", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/es.json b/src/Symfony/Component/Intl/Resources/data/scripts/es.json index 2c7526f7c5ebb..15a5ac34032ea 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/es.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/es.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "Arab": "árabe", "Armn": "armenio", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/eu.json b/src/Symfony/Component/Intl/Resources/data/scripts/eu.json index 8113c871186f4..7945bcc2c2a07 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/eu.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/eu.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "arabiarra", "Armn": "armeniarra", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/fa.json b/src/Symfony/Component/Intl/Resources/data/scripts/fa.json index 9b9f6036d9e46..4e27c73464b70 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/fa.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/fa.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "Aghb": "آلبانیایی قفقازی", "Arab": "عربی", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/fr.json b/src/Symfony/Component/Intl/Resources/data/scripts/fr.json index 943357c0e5115..6b85d6c4073f4 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/fr.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/fr.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.43", + "Version": "2.1.49.82", "Names": { "Arab": "arabe", "Armi": "araméen impérial", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ga.json b/src/Symfony/Component/Intl/Resources/data/scripts/ga.json index 3b76bdb05d0ed..1c6ff1d890cd5 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ga.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ga.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Adlm": "Adlm", "Aghb": "Albánach Cugasach", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/gd.json b/src/Symfony/Component/Intl/Resources/data/scripts/gd.json index 542569c7d116c..b843fced0617a 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/gd.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/gd.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "Adlm": "Adlam", "Afak": "Afaka", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/gl.json b/src/Symfony/Component/Intl/Resources/data/scripts/gl.json index 81061aa300445..56a1212515c95 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/gl.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/gl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "árabe", "Armn": "armenio", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/hi.json b/src/Symfony/Component/Intl/Resources/data/scripts/hi.json index 3af27f2c52fce..7b4eb5cce13b6 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/hi.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/hi.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "अरबी", "Armi": "इम्पिरियल आर्मेनिक", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/hy.json b/src/Symfony/Component/Intl/Resources/data/scripts/hy.json index c79bab1e43cec..3744b8f915dbb 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/hy.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/hy.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "արաբական", "Armn": "հայկական", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/is.json b/src/Symfony/Component/Intl/Resources/data/scripts/is.json index 5f6a81172efa4..16f9f4ba0f40e 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/is.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/is.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "arabískt", "Armn": "armenskt", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ja.json b/src/Symfony/Component/Intl/Resources/data/scripts/ja.json index 2c8c4718963b4..47caf5537d552 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ja.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ja.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "Afak": "アファカ文字", "Aghb": "カフカス・アルバニア文字", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/kk.json b/src/Symfony/Component/Intl/Resources/data/scripts/kk.json index 1173b7acc3ab9..889561db8b5f1 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/kk.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/kk.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "араб жазуы", "Armn": "армян жазуы", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/km.json b/src/Symfony/Component/Intl/Resources/data/scripts/km.json index 4e4bada06d77d..b1e73455f4136 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/km.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/km.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "អារ៉ាប់", "Armn": "អាមេនី", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ko.json b/src/Symfony/Component/Intl/Resources/data/scripts/ko.json index c723d1818b95c..f1906c30b591f 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ko.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ko.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Afak": "아파카 문자", "Aghb": "코카시안 알바니아 문자", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ky.json b/src/Symfony/Component/Intl/Resources/data/scripts/ky.json index 64534eaaba756..15e2d0a1db9b8 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ky.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ky.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "Араб", "Armn": "Армян", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/lb.json b/src/Symfony/Component/Intl/Resources/data/scripts/lb.json index 63833b9ec772b..17f21f97011d8 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/lb.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/lb.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "Arab": "Arabesch", "Armi": "Armi", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/meta.json b/src/Symfony/Component/Intl/Resources/data/scripts/meta.json index d6edce68e952a..621210c004cfc 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/meta.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/meta.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Scripts": [ "Adlm", "Afak", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/mi.json b/src/Symfony/Component/Intl/Resources/data/scripts/mi.json index 4117186f66cf8..a217f23be66d2 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/mi.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/mi.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.85", + "Version": "2.1.49.82", "Names": { "Arab": "Arapika", "Cyrl": "Hīririki", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/mo.json b/src/Symfony/Component/Intl/Resources/data/scripts/mo.json index f1764c5b48252..1cfe695a39a06 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/mo.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/mo.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "Arab": "arabă", "Armn": "armeană", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/mt.json b/src/Symfony/Component/Intl/Resources/data/scripts/mt.json index 06987636600eb..75919bd2171f8 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/mt.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/mt.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.72", + "Version": "2.1.49.82", "Names": { "Arab": "Għarbi", "Cyrl": "Ċirilliku", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/my.json b/src/Symfony/Component/Intl/Resources/data/scripts/my.json index 2d526f7c702ea..c9c5d182da08e 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/my.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/my.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.36", + "Version": "2.1.49.82", "Names": { "Arab": "အာရေဗျ", "Armn": "အာမေးနီးယား", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ne.json b/src/Symfony/Component/Intl/Resources/data/scripts/ne.json index a0c1a096c762a..a7e34d54bb312 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ne.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ne.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "अरबी", "Armi": "आर्मी", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/nl.json b/src/Symfony/Component/Intl/Resources/data/scripts/nl.json index 3d7a7527edd4c..9b86c647dd88a 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/nl.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/nl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "Adlm": "Adlam", "Afak": "Defaka", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/nn.json b/src/Symfony/Component/Intl/Resources/data/scripts/nn.json index 4e6b538705c0b..38808beb8eca1 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/nn.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/nn.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "Arab": "arabisk", "Armi": "armisk", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/or.json b/src/Symfony/Component/Intl/Resources/data/scripts/or.json index 1348efa743758..907ff6968f42d 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/or.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/or.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "ଆରବିକ୍", "Armi": "ଇମ୍ପେରିଆଲ୍ ଆରମିକ୍", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ps.json b/src/Symfony/Component/Intl/Resources/data/scripts/ps.json index 07f7a87f6c2b5..24769d493c358 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ps.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ps.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "عربي", "Armn": "ارمانیایي", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/pt_PT.json b/src/Symfony/Component/Intl/Resources/data/scripts/pt_PT.json index 9368cef70c680..2f3b4ab51b92f 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/pt_PT.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/pt_PT.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.89", + "Version": "2.1.49.82", "Names": { "Armn": "arménio", "Beng": "bengalês", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ro.json b/src/Symfony/Component/Intl/Resources/data/scripts/ro.json index f1764c5b48252..1cfe695a39a06 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ro.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ro.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "Arab": "arabă", "Armn": "armeană", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ru.json b/src/Symfony/Component/Intl/Resources/data/scripts/ru.json index 543da6515bae6..320d2ebc4155b 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ru.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ru.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "Afak": "афака", "Arab": "арабица", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/sd.json b/src/Symfony/Component/Intl/Resources/data/scripts/sd.json index dfcd971b81ee6..be613e0dc4079 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/sd.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/sd.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "عربي", "Armn": "عرماني", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/sh.json b/src/Symfony/Component/Intl/Resources/data/scripts/sh.json index 440b28cacf623..2ec69eb441622 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/sh.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/sh.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.77", + "Version": "2.1.49.82", "Names": { "Arab": "arapsko pismo", "Armi": "imperijsko aramejsko pismo", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/so.json b/src/Symfony/Component/Intl/Resources/data/scripts/so.json index 18a03434c7e0c..7fa43a178c6f1 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/so.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/so.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "Carabi", "Armn": "Armeeniyaan", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/sr.json b/src/Symfony/Component/Intl/Resources/data/scripts/sr.json index 211ab2bd28eba..0e997d403270b 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/sr.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/sr.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "Arab": "арапско писмо", "Armi": "империјско арамејско писмо", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/sr_Latn.json b/src/Symfony/Component/Intl/Resources/data/scripts/sr_Latn.json index 440b28cacf623..2ec69eb441622 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/sr_Latn.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/sr_Latn.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.77", + "Version": "2.1.49.82", "Names": { "Arab": "arapsko pismo", "Armi": "imperijsko aramejsko pismo", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/tg.json b/src/Symfony/Component/Intl/Resources/data/scripts/tg.json index 86690daaa7804..a845e0b870b8b 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/tg.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/tg.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.96", + "Version": "2.1.49.82", "Names": { "Arab": "Арабӣ", "Cyrl": "Кириллӣ", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/th.json b/src/Symfony/Component/Intl/Resources/data/scripts/th.json index eccd7475185c9..4bb38d82a79ce 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/th.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/th.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "Afak": "อะฟาคา", "Aghb": "แอลเบเนีย คอเคเซีย", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ti.json b/src/Symfony/Component/Intl/Resources/data/scripts/ti.json index 544b2c2990ee8..1b2ded1e0167e 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ti.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ti.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "Ethi": "ፊደል", "Latn": "ላቲን" diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/tk.json b/src/Symfony/Component/Intl/Resources/data/scripts/tk.json index 1b08112a71166..7d1ce7946855d 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/tk.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/tk.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.86", + "Version": "2.1.49.82", "Names": { "Arab": "Arap elipbiýi", "Armn": "Ermeni elipbiýi", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/tl.json b/src/Symfony/Component/Intl/Resources/data/scripts/tl.json index 8664c7e63624b..04007ab602327 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/tl.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/tl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "Arab": "Arabic", "Armn": "Armenian", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/tt.json b/src/Symfony/Component/Intl/Resources/data/scripts/tt.json index 8bdfe6ed01b53..b259e7f047e64 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/tt.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/tt.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.85", + "Version": "2.1.49.82", "Names": { "Arab": "гарәп", "Cyrl": "кирилл", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ug.json b/src/Symfony/Component/Intl/Resources/data/scripts/ug.json index 0083f732e763d..a2c05f5e7fc67 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ug.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ug.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.82", + "Version": "2.1.49.82", "Names": { "Afak": "ئافاكا", "Arab": "ئەرەب", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/uk.json b/src/Symfony/Component/Intl/Resources/data/scripts/uk.json index 4dfd32dd65663..318b288c23848 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/uk.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/uk.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "Adlm": "адлам", "Afak": "афака", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/ur.json b/src/Symfony/Component/Intl/Resources/data/scripts/ur.json index 3688665d1558d..fc654de9238a2 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/ur.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/ur.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.20", + "Version": "2.1.49.82", "Names": { "Arab": "عربی", "Armn": "آرمینیائی", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/uz.json b/src/Symfony/Component/Intl/Resources/data/scripts/uz.json index 6f75dc0ed8bf1..9c9025edebee8 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/uz.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/uz.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "arab", "Armn": "arman", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/uz_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/scripts/uz_Cyrl.json index e7410c4a815f1..11b7d6afca2a8 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/uz_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/uz_Cyrl.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.17", + "Version": "2.1.49.82", "Names": { "Arab": "Араб", "Armn": "Арман", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/vi.json b/src/Symfony/Component/Intl/Resources/data/scripts/vi.json index 7ae6326f7ccb5..d900cf1b08499 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/vi.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/vi.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "Adlm": "Adlm", "Afak": "Chữ Afaka", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/wo.json b/src/Symfony/Component/Intl/Resources/data/scripts/wo.json index ac88abd21a220..44b718f80cec3 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/wo.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/wo.json @@ -1,5 +1,5 @@ { - "Version": "2.1.47.84", + "Version": "2.1.49.82", "Names": { "Arab": "Araab", "Cyrl": "Sirilik", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/zh.json b/src/Symfony/Component/Intl/Resources/data/scripts/zh.json index 1d04a8644761f..5c196f56f6b9a 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/zh.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/zh.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "Adlm": "阿德拉姆文", "Afak": "阿法卡文", diff --git a/src/Symfony/Component/Intl/Resources/data/scripts/zh_Hant.json b/src/Symfony/Component/Intl/Resources/data/scripts/zh_Hant.json index 72b85fc4362f1..f3d6a377bb6e8 100644 --- a/src/Symfony/Component/Intl/Resources/data/scripts/zh_Hant.json +++ b/src/Symfony/Component/Intl/Resources/data/scripts/zh_Hant.json @@ -1,5 +1,5 @@ { - "Version": "2.1.48.42", + "Version": "2.1.49.82", "Names": { "Adlm": "富拉文", "Afak": "阿法卡文字", diff --git a/src/Symfony/Component/Intl/Resources/data/version.txt b/src/Symfony/Component/Intl/Resources/data/version.txt index 7aa60b79233a2..844aa57195661 100644 --- a/src/Symfony/Component/Intl/Resources/data/version.txt +++ b/src/Symfony/Component/Intl/Resources/data/version.txt @@ -1 +1 @@ -64.1 +64.2 diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php index 8c4773462e18a..f0ed17627f840 100644 --- a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php +++ b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php @@ -110,7 +110,7 @@ private function registerHandlers(ContainerBuilder $container, array $busIds) if (\is_array($method)) { if (isset($method['bus'])) { if (!\in_array($method['bus'], $busIds)) { - $messageLocation = isset($tag['handles']) ? 'declared in your tag attribute "handles"' : $r->implementsInterface(MessageSubscriberInterface::class) ? sprintf('returned by method "%s::getHandledMessages()"', $r->getName()) : sprintf('used as argument type in method "%s::%s()"', $r->getName(), $method); + $messageLocation = isset($tag['handles']) ? 'declared in your tag attribute "handles"' : ($r->implementsInterface(MessageSubscriberInterface::class) ? sprintf('returned by method "%s::getHandledMessages()"', $r->getName()) : sprintf('used as argument type in method "%s::%s()"', $r->getName(), $method)); throw new RuntimeException(sprintf('Invalid configuration %s for message "%s": bus "%s" does not exist.', $messageLocation, $message, $method['bus'])); } @@ -123,7 +123,7 @@ private function registerHandlers(ContainerBuilder $container, array $busIds) } if ('*' !== $message && !class_exists($message) && !interface_exists($message, false)) { - $messageLocation = isset($tag['handles']) ? 'declared in your tag attribute "handles"' : $r->implementsInterface(MessageSubscriberInterface::class) ? sprintf('returned by method "%s::getHandledMessages()"', $r->getName()) : sprintf('used as argument type in method "%s::%s()"', $r->getName(), $method); + $messageLocation = isset($tag['handles']) ? 'declared in your tag attribute "handles"' : ($r->implementsInterface(MessageSubscriberInterface::class) ? sprintf('returned by method "%s::getHandledMessages()"', $r->getName()) : sprintf('used as argument type in method "%s::%s()"', $r->getName(), $method)); throw new RuntimeException(sprintf('Invalid handler service "%s": class or interface "%s" %s not found.', $serviceId, $message, $messageLocation)); } diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php index 754e903d89ed0..fdfd10fffe611 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php @@ -210,7 +210,7 @@ private function compileStaticRoutes(array $staticRoutes, array &$conditions): s foreach ($staticRoutes as $url => $routes) { $code .= self::export($url)." => [\n"; foreach ($routes as $name => list($route, $hasTrailingSlash)) { - $code .= $this->compileRoute($route, $name, !$route->compile()->getHostVariables() ? $route->getHost() : $route->compile()->getHostRegex() ?: null, $hasTrailingSlash, false, $conditions); + $code .= $this->compileRoute($route, $name, (!$route->compile()->getHostVariables() ? $route->getHost() : $route->compile()->getHostRegex()) ?: null, $hasTrailingSlash, false, $conditions); } $code .= "],\n"; } diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherTrait.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherTrait.php index b77c53085495c..42cd41a9153c0 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherTrait.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherTrait.php @@ -15,11 +15,14 @@ use Symfony\Component\Routing\Exception\NoConfigurationException; use Symfony\Component\Routing\Exception\ResourceNotFoundException; use Symfony\Component\Routing\Matcher\RedirectableUrlMatcherInterface; +use Symfony\Component\Routing\RequestContext; /** * @author Nicolas Grekas * * @internal + * + * @property RequestContext $context */ trait PhpMatcherTrait { @@ -89,13 +92,6 @@ private function doMatch(string $pathinfo, array &$allow = [], array &$allowSche continue; } - if ('/' !== $pathinfo && $hasTrailingSlash === ($trimmedPathinfo === $pathinfo)) { - if ($supportsRedirections && (!$requiredMethods || isset($requiredMethods['GET']))) { - return $allow = $allowSchemes = []; - } - continue; - } - if ($requiredHost) { if ('#' !== $requiredHost[0] ? $requiredHost !== $host : !preg_match($requiredHost, $host, $hostMatches)) { continue; @@ -106,6 +102,13 @@ private function doMatch(string $pathinfo, array &$allow = [], array &$allowSche } } + if ('/' !== $pathinfo && $hasTrailingSlash === ($trimmedPathinfo === $pathinfo)) { + if ($supportsRedirections && (!$requiredMethods || isset($requiredMethods['GET']))) { + return $allow = $allowSchemes = []; + } + continue; + } + $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]); if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) { if ($hasRequiredScheme) { @@ -113,6 +116,7 @@ private function doMatch(string $pathinfo, array &$allow = [], array &$allowSche } continue; } + if (!$hasRequiredScheme) { $allowSchemes += $requiredSchemes; continue; @@ -132,7 +136,7 @@ private function doMatch(string $pathinfo, array &$allow = [], array &$allowSche $hasTrailingVar = $trimmedPathinfo !== $pathinfo && $hasTrailingVar; - if ($hasTrailingVar && ($hasTrailingSlash || '/' !== substr($matches[\count($vars)], -1)) && preg_match($regex, $this->matchHost ? $host.'.'.$trimmedPathinfo : $trimmedPathinfo, $n) && $m === (int) $n['MARK']) { + if ($hasTrailingVar && ($hasTrailingSlash || (null === $n = $matches[\count($vars)] ?? null) || '/' !== ($n[-1] ?? '/')) && preg_match($regex, $this->matchHost ? $host.'.'.$trimmedPathinfo : $trimmedPathinfo, $n) && $m === (int) $n['MARK']) { if ($hasTrailingSlash) { $matches = $n; } else { diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php index 5b6c0440da9cc..7b2662a2a392e 100644 --- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php +++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php @@ -32,6 +32,7 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface const REQUIREMENT_MISMATCH = 1; const ROUTE_MATCH = 2; + /** @var RequestContext */ protected $context; /** @@ -158,7 +159,7 @@ protected function matchCollection($pathinfo, RouteCollection $routes) $hasTrailingVar = $trimmedPathinfo !== $pathinfo && preg_match('#\{\w+\}/?$#', $route->getPath()); - if ($hasTrailingVar && ($hasTrailingSlash || '/' !== substr($matches[(\count($matches) - 1) >> 1], -1)) && preg_match($regex, $trimmedPathinfo, $m)) { + if ($hasTrailingVar && ($hasTrailingSlash || (null === $m = $matches[\count($compiledRoute->getPathVariables())] ?? null) || '/' !== ($m[-1] ?? '/')) && preg_match($regex, $trimmedPathinfo, $m)) { if ($hasTrailingSlash) { $matches = $m; } else { @@ -166,14 +167,6 @@ protected function matchCollection($pathinfo, RouteCollection $routes) } } - if ('/' !== $pathinfo && !$hasTrailingVar && $hasTrailingSlash === ($trimmedPathinfo === $pathinfo)) { - if ($supportsTrailingSlash && (!$requiredMethods || \in_array('GET', $requiredMethods))) { - return $this->allow = $this->allowSchemes = []; - } - - continue; - } - $hostMatches = []; if ($compiledRoute->getHostRegex() && !preg_match($compiledRoute->getHostRegex(), $this->context->getHost(), $hostMatches)) { continue; @@ -185,6 +178,14 @@ protected function matchCollection($pathinfo, RouteCollection $routes) continue; } + if ('/' !== $pathinfo && !$hasTrailingVar && $hasTrailingSlash === ($trimmedPathinfo === $pathinfo)) { + if ($supportsTrailingSlash && (!$requiredMethods || \in_array('GET', $requiredMethods))) { + return $this->allow = $this->allowSchemes = []; + } + + continue; + } + $hasRequiredScheme = !$route->getSchemes() || $route->hasScheme($this->context->getScheme()); if ($requiredMethods) { if (!\in_array($method, $requiredMethods)) { diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php index 27c32e14ae8c6..7a40c363e0680 100644 --- a/src/Symfony/Component/Routing/Router.php +++ b/src/Symfony/Component/Routing/Router.php @@ -73,6 +73,11 @@ class Router implements RouterInterface, RequestMatcherInterface */ protected $logger; + /** + * @var string|null + */ + protected $defaultLocale; + /** * @var ConfigCacheFactoryInterface|null */ @@ -90,13 +95,14 @@ class Router implements RouterInterface, RequestMatcherInterface * @param RequestContext $context The context * @param LoggerInterface $logger A logger instance */ - public function __construct(LoaderInterface $loader, $resource, array $options = [], RequestContext $context = null, LoggerInterface $logger = null) + public function __construct(LoaderInterface $loader, $resource, array $options = [], RequestContext $context = null, LoggerInterface $logger = null, string $defaultLocale = null) { $this->loader = $loader; $this->resource = $resource; $this->logger = $logger; $this->context = $context ?: new RequestContext(); $this->setOptions($options); + $this->defaultLocale = $defaultLocale; } /** @@ -321,7 +327,7 @@ public function getGenerator() } if (null === $this->options['cache_dir'] || null === $this->options['generator_cache_class']) { - $this->generator = new $this->options['generator_class']($this->getRouteCollection(), $this->context, $this->logger); + $this->generator = new $this->options['generator_class']($this->getRouteCollection(), $this->context, $this->logger, $this->defaultLocale); } else { $cache = $this->getConfigCacheFactory()->cache($this->options['cache_dir'].'/'.$this->options['generator_cache_class'].'.php', function (ConfigCacheInterface $cache) { @@ -340,7 +346,7 @@ function (ConfigCacheInterface $cache) { require_once $cache->getPath(); } - $this->generator = new $this->options['generator_cache_class']($this->context, $this->logger); + $this->generator = new $this->options['generator_cache_class']($this->context, $this->logger, $this->defaultLocale); } if ($this->generator instanceof ConfigurableRequirementsInterface) { diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php index 7f64a1f378326..c7cfb2852e178 100644 --- a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php +++ b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php @@ -162,6 +162,82 @@ public function testGlobalParameterHasHigherPriorityThanDefault() $this->assertSame('/app.php/de', $url); } + public function testGenerateWithDefaultLocale() + { + $routes = new RouteCollection(); + + $route = new Route(''); + + $name = 'test'; + + foreach (['hr' => '/foo', 'en' => '/bar'] as $locale => $path) { + $localizedRoute = clone $route; + $localizedRoute->setDefault('_locale', $locale); + $localizedRoute->setDefault('_canonical_route', $name); + $localizedRoute->setPath($path); + $routes->add($name.'.'.$locale, $localizedRoute); + } + + $generator = $this->getGenerator($routes, [], null, 'hr'); + + $this->assertSame( + 'http://localhost/app.php/foo', + $generator->generate($name, [], UrlGeneratorInterface::ABSOLUTE_URL) + ); + } + + public function testGenerateWithOverriddenParameterLocale() + { + $routes = new RouteCollection(); + + $route = new Route(''); + + $name = 'test'; + + foreach (['hr' => '/foo', 'en' => '/bar'] as $locale => $path) { + $localizedRoute = clone $route; + $localizedRoute->setDefault('_locale', $locale); + $localizedRoute->setDefault('_canonical_route', $name); + $localizedRoute->setPath($path); + $routes->add($name.'.'.$locale, $localizedRoute); + } + + $generator = $this->getGenerator($routes, [], null, 'hr'); + + $this->assertSame( + 'http://localhost/app.php/bar', + $generator->generate($name, ['_locale' => 'en'], UrlGeneratorInterface::ABSOLUTE_URL) + ); + } + + public function testGenerateWithOverriddenParameterLocaleFromRequestContext() + { + $routes = new RouteCollection(); + + $route = new Route(''); + + $name = 'test'; + + foreach (['hr' => '/foo', 'en' => '/bar'] as $locale => $path) { + $localizedRoute = clone $route; + $localizedRoute->setDefault('_locale', $locale); + $localizedRoute->setDefault('_canonical_route', $name); + $localizedRoute->setPath($path); + $routes->add($name.'.'.$locale, $localizedRoute); + } + + $generator = $this->getGenerator($routes, [], null, 'hr'); + + $context = new RequestContext('/app.php'); + $context->setParameter('_locale', 'en'); + $generator->setContext($context); + + $this->assertSame( + 'http://localhost/app.php/bar', + $generator->generate($name, [], UrlGeneratorInterface::ABSOLUTE_URL) + ); + } + /** * @expectedException \Symfony\Component\Routing\Exception\RouteNotFoundException */ @@ -171,6 +247,29 @@ public function testGenerateWithoutRoutes() $this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL); } + /** + * @expectedException \Symfony\Component\Routing\Exception\RouteNotFoundException + */ + public function testGenerateWithInvalidLocale() + { + $routes = new RouteCollection(); + + $route = new Route(''); + + $name = 'test'; + + foreach (['hr' => '/foo', 'en' => '/bar'] as $locale => $path) { + $localizedRoute = clone $route; + $localizedRoute->setDefault('_locale', $locale); + $localizedRoute->setDefault('_canonical_route', $name); + $localizedRoute->setPath($path); + $routes->add($name.'.'.$locale, $localizedRoute); + } + + $generator = $this->getGenerator($routes, [], null, 'fr'); + $generator->generate($name); + } + /** * @expectedException \Symfony\Component\Routing\Exception\MissingMandatoryParametersException */ @@ -720,7 +819,7 @@ public function provideLookAroundRequirementsInPath() yield ['/app.php/bar/a/b/bam/c/d/e', '/bar/{foo}/bam/{baz}', '(? $value) { @@ -728,7 +827,7 @@ protected function getGenerator(RouteCollection $routes, array $parameters = [], $context->$method($value); } - return new UrlGenerator($routes, $context, $logger); + return new UrlGenerator($routes, $context, $logger, $defaultLocale); } protected function getRoutes($name, Route $route) diff --git a/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php index 42acb04857586..f5ac21db90f3c 100644 --- a/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php +++ b/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php @@ -198,6 +198,17 @@ public function testNonGreedyTrailingRequirement() $this->assertEquals(['_route' => 'a', 'a' => '123'], $matcher->match('/123/')); } + public function testTrailingRequirementWithDefault_A() + { + $coll = new RouteCollection(); + $coll->add('a', new Route('/fr-fr/{a}', ['a' => 'aaa'], ['a' => '.+'])); + + $matcher = $this->getUrlMatcher($coll); + $matcher->expects($this->once())->method('redirect')->with('/fr-fr')->willReturn([]); + + $this->assertEquals(['_route' => 'a', 'a' => 'aaa'], $matcher->match('/fr-fr/')); + } + protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null) { return $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', [$routes, $context ?: new RequestContext()]); diff --git a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php index 596c1476f7265..8f99f7b8e9988 100644 --- a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php +++ b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php @@ -85,9 +85,8 @@ public function testMethodNotAllowedAggregatesAllowedMethods() } } - public function testMatch() + public function testPatternMatchAndParameterReturn() { - // test the patterns are matched and parameters are returned $collection = new RouteCollection(); $collection->add('foo', new Route('/foo/{bar}')); $matcher = $this->getUrlMatcher($collection); @@ -96,14 +95,21 @@ public function testMatch() $this->fail(); } catch (ResourceNotFoundException $e) { } + $this->assertEquals(['_route' => 'foo', 'bar' => 'baz'], $matcher->match('/foo/baz')); + } + public function testDefaultsAreMerged() + { // test that defaults are merged $collection = new RouteCollection(); $collection->add('foo', new Route('/foo/{bar}', ['def' => 'test'])); $matcher = $this->getUrlMatcher($collection); $this->assertEquals(['_route' => 'foo', 'bar' => 'baz', 'def' => 'test'], $matcher->match('/foo/baz')); + } + public function testMethodIsIgnoredIfNoMethodGiven() + { // test that route "method" is ignored if no method is given in the context $collection = new RouteCollection(); $collection->add('foo', new Route('/foo', [], [], [], '', [], ['get', 'head'])); @@ -123,8 +129,10 @@ public function testMatch() $this->assertInternalType('array', $matcher->match('/foo')); $matcher = $this->getUrlMatcher($collection, new RequestContext('', 'head')); $this->assertInternalType('array', $matcher->match('/foo')); + } - // route with an optional variable as the first segment + public function testRouteWithOptionalVariableAsFirstSegment() + { $collection = new RouteCollection(); $collection->add('bar', new Route('/{bar}/foo', ['bar' => 'bar'], ['bar' => 'foo|bar'])); $matcher = $this->getUrlMatcher($collection); @@ -136,8 +144,10 @@ public function testMatch() $matcher = $this->getUrlMatcher($collection); $this->assertEquals(['_route' => 'bar', 'bar' => 'foo'], $matcher->match('/foo')); $this->assertEquals(['_route' => 'bar', 'bar' => 'bar'], $matcher->match('/')); + } - // route with only optional variables + public function testRouteWithOnlyOptionalVariables() + { $collection = new RouteCollection(); $collection->add('bar', new Route('/{foo}/{bar}', ['foo' => 'foo', 'bar' => 'bar'], [])); $matcher = $this->getUrlMatcher($collection); @@ -512,6 +522,141 @@ public function testWithHostOnRouteCollection() $this->assertEquals(['foo' => 'bar', '_route' => 'bar', 'locale' => 'en'], $matcher->match('/bar/bar')); } + public function testVariationInTrailingSlashWithHosts() + { + $coll = new RouteCollection(); + $coll->add('foo', new Route('/foo/', [], [], [], 'foo.example.com')); + $coll->add('bar', new Route('/foo', [], [], [], 'bar.example.com')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'foo.example.com')); + $this->assertEquals(['_route' => 'foo'], $matcher->match('/foo/')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'bar.example.com')); + $this->assertEquals(['_route' => 'bar'], $matcher->match('/foo')); + } + + public function testVariationInTrailingSlashWithHostsInReverse() + { + // The order should not matter + $coll = new RouteCollection(); + $coll->add('bar', new Route('/foo', [], [], [], 'bar.example.com')); + $coll->add('foo', new Route('/foo/', [], [], [], 'foo.example.com')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'foo.example.com')); + $this->assertEquals(['_route' => 'foo'], $matcher->match('/foo/')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'bar.example.com')); + $this->assertEquals(['_route' => 'bar'], $matcher->match('/foo')); + } + + public function testVariationInTrailingSlashWithHostsAndVariable() + { + $coll = new RouteCollection(); + $coll->add('foo', new Route('/{foo}/', [], [], [], 'foo.example.com')); + $coll->add('bar', new Route('/{foo}', [], [], [], 'bar.example.com')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'foo.example.com')); + $this->assertEquals(['foo' => 'bar', '_route' => 'foo'], $matcher->match('/bar/')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'bar.example.com')); + $this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/bar')); + } + + public function testVariationInTrailingSlashWithHostsAndVariableInReverse() + { + // The order should not matter + $coll = new RouteCollection(); + $coll->add('bar', new Route('/{foo}', [], [], [], 'bar.example.com')); + $coll->add('foo', new Route('/{foo}/', [], [], [], 'foo.example.com')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'foo.example.com')); + $this->assertEquals(['foo' => 'bar', '_route' => 'foo'], $matcher->match('/bar/')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'bar.example.com')); + $this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/bar')); + } + + public function testVariationInTrailingSlashWithMethods() + { + $coll = new RouteCollection(); + $coll->add('foo', new Route('/foo/', [], [], [], '', [], ['POST'])); + $coll->add('bar', new Route('/foo', [], [], [], '', [], ['GET'])); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST')); + $this->assertEquals(['_route' => 'foo'], $matcher->match('/foo/')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET')); + $this->assertEquals(['_route' => 'bar'], $matcher->match('/foo')); + } + + public function testVariationInTrailingSlashWithMethodsInReverse() + { + // The order should not matter + $coll = new RouteCollection(); + $coll->add('bar', new Route('/foo', [], [], [], '', [], ['GET'])); + $coll->add('foo', new Route('/foo/', [], [], [], '', [], ['POST'])); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST')); + $this->assertEquals(['_route' => 'foo'], $matcher->match('/foo/')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET')); + $this->assertEquals(['_route' => 'bar'], $matcher->match('/foo')); + } + + public function testVariableVariationInTrailingSlashWithMethods() + { + $coll = new RouteCollection(); + $coll->add('foo', new Route('/{foo}/', [], [], [], '', [], ['POST'])); + $coll->add('bar', new Route('/{foo}', [], [], [], '', [], ['GET'])); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST')); + $this->assertEquals(['foo' => 'bar', '_route' => 'foo'], $matcher->match('/bar/')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET')); + $this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/bar')); + } + + public function testVariableVariationInTrailingSlashWithMethodsInReverse() + { + // The order should not matter + $coll = new RouteCollection(); + $coll->add('bar', new Route('/{foo}', [], [], [], '', [], ['GET'])); + $coll->add('foo', new Route('/{foo}/', [], [], [], '', [], ['POST'])); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST')); + $this->assertEquals(['foo' => 'bar', '_route' => 'foo'], $matcher->match('/bar/')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET')); + $this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/bar')); + } + + public function testMixOfStaticAndVariableVariationInTrailingSlashWithHosts() + { + $coll = new RouteCollection(); + $coll->add('foo', new Route('/foo/', [], [], [], 'foo.example.com')); + $coll->add('bar', new Route('/{foo}', [], [], [], 'bar.example.com')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'foo.example.com')); + $this->assertEquals(['_route' => 'foo'], $matcher->match('/foo/')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'bar.example.com')); + $this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/bar')); + } + + public function testMixOfStaticAndVariableVariationInTrailingSlashWithMethods() + { + $coll = new RouteCollection(); + $coll->add('foo', new Route('/foo/', [], [], [], '', [], ['POST'])); + $coll->add('bar', new Route('/{foo}', [], [], [], '', [], ['GET'])); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST')); + $this->assertEquals(['_route' => 'foo'], $matcher->match('/foo/')); + + $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET')); + $this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/bar')); + $this->assertEquals(['foo' => 'foo', '_route' => 'bar'], $matcher->match('/foo')); + } + /** * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException */ @@ -757,6 +902,41 @@ public function testGreedyTrailingRequirement() $this->assertEquals(['_route' => 'a', 'a' => 'foo/'], $matcher->match('/foo/')); } + public function testTrailingRequirementWithDefault() + { + $coll = new RouteCollection(); + $coll->add('a', new Route('/fr-fr/{a}', ['a' => 'aaa'], ['a' => '.+'])); + $coll->add('b', new Route('/en-en/{b}', ['b' => 'bbb'], ['b' => '.*'])); + + $matcher = $this->getUrlMatcher($coll); + + $this->assertEquals(['_route' => 'a', 'a' => 'aaa'], $matcher->match('/fr-fr')); + $this->assertEquals(['_route' => 'a', 'a' => 'AAA'], $matcher->match('/fr-fr/AAA')); + $this->assertEquals(['_route' => 'b', 'b' => 'bbb'], $matcher->match('/en-en')); + $this->assertEquals(['_route' => 'b', 'b' => 'BBB'], $matcher->match('/en-en/BBB')); + } + + public function testTrailingRequirementWithDefault_A() + { + $coll = new RouteCollection(); + $coll->add('a', new Route('/fr-fr/{a}', ['a' => 'aaa'], ['a' => '.+'])); + + $matcher = $this->getUrlMatcher($coll); + + $this->expectException(ResourceNotFoundException::class); + $matcher->match('/fr-fr/'); + } + + public function testTrailingRequirementWithDefault_B() + { + $coll = new RouteCollection(); + $coll->add('b', new Route('/en-en/{b}', ['b' => 'bbb'], ['b' => '.*'])); + + $matcher = $this->getUrlMatcher($coll); + + $this->assertEquals(['_route' => 'b', 'b' => ''], $matcher->match('/en-en/')); + } + protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null) { return new UrlMatcher($routes, $context ?: new RequestContext()); diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.eu.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.eu.xlf new file mode 100644 index 0000000000000..66fd63fa55cc4 --- /dev/null +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.eu.xlf @@ -0,0 +1,67 @@ + + + + + + An authentication exception occurred. + Autentifikazio-errorea gertatu da. + + + Authentication credentials could not be found. + Ez dira aurkitu autentifikazio-kredentzialak. + + + Authentication request could not be processed due to a system problem. + Ezin izan da autentifikazio-eskaera prozesatu, sistema-arazo bat gertatu da eta. + + + Invalid credentials. + Kredentzialak okerrak dira. + + + Cookie has already been used by someone else. + Dagoeneko beste pertsona batek erabili du cookiea. + + + Not privileged to request the resource. + Ez duzu baliabidea eskatzeko aukerarik. + + + Invalid CSRF token. + CSRF tokena okerra da. + + + No authentication provider found to support the authentication token. + Ez da aurkitu autentifikazio-tokena eutsi dezakeen autentifikazio-hornitzailerik. + + + No session available, it either timed out or cookies are not enabled. + Ez dago saiorik erabilgarri, iraungi egin da edo cookieak ez daude gaituta. + + + No token could be found. + Ez da tokenik aurkitu. + + + Username could not be found. + Ez da erabiltzaile-izena aurkitu. + + + Account has expired. + Kontua iraungi da. + + + Credentials have expired. + Kredentzialak iraungi dira. + + + Account is disabled. + Kontua desgaituta dago. + + + Account is locked. + Kontua blokeatuta dago. + + + + diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.nn.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.nn.xlf index c48ce46505738..27b55e5675cac 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.nn.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.nn.xlf @@ -30,10 +30,6 @@ Invalid CSRF token. Ugyldig CSRF-teikn. - - Digest nonce has expired. - Digest nonce er ikkje lenger gyldig. - No authentication provider found to support the authentication token. Fann ingen innloggingstilbydar som støttar dette innloggingsteiknet. diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.tl.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.tl.xlf index c74b10aea83ab..d80cf88de1c8a 100644 --- a/src/Symfony/Component/Security/Core/Resources/translations/security.tl.xlf +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.tl.xlf @@ -29,10 +29,6 @@ Invalid CSRF token. Hindi balidong mga token ng CSRF. - - - Digest nonce has expired. - Na-expire na ang Digest nonce. No authentication provider found to support the authentication token. diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php index 79e18b7fc3e70..cae8593c15954 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php @@ -110,6 +110,10 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory } } } + + if (isset($this->defaultContext[self::CIRCULAR_REFERENCE_HANDLER]) && !\is_callable($this->defaultContext[self::CIRCULAR_REFERENCE_HANDLER])) { + throw new InvalidArgumentException(sprintf('Invalid callback found in the "%s" default context option.', self::CIRCULAR_REFERENCE_HANDLER)); + } } /** diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json index 52961bb7c0528..d03681bfc44ea 100644 --- a/src/Symfony/Component/Serializer/composer.json +++ b/src/Symfony/Component/Serializer/composer.json @@ -25,7 +25,7 @@ "symfony/property-access": "~3.4|~4.0", "symfony/http-foundation": "~3.4|~4.0", "symfony/cache": "~3.4|~4.0", - "symfony/property-info": "~3.4|~4.0", + "symfony/property-info": "^3.4.13|~4.0", "symfony/validator": "~3.4|~4.0", "doctrine/annotations": "~1.0", "symfony/dependency-injection": "~3.4|~4.0", diff --git a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php index 5f6aecd50a2a9..55ebfa1623132 100644 --- a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php +++ b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php @@ -224,7 +224,10 @@ protected function parseTokens($tokens, MessageCatalogue $catalog) } elseif (self::METHOD_ARGUMENTS_TOKEN === $item) { $this->skipMethodArgument($tokenIterator); } elseif (self::DOMAIN_TOKEN === $item) { - $domain = $this->getValue($tokenIterator); + $domainToken = $this->getValue($tokenIterator); + if ('' !== $domainToken) { + $domain = $domainToken; + } break; } else { diff --git a/src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php b/src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php index 73ccb07cfb07e..7cde108080cd1 100644 --- a/src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php +++ b/src/Symfony/Component/Translation/Tests/Extractor/PhpExtractorTest.php @@ -52,6 +52,7 @@ public function testExtraction($resource) $expectedNowdoc => 'prefix'.$expectedNowdoc, '{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples' => 'prefix{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples', 'concatenated message with heredoc and nowdoc' => 'prefixconcatenated message with heredoc and nowdoc', + 'default domain' => 'prefixdefault domain', ], 'not_messages' => [ 'other-domain-test-no-params-short-array' => 'prefixother-domain-test-no-params-short-array', diff --git a/src/Symfony/Component/Translation/Tests/fixtures/extractor/translation.html.php b/src/Symfony/Component/Translation/Tests/fixtures/extractor/translation.html.php index 55520203c6cb1..5085eab439cdb 100644 --- a/src/Symfony/Component/Translation/Tests/fixtures/extractor/translation.html.php +++ b/src/Symfony/Component/Translation/Tests/fixtures/extractor/translation.html.php @@ -55,3 +55,5 @@ trans('typecast', ['a' => (int) '123'], 'not_messages'); ?> transChoice('msg1', 10 + 1, [], 'not_messages'); ?> transChoice('msg2', ceil(4.5), [], 'not_messages'); ?> + +trans('default domain', [], null); ?> diff --git a/src/Symfony/Component/Translation/Util/ArrayConverter.php b/src/Symfony/Component/Translation/Util/ArrayConverter.php index 0276294f62d63..22c602e7197e2 100644 --- a/src/Symfony/Component/Translation/Util/ArrayConverter.php +++ b/src/Symfony/Component/Translation/Util/ArrayConverter.php @@ -27,7 +27,7 @@ class ArrayConverter { /** * Converts linear messages array to tree-like array. - * For example this rray('foo.bar' => 'value') will be converted to ['foo' => ['bar' => 'value']]. + * For example this array('foo.bar' => 'value') will be converted to ['foo' => ['bar' => 'value']]. * * @param array $messages Linear messages array * diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf index 69ab34e8b29ce..f248f1cf3f20b 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf @@ -330,6 +330,38 @@ This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}. Este Código de Identificación Bancaria (BIC) no está asociado con el IBAN {{ iban }}. + + This value should be valid JSON. + Este valor debería ser un JSON válido. + + + This collection should contain only unique elements. + Esta colección debería tener exclusivamente elementos únicos. + + + This value should be positive. + Este valor debería ser positivo. + + + This value should be either positive or zero. + Este valor debería ser positivo o igual a cero. + + + This value should be negative. + Este valor debería ser negativo. + + + This value should be either negative or zero. + Este valor debería ser negativo o igual a cero. + + + This value is not a valid timezone. + Este valor no es una zona horaria válida. + + + This password has been leaked in a data breach, it must not be used. Please use another password. + Esta contraseña no se puede utilizar porque está incluida en un listado de contraseñas públicas obtenido gracias a fallos de seguridad de otros sitios y aplicaciones. Por favor utilice otra contraseña. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf index ab033a11c3b01..60f02435f5f27 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf @@ -20,7 +20,7 @@ The value you selected is not a valid choice. - Ova vrijednost treba biti jedna od ponuđenih. + Ova vrijednost nije valjan izbor. You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices. @@ -36,7 +36,7 @@ This field was not expected. - Ovo polje nije očekivalo. + Ovo polje nije očekivano. This field is missing. @@ -48,7 +48,7 @@ This value is not a valid datetime. - Ova vrijednost nije ispravan datum-vrijeme. + Ova vrijednost nije ispravnog datum-vrijeme formata. This value is not a valid email address. @@ -88,11 +88,11 @@ This value should not be blank. - Ova vrijednost ne smije biti prazna. + Ova vrijednost ne bi trebala biti prazna. This value should not be null. - Ova vrijednost ne smije biti null. + Ova vrijednost ne bi trebala biti null. This value should be null. @@ -148,7 +148,7 @@ This value is not a valid country. - Ova vrijednost nije ispravna zemlja. + Ova vrijednost nije ispravna država. This value is already used. @@ -192,7 +192,7 @@ No temporary folder was configured in php.ini. - U php.ini datoteci nije konfiguriran privremeni folder. + U php.ini datoteci nije konfiguriran privremeni direktorij. Cannot write temporary file to disk. @@ -220,7 +220,7 @@ Unsupported card type or invalid card number. - Neispravan broj kartice ili tip kartice nije podržan. + Tip kartice nije podržan ili je broj kartice neispravan. This is not a valid International Bank Account Number (IBAN). @@ -248,35 +248,35 @@ This value should be equal to {{ compared_value }}. - Ova vrijednost bi trebala biti jednaka {{ compared_value }}. + Ova vrijednost treba biti jednaka {{ compared_value }}. This value should be greater than {{ compared_value }}. - Ova vrijednost bi trebala biti veća od {{ compared_value }}. + Ova vrijednost treba biti veća od {{ compared_value }}. This value should be greater than or equal to {{ compared_value }}. - Ova vrijednost bi trebala biti veća ili jednaka od {{ compared_value }}. + Ova vrijednost treba biti veća od ili jednaka {{ compared_value }}. This value should be identical to {{ compared_value_type }} {{ compared_value }}. - Ova vrijednost bi trebala biti {{ compared_value_type }} {{ compared_value }}. + Ova vrijednost treba biti {{ compared_value_type }} {{ compared_value }}. This value should be less than {{ compared_value }}. - Ova vrijednost bi trebala biti manja od {{ compared_value }}. + Ova vrijednost treba biti manja od {{ compared_value }}. This value should be less than or equal to {{ compared_value }}. - Ova vrijednost bi trebala biti manja ili jednaka {{ compared_value }}. + Ova vrijednost treba biti manja od ili jednaka {{ compared_value }}. This value should not be equal to {{ compared_value }}. - Ova vrijednost ne bi trebala biti {{ compared_value }}. + Ova vrijednost treba biti različita od {{ compared_value }}. This value should not be identical to {{ compared_value_type }} {{ compared_value }}. - Ova vrijednost ne bi trebala biti {{ compared_value_type }} {{ compared_value }}. + Ova vrijednost treba biti različita od {{ compared_value_type }} {{ compared_value }}. The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}. @@ -304,11 +304,11 @@ The host could not be resolved. - Poslužitelj nije mogao biti razriješen. + Poslužitelj ne može biti pronađen. This value does not match the expected {{ charset }} charset. - Znakovne oznake vrijednosti ne odgovaraju očekivanom {{ charset }} skupu. + Ova vrijednost ne odgovara očekivanom {{ charset }} znakovnom skupu. This is not a valid Business Identifier Code (BIC). diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf index 207d4ba7ae218..5a391a2e6626e 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf @@ -330,6 +330,38 @@ This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}. このSWIFTコードはIBANコード（{{ iban }}）に関連付けられていません。 + + This value should be valid JSON. + JSONでなければなりません。 + + + This collection should contain only unique elements. + 要素は重複してはなりません。 + + + This value should be positive. + 正の数でなければなりません。 + + + This value should be either positive or zero. + 正の数、または0でなければなりません。 + + + This value should be negative. + 負の数でなければなりません。 + + + This value should be either negative or zero. + 負の数、または0でなければなりません。 + + + This value is not a valid timezone. + 有効なタイムゾーンではありません。 + + + This password has been leaked in a data breach, it must not be used. Please use another password. + このパスワードは漏洩している為使用できません。 + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf index 52815e8e721f3..478ca19753a64 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf @@ -330,6 +330,38 @@ This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}. Deze bedrijfsidentificatiecode (BIC) is niet gekoppeld aan IBAN {{ iban }}. + + This value should be valid JSON. + Deze waarde moet geldige JSON zijn. + + + This collection should contain only unique elements. + Deze collectie moet alleen unieke elementen bevatten. + + + This value should be positive. + Deze waarde moet positief zijn. + + + This value should be either positive or zero. + Deze waarde moet positief of gelijk aan nul zijn. + + + This value should be negative. + Deze waarde moet negatief zijn. + + + This value should be either negative or zero. + Deze waarde moet negatief of gelijk aan nul zijn. + + + This value is not a valid timezone. + Deze waarde is geen geldige tijdzone. + + + This password has been leaked in a data breach, it must not be used. Please use another password. + Dit wachtwoord is gelekt vanwege een data-inbreuk, het moet niet worden gebruikt. Kies een ander wachtwoord. + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf index d5b57031b9f69..63ce95ab1bee5 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf @@ -152,7 +152,7 @@ This value is already used. - Tค่านี้ถูกใช้งานไปแล้ว + ค่านี้ถูกใช้งานไปแล้ว The size of the image could not be detected. diff --git a/src/Symfony/Component/Validator/Util/LegacyTranslatorProxy.php b/src/Symfony/Component/Validator/Util/LegacyTranslatorProxy.php index 51218e7c5777a..d9deeaa5fd582 100644 --- a/src/Symfony/Component/Validator/Util/LegacyTranslatorProxy.php +++ b/src/Symfony/Component/Validator/Util/LegacyTranslatorProxy.php @@ -22,15 +22,26 @@ class LegacyTranslatorProxy implements LegacyTranslatorInterface, TranslatorInte { private $translator; - public function __construct(TranslatorInterface $translator) + /** + * @param LegacyTranslatorInterface|TranslatorInterface $translator + */ + public function __construct($translator) { - if (!$translator instanceof LocaleAwareInterface) { + if ($translator instanceof LegacyTranslatorInterface) { + // no-op + } elseif (!$translator instanceof TranslatorInterface) { + throw new \InvalidArgumentException(sprintf('The translator passed to "%s()" must implement "%s" or "%s".', __METHOD__, TranslatorInterface::class, LegacyTranslatorInterface::class)); + } elseif (!$translator instanceof LocaleAwareInterface) { throw new \InvalidArgumentException(sprintf('The translator passed to "%s()" must implement "%s".', __METHOD__, LocaleAwareInterface::class)); } + $this->translator = $translator; } - public function getTranslator(): TranslatorInterface + /** + * @return LegacyTranslatorInterface|TranslatorInterface + */ + public function getTranslator() { return $this->translator; } diff --git a/src/Symfony/Component/VarDumper/README.md b/src/Symfony/Component/VarDumper/README.md index 3b5d55f5f5bfd..339f73eba3052 100644 --- a/src/Symfony/Component/VarDumper/README.md +++ b/src/Symfony/Component/VarDumper/README.md @@ -2,8 +2,8 @@ VarDumper Component =================== The VarDumper component provides mechanisms for walking through any arbitrary -PHP variable. Built on top, it provides a better `dump()` function that you -can use instead of `var_dump`. +PHP variable. It provides a better `dump()` function that you can use instead +of `var_dump`. Resources --------- diff --git a/src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php b/src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php index 918c0c8335619..5a1654ae5503e 100644 --- a/src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php +++ b/src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php @@ -120,8 +120,8 @@ protected function addTransitions(array $transitions) { $code = ''; - foreach ($transitions as $place) { - $code .= sprintf(" transition_%s [label=\"%s\", shape=box%s];\n", $this->dotize($place['name']), $this->escape($place['name']), $this->addAttributes($place['attributes'])); + foreach ($transitions as $i => $place) { + $code .= sprintf(" transition_%s [label=\"%s\", shape=box%s];\n", $this->dotize($i), $this->escape($place['name']), $this->addAttributes($place['attributes'])); } return $code; @@ -134,12 +134,13 @@ protected function findEdges(Definition $definition) { $dotEdges = []; - foreach ($definition->getTransitions() as $transition) { + foreach ($definition->getTransitions() as $i => $transition) { foreach ($transition->getFroms() as $from) { $dotEdges[] = [ 'from' => $from, 'to' => $transition->getName(), 'direction' => 'from', + 'transition_number' => $i, ]; } foreach ($transition->getTos() as $to) { @@ -147,6 +148,7 @@ protected function findEdges(Definition $definition) 'from' => $transition->getName(), 'to' => $to, 'direction' => 'to', + 'transition_number' => $i, ]; } } @@ -162,12 +164,17 @@ protected function addEdges(array $edges) $code = ''; foreach ($edges as $edge) { - $code .= sprintf(" %s_%s -> %s_%s [style=\"solid\"];\n", - 'from' === $edge['direction'] ? 'place' : 'transition', - $this->dotize($edge['from']), - 'from' === $edge['direction'] ? 'transition' : 'place', - $this->dotize($edge['to']) - ); + if ('from' === $edge['direction']) { + $code .= sprintf(" place_%s -> transition_%s [style=\"solid\"];\n", + $this->dotize($edge['from']), + $this->dotize($edge['transition_number']) + ); + } else { + $code .= sprintf(" transition_%s -> place_%s [style=\"solid\"];\n", + $this->dotize($edge['transition_number']), + $this->dotize($edge['to']) + ); + } } return $code; diff --git a/src/Symfony/Component/Workflow/Tests/Dumper/GraphvizDumperTest.php b/src/Symfony/Component/Workflow/Tests/Dumper/GraphvizDumperTest.php index 0d14404d2e351..adf9f0ab842df 100644 --- a/src/Symfony/Component/Workflow/Tests/Dumper/GraphvizDumperTest.php +++ b/src/Symfony/Component/Workflow/Tests/Dumper/GraphvizDumperTest.php @@ -73,26 +73,26 @@ public function createComplexWorkflowDefinitionDumpWithMarking() place_58e6b3a414a1e090dfc6029add0f3555ccba127f [label="e", shape=circle]; place_4a0a19218e082a343a1b17e5333409af9d98f0f5 [label="f", shape=circle]; place_54fd1711209fb1c0781092374132c66e79e2241b [label="g", shape=circle]; - transition_e5353879bd69bfddcb465dad176ff52db8319d6f [label="t1", shape=box, shape="box", regular="1"]; - transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [label="t2", shape=box, shape="box", regular="1"]; - transition_4358694eeb098c6708ae914a10562ce722bbbc34 [label="t3", shape=box, shape="box", regular="1"]; - transition_a9dfb15be45a5f3128784c80c733f2cdee2f756a [label="t4", shape=box, shape="box", regular="1"]; - transition_bf55e75fa263cbbc2529db49da43cb7f1d370b88 [label="t5", shape=box, shape="box", regular="1"]; - transition_e92a96c0e3a20d87ace74ab7871931a8f9f25943 [label="t6", shape=box, shape="box", regular="1"]; - place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_e5353879bd69bfddcb465dad176ff52db8319d6f [style="solid"]; - transition_e5353879bd69bfddcb465dad176ff52db8319d6f -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"]; - transition_e5353879bd69bfddcb465dad176ff52db8319d6f -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"]; - place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [style="solid"]; - place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 -> transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [style="solid"]; - transition_2a5bd02710e975a7fbb92da876655950fbd5e70d -> place_3c363836cf4e16666669a25da280a1865c2d2874 [style="solid"]; - place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_4358694eeb098c6708ae914a10562ce722bbbc34 [style="solid"]; - transition_4358694eeb098c6708ae914a10562ce722bbbc34 -> place_58e6b3a414a1e090dfc6029add0f3555ccba127f [style="solid"]; - place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_a9dfb15be45a5f3128784c80c733f2cdee2f756a [style="solid"]; - transition_a9dfb15be45a5f3128784c80c733f2cdee2f756a -> place_4a0a19218e082a343a1b17e5333409af9d98f0f5 [style="solid"]; - place_58e6b3a414a1e090dfc6029add0f3555ccba127f -> transition_bf55e75fa263cbbc2529db49da43cb7f1d370b88 [style="solid"]; - transition_bf55e75fa263cbbc2529db49da43cb7f1d370b88 -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"]; - place_4a0a19218e082a343a1b17e5333409af9d98f0f5 -> transition_e92a96c0e3a20d87ace74ab7871931a8f9f25943 [style="solid"]; - transition_e92a96c0e3a20d87ace74ab7871931a8f9f25943 -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"]; + transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [label="t1", shape=box, shape="box", regular="1"]; + transition_356a192b7913b04c54574d18c28d46e6395428ab [label="t2", shape=box, shape="box", regular="1"]; + transition_da4b9237bacccdf19c0760cab7aec4a8359010b0 [label="t3", shape=box, shape="box", regular="1"]; + transition_77de68daecd823babbb58edb1c8e14d7106e83bb [label="t4", shape=box, shape="box", regular="1"]; + transition_1b6453892473a467d07372d45eb05abc2031647a [label="t5", shape=box, shape="box", regular="1"]; + transition_ac3478d69a3c81fa62e60f5c3696165a4e5e6ac4 [label="t6", shape=box, shape="box", regular="1"]; + place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [style="solid"]; + transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"]; + transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"]; + place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_356a192b7913b04c54574d18c28d46e6395428ab [style="solid"]; + place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 -> transition_356a192b7913b04c54574d18c28d46e6395428ab [style="solid"]; + transition_356a192b7913b04c54574d18c28d46e6395428ab -> place_3c363836cf4e16666669a25da280a1865c2d2874 [style="solid"]; + place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_da4b9237bacccdf19c0760cab7aec4a8359010b0 [style="solid"]; + transition_da4b9237bacccdf19c0760cab7aec4a8359010b0 -> place_58e6b3a414a1e090dfc6029add0f3555ccba127f [style="solid"]; + place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_77de68daecd823babbb58edb1c8e14d7106e83bb [style="solid"]; + transition_77de68daecd823babbb58edb1c8e14d7106e83bb -> place_4a0a19218e082a343a1b17e5333409af9d98f0f5 [style="solid"]; + place_58e6b3a414a1e090dfc6029add0f3555ccba127f -> transition_1b6453892473a467d07372d45eb05abc2031647a [style="solid"]; + transition_1b6453892473a467d07372d45eb05abc2031647a -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"]; + place_4a0a19218e082a343a1b17e5333409af9d98f0f5 -> transition_ac3478d69a3c81fa62e60f5c3696165a4e5e6ac4 [style="solid"]; + transition_ac3478d69a3c81fa62e60f5c3696165a4e5e6ac4 -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"]; } '; } @@ -107,12 +107,12 @@ public function createSimpleWorkflowDumpWithMarking() place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 [label="a", shape=circle, style="filled"]; place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [label="b", shape=circle]; place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [label="c", shape=circle, color="#FF0000", shape="doublecircle"]; - transition_e5353879bd69bfddcb465dad176ff52db8319d6f [label="t1", shape=box, shape="box", regular="1"]; - transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [label="t2", shape=box, shape="box", regular="1"]; - place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_e5353879bd69bfddcb465dad176ff52db8319d6f [style="solid"]; - transition_e5353879bd69bfddcb465dad176ff52db8319d6f -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"]; - place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [style="solid"]; - transition_2a5bd02710e975a7fbb92da876655950fbd5e70d -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"]; + transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [label="t1", shape=box, shape="box", regular="1"]; + transition_356a192b7913b04c54574d18c28d46e6395428ab [label="t2", shape=box, shape="box", regular="1"]; + place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [style="solid"]; + transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"]; + place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_356a192b7913b04c54574d18c28d46e6395428ab [style="solid"]; + transition_356a192b7913b04c54574d18c28d46e6395428ab -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"]; } '; } @@ -131,26 +131,26 @@ public function provideComplexWorkflowDumpWithoutMarking() place_58e6b3a414a1e090dfc6029add0f3555ccba127f [label="e", shape=circle]; place_4a0a19218e082a343a1b17e5333409af9d98f0f5 [label="f", shape=circle]; place_54fd1711209fb1c0781092374132c66e79e2241b [label="g", shape=circle]; - transition_e5353879bd69bfddcb465dad176ff52db8319d6f [label="t1", shape=box, shape="box", regular="1"]; - transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [label="t2", shape=box, shape="box", regular="1"]; - transition_4358694eeb098c6708ae914a10562ce722bbbc34 [label="t3", shape=box, shape="box", regular="1"]; - transition_a9dfb15be45a5f3128784c80c733f2cdee2f756a [label="t4", shape=box, shape="box", regular="1"]; - transition_bf55e75fa263cbbc2529db49da43cb7f1d370b88 [label="t5", shape=box, shape="box", regular="1"]; - transition_e92a96c0e3a20d87ace74ab7871931a8f9f25943 [label="t6", shape=box, shape="box", regular="1"]; - place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_e5353879bd69bfddcb465dad176ff52db8319d6f [style="solid"]; - transition_e5353879bd69bfddcb465dad176ff52db8319d6f -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"]; - transition_e5353879bd69bfddcb465dad176ff52db8319d6f -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"]; - place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [style="solid"]; - place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 -> transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [style="solid"]; - transition_2a5bd02710e975a7fbb92da876655950fbd5e70d -> place_3c363836cf4e16666669a25da280a1865c2d2874 [style="solid"]; - place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_4358694eeb098c6708ae914a10562ce722bbbc34 [style="solid"]; - transition_4358694eeb098c6708ae914a10562ce722bbbc34 -> place_58e6b3a414a1e090dfc6029add0f3555ccba127f [style="solid"]; - place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_a9dfb15be45a5f3128784c80c733f2cdee2f756a [style="solid"]; - transition_a9dfb15be45a5f3128784c80c733f2cdee2f756a -> place_4a0a19218e082a343a1b17e5333409af9d98f0f5 [style="solid"]; - place_58e6b3a414a1e090dfc6029add0f3555ccba127f -> transition_bf55e75fa263cbbc2529db49da43cb7f1d370b88 [style="solid"]; - transition_bf55e75fa263cbbc2529db49da43cb7f1d370b88 -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"]; - place_4a0a19218e082a343a1b17e5333409af9d98f0f5 -> transition_e92a96c0e3a20d87ace74ab7871931a8f9f25943 [style="solid"]; - transition_e92a96c0e3a20d87ace74ab7871931a8f9f25943 -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"]; + transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [label="t1", shape=box, shape="box", regular="1"]; + transition_356a192b7913b04c54574d18c28d46e6395428ab [label="t2", shape=box, shape="box", regular="1"]; + transition_da4b9237bacccdf19c0760cab7aec4a8359010b0 [label="t3", shape=box, shape="box", regular="1"]; + transition_77de68daecd823babbb58edb1c8e14d7106e83bb [label="t4", shape=box, shape="box", regular="1"]; + transition_1b6453892473a467d07372d45eb05abc2031647a [label="t5", shape=box, shape="box", regular="1"]; + transition_ac3478d69a3c81fa62e60f5c3696165a4e5e6ac4 [label="t6", shape=box, shape="box", regular="1"]; + place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [style="solid"]; + transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"]; + transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"]; + place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_356a192b7913b04c54574d18c28d46e6395428ab [style="solid"]; + place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 -> transition_356a192b7913b04c54574d18c28d46e6395428ab [style="solid"]; + transition_356a192b7913b04c54574d18c28d46e6395428ab -> place_3c363836cf4e16666669a25da280a1865c2d2874 [style="solid"]; + place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_da4b9237bacccdf19c0760cab7aec4a8359010b0 [style="solid"]; + transition_da4b9237bacccdf19c0760cab7aec4a8359010b0 -> place_58e6b3a414a1e090dfc6029add0f3555ccba127f [style="solid"]; + place_3c363836cf4e16666669a25da280a1865c2d2874 -> transition_77de68daecd823babbb58edb1c8e14d7106e83bb [style="solid"]; + transition_77de68daecd823babbb58edb1c8e14d7106e83bb -> place_4a0a19218e082a343a1b17e5333409af9d98f0f5 [style="solid"]; + place_58e6b3a414a1e090dfc6029add0f3555ccba127f -> transition_1b6453892473a467d07372d45eb05abc2031647a [style="solid"]; + transition_1b6453892473a467d07372d45eb05abc2031647a -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"]; + place_4a0a19218e082a343a1b17e5333409af9d98f0f5 -> transition_ac3478d69a3c81fa62e60f5c3696165a4e5e6ac4 [style="solid"]; + transition_ac3478d69a3c81fa62e60f5c3696165a4e5e6ac4 -> place_54fd1711209fb1c0781092374132c66e79e2241b [style="solid"]; } '; } @@ -165,12 +165,12 @@ public function provideSimpleWorkflowDumpWithoutMarking() place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 [label="a", shape=circle, style="filled"]; place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [label="b", shape=circle]; place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [label="c", shape=circle]; - transition_e5353879bd69bfddcb465dad176ff52db8319d6f [label="t1", shape=box, shape="box", regular="1"]; - transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [label="t2", shape=box, shape="box", regular="1"]; - place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_e5353879bd69bfddcb465dad176ff52db8319d6f [style="solid"]; - transition_e5353879bd69bfddcb465dad176ff52db8319d6f -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"]; - place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_2a5bd02710e975a7fbb92da876655950fbd5e70d [style="solid"]; - transition_2a5bd02710e975a7fbb92da876655950fbd5e70d -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"]; + transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [label="t1", shape=box, shape="box", regular="1"]; + transition_356a192b7913b04c54574d18c28d46e6395428ab [label="t2", shape=box, shape="box", regular="1"]; + place_86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 -> transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c [style="solid"]; + transition_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c -> place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 [style="solid"]; + place_e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98 -> transition_356a192b7913b04c54574d18c28d46e6395428ab [style="solid"]; + transition_356a192b7913b04c54574d18c28d46e6395428ab -> place_84a516841ba77a5b4648de2cd0dfcb30ea46dbb4 [style="solid"]; } '; }