diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #40552 [Translation] Fix update existing key with existing +int-icu domain (Alexis)

Browse Source 
This PR was merged into the 4.4 branch.

Discussion
----------

[Translation] Fix update existing key with existing +int-icu domain

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       |  none
| License       | MIT
| Doc PR        | none

Using php-translation webui interface, I was trying to update an existing +int-icu domain but a regular domain was created and the existing key wasn't updated. Looks like in the method I modified, we should have been looking for a potential domain+intl-icu domain and try update it first

Commits
-------

2a196ca0dc [translation] Fix update existing key with existing +int-icu domain
This commit is contained in:
Nicolas Grekas 2021-03-23 17:25:13 +01:00
commit 1665555dd5
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Translation/MessageCatalogue.php
View File

@ -167,7 +167,7 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
}
$intlDomain = $domain;
$suffixLength = \strlen(self::INTL_DOMAIN_SUFFIX);
if (\strlen($domain) > $suffixLength && false !== strpos($domain, self::INTL_DOMAIN_SUFFIX, -$suffixLength)) {
if (\strlen($domain) < $suffixLength || false === strpos($domain, self::INTL_DOMAIN_SUFFIX, -$suffixLength)) {
$intlDomain .= self::INTL_DOMAIN_SUFFIX;
}
foreach ($messages as $id => $message) {

12
src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
View File

@ -69,7 +69,7 @@ class MessageCatalogueTest extends TestCase
$this->assertEquals($messages, $catalogue->all());
}
public function testAllIntICU()
public function testAllIntlIcu()
{
$messages = [
'domain1+intl-icu' => ['foo' => 'bar'],
@ -129,6 +129,16 @@ class MessageCatalogueTest extends TestCase
$this->assertEquals('bar', $catalogue->get('foo', 'domain88'));
}
public function testAddIntlIcu()
{
$catalogue = new MessageCatalogue('en', ['domain1+intl-icu' => ['foo' => 'foo']]);
$catalogue->add(['foo1' => 'foo1'], 'domain1');
$catalogue->add(['foo' => 'bar'], 'domain1');
$this->assertSame('bar', $catalogue->get('foo', 'domain1'));
$this->assertSame('foo1', $catalogue->get('foo1', 'domain1'));
}
public function testReplace()
{
$catalogue = new MessageCatalogue('en', ['domain1' => ['foo' => 'foo'], 'domain1+intl-icu' => ['bar' => 'bar']]);