From 9948e4fd0f82a9960658e0774750a184f04f17aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Thu, 11 Mar 2021 13:45:05 +0100 Subject: [PATCH] Fix value overrides --- src/GlossTranslator.php | 4 ++-- tests/GlossTest.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/GlossTranslator.php b/src/GlossTranslator.php index 06dc912..5549245 100644 --- a/src/GlossTranslator.php +++ b/src/GlossTranslator.php @@ -148,7 +148,7 @@ class GlossTranslator extends Translator if (isset($this->keyOverrides[$key])) { foreach ($this->keyOverrides[$key] as $override) { if ($override['condition']($data)) { - return $this->get($override['value']); + return $this->get($override['value'], $data); } } } @@ -161,7 +161,7 @@ class GlossTranslator extends Translator if (isset($this->valueOverrides[$key])) { foreach ($this->valueOverrides[$key] as $override) { if ($override['condition']($data)) { - return $override['value']; + return $this->get($override['value'], $data); } } } diff --git a/tests/GlossTest.php b/tests/GlossTest.php index f871460..faaf358 100644 --- a/tests/GlossTest.php +++ b/tests/GlossTest.php @@ -91,7 +91,7 @@ class GlossTest extends TestCase Gloss::value('Create :resource', 'Create :Resource'); $this->assertNotSame('not called', Gloss::get('Create :resource', ['resource' => 'foo'])); - $this->assertSame('Create :Resource', Gloss::get('Create :resource', ['resource' => 'foo'])); + $this->assertSame('Create Foo', Gloss::get('Create :resource', ['resource' => 'foo'])); } /** @test */