Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[11.X] Fix 0 being treated as falsey when making translation replacements #53193

Closed
wants to merge 2 commits into from
Closed

[11.X] Fix 0 being treated as falsey when making translation replacements #53193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5430d37
Fix 0 being treated a non-truthy when making translation replacements
mpstenson Oct 16, 2024
51d308f
Fix for styleci
mpstenson Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Illuminate/Translation/Translator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public function get($key, array $replace = [], $locale = null, $fallback = true)
// If the line doesn't exist, we will return back the key which was requested as
// that will be quick to spot in the UI if language keys are wrong or missing
// from the application's language files. Otherwise we can return the line.
return $this->makeReplacements($line ?: $key, $replace);
return $this->makeReplacements($line !== null ? $line : $key, $replace);
}

/**
Expand Down
7 changes: 7 additions & 0 deletions tests/Translation/TranslationTranslatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,13 @@ public function testDetermineLocalesUsingMethod()
$this->assertSame('foo', $t->get('foo'));
}

public function testTagReplacementsHandleZeroAsString()
{
$t = new Translator($this->getLoader(), 'en');
$t->getLoader()->shouldReceive('load')->once()->with('en', '*', '*')->andReturn(['foo' => '0']);
$this->assertSame('0', $t->get('foo'));
}

protected function getLoader()
{
return m::mock(Loader::class);
Expand Down