8000 Revert #34797 "Fixed translations file dumper behavior" and fix #34713 by yceruto · Pull Request #35351 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Revert #34797 "Fixed translations file dumper behavior" and fix #34713 #35351

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jan 21, 2020
Merged

Revert #34797 "Fixed translations file dumper behavior" and fix #34713 #35351

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56e79fe
Revert "Fixed translations file dumper behavior"
yceruto Jan 15, 2020
9ca8720
Fixed #34713 Move new messages to intl domain when possible
yceruto Jan 20, 2020
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
Prev Previous commit
Fixed #34713 Move new messages to intl domain when possible
  • Loading branch information
@yceruto
yceruto committed Jan 20, 2020
commit 9ca872054b1c7391405a13c7ac85c521652f0d37
19 changes: 19 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
use Symfony\Component\Translation\Catalogue\TargetOperation;
use Symfony\Component\Translation\Extractor\ExtractorInterface;
use Symfony\Component\Translation\MessageCatalogue;
use Symfony\Component\Translation\MessageCatalogueInterface;
use Symfony\Component\Translation\Reader\TranslationReaderInterface;
use Symfony\Component\Translation\Writer\TranslationWriterInterface;

Expand Down Expand Up @@ -254,6 +255,24 @@ protected function execute(InputInterface $input, OutputInterface $output): int

$resultMessage = 'Translation files were successfully updated';

// move new messages to intl domain when possible
if (class_exists(\MessageFormatter::class)) {
foreach ($operation->getDomains() as $domain) {
$intlDomain = $domain.MessageCatalogueInterface::INTL_DOMAIN_SUFFIX;
$newMessages = $operation->getNewMessages($domain);

if ([] === $newMessages || ([] === $currentCatalogue->all($intlDomain) && [] !== $currentCatalogue->all($domain))) {
continue;
}

$result = $operation->getResult();
$allIntlMessages = $result->all($intlDomain);
$currentMessages = array_diff_key($newMessages, $result->all($domain));
$result->replace($currentMessages, $domain);
$result->replace($allIntlMessages + $newMessages, $intlDomain);
}
}

// show compiled list of messages
if (true === $input->getOption('dump-messages')) {
$extractedMessagesCount = 0;
Expand Down
0