diff options
author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2022-05-30 09:46:11 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-30 09:46:11 +0300 |
commit | 82f352b055efce690ffc533d68c08f77f734fafc (patch) | |
tree | f3db513294d94e49f157d95236d76f2e7cb24d44 | |
parent | 59f4851dc2729f449d4a9e6fb211bebe3818cb6f (diff) | |
parent | 41f9b56ea1475af2cc8c1d58023ca0342b177fb7 (diff) |
Merge pull request #1041 from nextcloud/bump/symfony/translation-master
Bump symfony/translation to 4.4.41
-rw-r--r-- | composer.json | 2 | ||||
-rw-r--r-- | composer.lock | 14 | ||||
-rw-r--r-- | composer/installed.json | 16 | ||||
-rw-r--r-- | composer/installed.php | 12 | ||||
-rw-r--r-- | symfony/translation/Catalogue/TargetOperation.php | 2 | ||||
-rw-r--r-- | symfony/translation/LICENSE | 2 | ||||
-rw-r--r-- | symfony/translation/Loader/MoFileLoader.php | 4 | ||||
-rw-r--r-- | symfony/translation/Resources/data/parents.json | 7 |
8 files changed, 31 insertions, 28 deletions
diff --git a/composer.json b/composer.json index 8523f4c7..06239c4d 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,7 @@ "symfony/polyfill-intl-normalizer": "^1.20", "symfony/process": "4.4.30", "symfony/routing": "4.4.30", - "symfony/translation": "4.4.30", + "symfony/translation": "^4.4.41", "web-auth/webauthn-lib": "^3.1" }, "extra": { diff --git a/composer.lock b/composer.lock index 6fb37639..2bc2ff84 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "04f51e4416e58eca78f2ce77b58fa332", + "content-hash": "b0f529d60a781dfe43ba422f58e294aa", "packages": [ { "name": "aws/aws-sdk-php", @@ -5651,16 +5651,16 @@ }, { "name": "symfony/translation", - "version": "v4.4.30", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "db0ba1e85280d8ff11e38d53c70f8814d4d740f5" + "reference": "dcb67eae126e74507e0b4f0b9ac6ef35b37c3331" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/db0ba1e85280d8ff11e38d53c70f8814d4d740f5", - "reference": "db0ba1e85280d8ff11e38d53c70f8814d4d740f5", + "url": "https://api.github.com/repos/symfony/translation/zipball/dcb67eae126e74507e0b4f0b9ac6ef35b37c3331", + "reference": "dcb67eae126e74507e0b4f0b9ac6ef35b37c3331", "shasum": "" }, "require": { @@ -5720,7 +5720,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v4.4.30" + "source": "https://github.com/symfony/translation/tree/v4.4.41" }, "funding": [ { @@ -5736,7 +5736,7 @@ "type": "tidelift" } ], - "time": "2021-08-26T05:57:13+00:00" + "time": "2022-04-21T07:22:34+00:00" }, { "name": "symfony/translation-contracts", diff --git a/composer/installed.json b/composer/installed.json index 32f5e651..8678072d 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -5891,17 +5891,17 @@ }, { "name": "symfony/translation", - "version": "v4.4.30", - "version_normalized": "4.4.30.0", + "version": "v4.4.41", + "version_normalized": "4.4.41.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "db0ba1e85280d8ff11e38d53c70f8814d4d740f5" + "reference": "dcb67eae126e74507e0b4f0b9ac6ef35b37c3331" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/db0ba1e85280d8ff11e38d53c70f8814d4d740f5", - "reference": "db0ba1e85280d8ff11e38d53c70f8814d4d740f5", + "url": "https://api.github.com/repos/symfony/translation/zipball/dcb67eae126e74507e0b4f0b9ac6ef35b37c3331", + "reference": "dcb67eae126e74507e0b4f0b9ac6ef35b37c3331", "shasum": "" }, "require": { @@ -5935,7 +5935,7 @@ "symfony/config": "", "symfony/yaml": "" }, - "time": "2021-08-26T05:57:13+00:00", + "time": "2022-04-21T07:22:34+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -5963,7 +5963,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v4.4.30" + "source": "https://github.com/symfony/translation/tree/v4.4.41" }, "funding": [ { @@ -6428,6 +6428,6 @@ "install-path": "../web-auth/webauthn-lib" } ], - "dev": false, + "dev": true, "dev-package-names": [] } diff --git a/composer/installed.php b/composer/installed.php index d1a5b70c..fc14425a 100644 --- a/composer/installed.php +++ b/composer/installed.php @@ -5,9 +5,9 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), - 'reference' => '04b80d6c8d44a2a844d0b8f81a4ba745c48980f8', + 'reference' => '59f4851dc2729f449d4a9e6fb211bebe3818cb6f', 'name' => 'nextcloud/3rdparty', - 'dev' => false, + 'dev' => true, ), 'versions' => array( 'aws/aws-sdk-php' => array( @@ -295,7 +295,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), - 'reference' => '04b80d6c8d44a2a844d0b8f81a4ba745c48980f8', + 'reference' => '59f4851dc2729f449d4a9e6fb211bebe3818cb6f', 'dev_requirement' => false, ), 'nextcloud/lognormalizer' => array( @@ -830,12 +830,12 @@ 'dev_requirement' => false, ), 'symfony/translation' => array( - 'pretty_version' => 'v4.4.30', - 'version' => '4.4.30.0', + 'pretty_version' => 'v4.4.41', + 'version' => '4.4.41.0', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/translation', 'aliases' => array(), - 'reference' => 'db0ba1e85280d8ff11e38d53c70f8814d4d740f5', + 'reference' => 'dcb67eae126e74507e0b4f0b9ac6ef35b37c3331', 'dev_requirement' => false, ), 'symfony/translation-contracts' => array( diff --git a/symfony/translation/Catalogue/TargetOperation.php b/symfony/translation/Catalogue/TargetOperation.php index 8221d184..c8b06551 100644 --- a/symfony/translation/Catalogue/TargetOperation.php +++ b/symfony/translation/Catalogue/TargetOperation.php @@ -49,7 +49,7 @@ class TargetOperation extends AbstractOperation foreach ($this->source->all($domain) as $id => $message) { if ($this->target->has($id, $domain)) { $this->messages[$domain]['all'][$id] = $message; - $d = $this->target->defines($id, $intlDomain) ? $intlDomain : $domain; + $d = $this->source->defines($id, $intlDomain) ? $intlDomain : $domain; $this->result->add([$id => $message], $d); if (null !== $keyMetadata = $this->source->getMetadata($id, $d)) { $this->result->setMetadata($id, $keyMetadata, $d); diff --git a/symfony/translation/LICENSE b/symfony/translation/LICENSE index 9ff2d0d6..88bf75bb 100644 --- a/symfony/translation/LICENSE +++ b/symfony/translation/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2021 Fabien Potencier +Copyright (c) 2004-2022 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/symfony/translation/Loader/MoFileLoader.php b/symfony/translation/Loader/MoFileLoader.php index 8c5216f6..ce8611cd 100644 --- a/symfony/translation/Loader/MoFileLoader.php +++ b/symfony/translation/Loader/MoFileLoader.php @@ -22,13 +22,13 @@ class MoFileLoader extends FileLoader * Magic used for validating the format of an MO file as well as * detecting if the machine used to create that file was little endian. */ - public const MO_LITTLE_ENDIAN_MAGIC = 0x950412de; + public const MO_LITTLE_ENDIAN_MAGIC = 0x950412DE; /** * Magic used for validating the format of an MO file as well as * detecting if the machine used to create that file was big endian. */ - public const MO_BIG_ENDIAN_MAGIC = 0xde120495; + public const MO_BIG_ENDIAN_MAGIC = 0xDE120495; /** * The size of the header of an MO file in bytes. diff --git a/symfony/translation/Resources/data/parents.json b/symfony/translation/Resources/data/parents.json index d334b298..32a33cda 100644 --- a/symfony/translation/Resources/data/parents.json +++ b/symfony/translation/Resources/data/parents.json @@ -12,7 +12,6 @@ "en_BS": "en_001", "en_BW": "en_001", "en_BZ": "en_001", - "en_CA": "en_001", "en_CC": "en_001", "en_CH": "en_150", "en_CK": "en_001", @@ -55,6 +54,7 @@ "en_MS": "en_001", "en_MT": "en_001", "en_MU": "en_001", + "en_MV": "en_001", "en_MW": "en_001", "en_MY": "en_001", "en_NA": "en_001", @@ -65,7 +65,6 @@ "en_NU": "en_001", "en_NZ": "en_001", "en_PG": "en_001", - "en_PH": "en_001", "en_PK": "en_001", "en_PN": "en_001", "en_PW": "en_001", @@ -118,6 +117,10 @@ "es_UY": "es_419", "es_VE": "es_419", "ff_Adlm": "root", + "hi_Latn": "en_IN", + "ks_Deva": "root", + "nb": "no", + "nn": "no", "pa_Arab": "root", "pt_AO": "pt_PT", "pt_CH": "pt_PT", |