Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable24] Bump symfony/translation to 4.4.41 #1042

Merged
merged 1 commit into from
May 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,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": {
Expand Down
16 changes: 8 additions & 8 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -5835,17 +5835,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": {
Expand Down Expand Up @@ -5879,7 +5879,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": {
Expand Down Expand Up @@ -5907,7 +5907,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": [
{
Expand Down Expand Up @@ -6372,6 +6372,6 @@
"install-path": "../web-auth/webauthn-lib"
}
],
"dev": false,
"dev": true,
"dev-package-names": []
}
12 changes: 6 additions & 6 deletions composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
'reference' => '94cc96de7a8f34b4da8e165ec7308a0024a1d9d6',
'reference' => '6d82f0c103262a2f7c26514b5debe55557cfe7b6',
'name' => 'nextcloud/3rdparty',
'dev' => false,
'dev' => true,
),
'versions' => array(
'aws/aws-sdk-php' => array(
Expand Down Expand Up @@ -286,7 +286,7 @@
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
'reference' => '94cc96de7a8f34b4da8e165ec7308a0024a1d9d6',
'reference' => '6d82f0c103262a2f7c26514b5debe55557cfe7b6',
'dev_requirement' => false,
),
'nextcloud/lognormalizer' => array(
Expand Down Expand Up @@ -821,12 +821,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(
Expand Down
2 changes: 1 addition & 1 deletion symfony/translation/Catalogue/TargetOperation.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected function processDomain($domain)
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);
Expand Down
2 changes: 1 addition & 1 deletion symfony/translation/LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions symfony/translation/Loader/MoFileLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 5 additions & 2 deletions symfony/translation/Resources/data/parents.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down