fallback fix (#32)

contributte · Oct 22, 2020 · 943b546 · 943b546
1 parent 6fa9df4
commit 943b546
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/DI/TranslationExtension.php b/src/DI/TranslationExtension.php
@@ -36,7 +36,7 @@ public function getConfigSchema(): Nette\Schema\Schema
 					return true;
 				}),
 				'default' => Expect::string('en'),
-				'fallback' => Expect::array()->default(['en_US']),
+				'fallback' => Expect::array()->default(null),
 			])->assert(function (stdClass $locales): bool {
 				if ($locales->whitelist !== null && !in_array($locales->default, $locales->whitelist, true)) {
 					throw new Contributte\Translation\Exceptions\InvalidArgument('If you set whitelist, default locale must be on him.');
@@ -63,6 +63,10 @@ public function loadConfiguration(): void
 	{
 		$builder = $this->getContainerBuilder();
 
+		if ($this->config->locales->fallback === null) {
+			$this->config->locales->fallback = ['en_US'];
+		}
+
 		if ($this->config->localeResolvers === null) {
 			$this->config->localeResolvers = [
 				Contributte\Translation\LocalesResolvers\Session::class,

diff --git a/tests/Tests/DI/TranslationExtension.phpt b/tests/Tests/DI/TranslationExtension.phpt
@@ -163,6 +163,22 @@ class TranslationExtension extends Tests\TestAbstract
 		Tester\Assert::count(1, $container->findByType(Tests\PsrLoggerMock::class));
 	}
 
+	public function test05(): void
+	{
+		$container = Tests\Helpers::createContainerFromConfigurator($this->container->getParameters()['tempDir'], [
+			'translation' => [
+				'locales' => [
+					'fallback' => ['cs_CZ'],
+				],
+			],
+		]);
+
+		/** @var Contributte\Translation\Translator $translator */
+		$translator = $container->getByType(Nette\Localization\ITranslator::class);
+
+		Tester\Assert::same($translator->getFallbackLocales(), ['cs_CZ']);
+	}
+
 }
 
 (new TranslationExtension($container))->run();