From b3e0a349c9780ed88d17500e46d16924b31d0062 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 17 Nov 2018 08:28:04 -0500 Subject: [PATCH] Fix overriding headers in extract-strings console --- src/classes/Controllers/Console/ExtractStrings.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/classes/Controllers/Console/ExtractStrings.php b/src/classes/Controllers/Console/ExtractStrings.php index 7a387d9..f62a39b 100644 --- a/src/classes/Controllers/Console/ExtractStrings.php +++ b/src/classes/Controllers/Console/ExtractStrings.php @@ -109,17 +109,17 @@ HELP; // $updatedPoString = str_replace(realpath(__DIR__ . '/../../../../') . DIRECTORY_SEPARATOR, '', $updatedPoString); // $this->out('Writing ' . realpath($updatedPoFile)); // file_put_contents($updatedPoFile, $updatedPoString); - + + $updatedTranslations->setLanguage($locale); + if ($this->getOption('force')) { $existingTranslations = $updatedTranslations; } else { $this->out('Merging with existing translations'); - $existingTranslations->mergeWith($updatedTranslations, Merge::ADD | Merge::REMOVE | Merge::REFERENCES_THEIRS); + $existingTranslations->mergeWith($updatedTranslations, Merge::ADD | Merge::REMOVE | Merge::REFERENCES_THEIRS | Merge::HEADERS_ADD); } - $existingTranslations->setLanguage($locale); - $poString = $existingTranslations->toPoString(); // Strip absolute path to files