archtechx/gloss
1
0
Fork 0
mirror of https://github.com/archtechx/gloss.git synced 2025-12-12 03:04:04 +00:00
Code Activity

Fix value overrides

Browse source
This commit is contained in:
Samuel Štancl 2021-03-11 13:45:05 +01:00
parent ae66cc87ff
commit 9948e4fd0f
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/GlossTranslator.php
View file

@ -148,7 +148,7 @@ class GlossTranslator extends Translator
if (isset($this->keyOverrides[$key])) { if (isset($this->keyOverrides[$key])) {
foreach ($this->keyOverrides[$key] as $override) { foreach ($this->keyOverrides[$key] as $override) {
if ($override['condition']($data)) { 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])) { if (isset($this->valueOverrides[$key])) {
foreach ($this->valueOverrides[$key] as $override) { foreach ($this->valueOverrides[$key] as $override) {
if ($override['condition']($data)) { if ($override['condition']($data)) {
return $override['value']; return $this->get($override['value'], $data);
} }
} }
} }

2
tests/GlossTest.php
View file

@ -91,7 +91,7 @@ class GlossTest extends TestCase
Gloss::value('Create :resource', 'Create :Resource'); Gloss::value('Create :resource', 'Create :Resource');
$this->assertNotSame('not called', Gloss::get('Create :resource', ['resource' => 'foo'])); $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 */ /** @test */