From 8f7aba7bb6c26fec42b39b93919438b94a97bc97 Mon Sep 17 00:00:00 2001 From: George van Engers Date: Thu, 4 Jan 2024 03:15:05 +0100 Subject: [PATCH] Release 1.2.6 - update source maps and Translations --- composer.lock | 10 ++-- src/Translate/TranslationManager.php | 4 +- tests/Command/CanExtractTranslatablesTest.php | 2 +- tests/Command/CanProductXliffFilesTest.php | 2 +- tests/Command/CanTranslateTest.php | 2 +- tests/IsoFilter/TranslateIsoToLocaleTest.php | 2 +- tests/Mocks/Deepl/DeeplTranslatorMock.php | 58 +++++++++++++++++++ tests/Mocks/Deepl/sourceLanguages.json | 1 + tests/Mocks/Deepl/targetLanguages.json | 1 + tests/Mocks/DeeplTranslatorMock.php | 40 ------------- 10 files changed, 71 insertions(+), 51 deletions(-) create mode 100644 tests/Mocks/Deepl/DeeplTranslatorMock.php create mode 100644 tests/Mocks/Deepl/sourceLanguages.json create mode 100644 tests/Mocks/Deepl/targetLanguages.json delete mode 100644 tests/Mocks/DeeplTranslatorMock.php diff --git a/composer.lock b/composer.lock index 2afe384..1e98cd5 100644 --- a/composer.lock +++ b/composer.lock @@ -5037,12 +5037,12 @@ "source": { "type": "git", "url": "https://github.com/vanengers/symfony-console-command-lib.git", - "reference": "82d8449f42185047d3d958fcd187c8e7178b8920" + "reference": "5d2950da4d8af95f1ba4d6a3104b37de5ae971d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vanengers/symfony-console-command-lib/zipball/82d8449f42185047d3d958fcd187c8e7178b8920", - "reference": "82d8449f42185047d3d958fcd187c8e7178b8920", + "url": "https://api.github.com/repos/vanengers/symfony-console-command-lib/zipball/5d2950da4d8af95f1ba4d6a3104b37de5ae971d4", + "reference": "5d2950da4d8af95f1ba4d6a3104b37de5ae971d4", "shasum": "" }, "require": { @@ -5072,9 +5072,9 @@ "description": "Symfony Console Command library", "support": { "issues": "https://github.com/vanengers/symfony-console-command-lib/issues", - "source": "https://github.com/vanengers/symfony-console-command-lib/tree/v1.0.4" + "source": "https://github.com/vanengers/symfony-console-command-lib/tree/v1.0.6" }, - "time": "2024-01-03T14:52:00+00:00" + "time": "2024-01-03T21:11:12+00:00" } ], "packages-dev": [ diff --git a/src/Translate/TranslationManager.php b/src/Translate/TranslationManager.php index 3b69d78..7715d75 100644 --- a/src/Translate/TranslationManager.php +++ b/src/Translate/TranslationManager.php @@ -251,8 +251,8 @@ private function verifyTranslatable(string $locale) return $this->_localeVerfiyCache[$locale]; } - $source = IsoFilter::getIsoByLocaleDeepL(explode(',',$this->locale)[0]); - $target = IsoFilter::getIsoByLocaleDeepL($locale); + $source = explode('-',IsoFilter::getIsoByLocaleDeepL($this->locale))[0]; + $target = explode('-',IsoFilter::getIsoByLocaleDeepL($locale))[0]; if (empty($this->sourceLangs)) { $this->sourceLangs = $this->arrayMap($this->translator->getSourceLanguages()); diff --git a/tests/Command/CanExtractTranslatablesTest.php b/tests/Command/CanExtractTranslatablesTest.php index 9e48190..6b4aacc 100644 --- a/tests/Command/CanExtractTranslatablesTest.php +++ b/tests/Command/CanExtractTranslatablesTest.php @@ -7,7 +7,7 @@ use Symfony\Component\Console\Output\ConsoleOutput; use Vanengers\PrestashopModuleTranslation\Command\ExtractCommand; use Vanengers\PrestashopModuleTranslation\Tests\Helper\ReflectionHelper; -use Vanengers\PrestashopModuleTranslation\Tests\Mocks\DeeplTranslatorMock; +use Vanengers\PrestashopModuleTranslation\Tests\Mocks\Deepl\DeeplTranslatorMock; class CanExtractTranslatablesTest extends TestCase { diff --git a/tests/Command/CanProductXliffFilesTest.php b/tests/Command/CanProductXliffFilesTest.php index 04b3efb..d059247 100644 --- a/tests/Command/CanProductXliffFilesTest.php +++ b/tests/Command/CanProductXliffFilesTest.php @@ -8,7 +8,7 @@ use Symfony\Component\Finder\Finder; use Vanengers\PrestashopModuleTranslation\Command\ExtractCommand; use Vanengers\PrestashopModuleTranslation\Tests\Helper\ReflectionHelper; -use Vanengers\PrestashopModuleTranslation\Tests\Mocks\DeeplTranslatorMock; +use Vanengers\PrestashopModuleTranslation\Tests\Mocks\Deepl\DeeplTranslatorMock; class CanProductXliffFilesTest extends TestCase { diff --git a/tests/Command/CanTranslateTest.php b/tests/Command/CanTranslateTest.php index def83d1..3706321 100644 --- a/tests/Command/CanTranslateTest.php +++ b/tests/Command/CanTranslateTest.php @@ -7,7 +7,7 @@ use Symfony\Component\Console\Output\ConsoleOutput; use Vanengers\PrestashopModuleTranslation\Command\ExtractCommand; use Vanengers\PrestashopModuleTranslation\Tests\Helper\ReflectionHelper; -use Vanengers\PrestashopModuleTranslation\Tests\Mocks\DeeplTranslatorMock; +use Vanengers\PrestashopModuleTranslation\Tests\Mocks\Deepl\DeeplTranslatorMock; class CanTranslateTest extends TestCase { diff --git a/tests/IsoFilter/TranslateIsoToLocaleTest.php b/tests/IsoFilter/TranslateIsoToLocaleTest.php index 0e4b57a..5a392dc 100644 --- a/tests/IsoFilter/TranslateIsoToLocaleTest.php +++ b/tests/IsoFilter/TranslateIsoToLocaleTest.php @@ -1,6 +1,6 @@ getLanguages(file_get_contents(__DIR__.'/sourceLanguages.json')); + } + + public function getTargetLanguages(): array + { + return $this->getLanguages(file_get_contents(__DIR__.'/targetLanguages.json')); + } + + public function getLanguages($content): array + { + try { + $decoded = json_decode($content, true, 512, \JSON_THROW_ON_ERROR); + } catch (JsonException $exception) { + throw new InvalidContentException($exception); + } + + $result = []; + foreach ($decoded as $lang) { + $name = $lang['name']; + $code = $lang['language']; + $supportsFormality = array_key_exists('supports_formality', $lang) ? + $lang['supports_formality'] : null; + $result[] = new Language($name, $code, $supportsFormality); + } + return $result; + } +} \ No newline at end of file diff --git a/tests/Mocks/Deepl/sourceLanguages.json b/tests/Mocks/Deepl/sourceLanguages.json new file mode 100644 index 0000000..973100f --- /dev/null +++ b/tests/Mocks/Deepl/sourceLanguages.json @@ -0,0 +1 @@ +[{"language":"BG","name":"Bulgarian"},{"language":"CS","name":"Czech"},{"language":"DA","name":"Danish"},{"language":"DE","name":"German"},{"language":"EL","name":"Greek"},{"language":"EN","name":"English"},{"language":"ES","name":"Spanish"},{"language":"ET","name":"Estonian"},{"language":"FI","name":"Finnish"},{"language":"FR","name":"French"},{"language":"HU","name":"Hungarian"},{"language":"ID","name":"Indonesian"},{"language":"IT","name":"Italian"},{"language":"JA","name":"Japanese"},{"language":"KO","name":"Korean"},{"language":"LT","name":"Lithuanian"},{"language":"LV","name":"Latvian"},{"language":"NB","name":"Norwegian"},{"language":"NL","name":"Dutch"},{"language":"PL","name":"Polish"},{"language":"PT","name":"Portuguese"},{"language":"RO","name":"Romanian"},{"language":"RU","name":"Russian"},{"language":"SK","name":"Slovak"},{"language":"SL","name":"Slovenian"},{"language":"SV","name":"Swedish"},{"language":"TR","name":"Turkish"},{"language":"UK","name":"Ukrainian"},{"language":"ZH","name":"Chinese"}] \ No newline at end of file diff --git a/tests/Mocks/Deepl/targetLanguages.json b/tests/Mocks/Deepl/targetLanguages.json new file mode 100644 index 0000000..13e77b3 --- /dev/null +++ b/tests/Mocks/Deepl/targetLanguages.json @@ -0,0 +1 @@ +[{"language":"BG","name":"Bulgarian","supports_formality":false},{"language":"CS","name":"Czech","supports_formality":false},{"language":"DA","name":"Danish","supports_formality":false},{"language":"DE","name":"German","supports_formality":true},{"language":"EL","name":"Greek","supports_formality":false},{"language":"EN-GB","name":"English (British)","supports_formality":false},{"language":"EN-US","name":"English (American)","supports_formality":false},{"language":"ES","name":"Spanish","supports_formality":true},{"language":"ET","name":"Estonian","supports_formality":false},{"language":"FI","name":"Finnish","supports_formality":false},{"language":"FR","name":"French","supports_formality":true},{"language":"HU","name":"Hungarian","supports_formality":false},{"language":"ID","name":"Indonesian","supports_formality":false},{"language":"IT","name":"Italian","supports_formality":true},{"language":"JA","name":"Japanese","supports_formality":true},{"language":"KO","name":"Korean","supports_formality":false},{"language":"LT","name":"Lithuanian","supports_formality":false},{"language":"LV","name":"Latvian","supports_formality":false},{"language":"NB","name":"Norwegian","supports_formality":false},{"language":"NL","name":"Dutch","supports_formality":true},{"language":"PL","name":"Polish","supports_formality":true},{"language":"PT-BR","name":"Portuguese (Brazilian)","supports_formality":true},{"language":"PT-PT","name":"Portuguese (European)","supports_formality":true},{"language":"RO","name":"Romanian","supports_formality":false},{"language":"RU","name":"Russian","supports_formality":true},{"language":"SK","name":"Slovak","supports_formality":false},{"language":"SL","name":"Slovenian","supports_formality":false},{"language":"SV","name":"Swedish","supports_formality":false},{"language":"TR","name":"Turkish","supports_formality":false},{"language":"UK","name":"Ukrainian","supports_formality":false},{"language":"ZH","name":"Chinese (simplified)","supports_formality":false}] \ No newline at end of file diff --git a/tests/Mocks/DeeplTranslatorMock.php b/tests/Mocks/DeeplTranslatorMock.php deleted file mode 100644 index 6f8d5d5..0000000 --- a/tests/Mocks/DeeplTranslatorMock.php +++ /dev/null @@ -1,40 +0,0 @@ -getSourceLanguages(); - } -} \ No newline at end of file