Commit7c54eb6

authored

Revert "fallback to fallback_locale translation when requested translation line is empty (#34136)" (#34228)

This reverts commit02e983e.

1 parent36db948 commit7c54eb6Copy full SHA for 7c54eb6

File tree

-12

lines changed

-12

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public function get($key, array $replace = [], $locale = null, $fallback = true)`
`122`	`122`	`$locales =$fallback ?$this->localeArray($locale) : [$locale];`
`123`	`123`
`124`	`124`	`foreach ($localesas$locale) {`
`125`		`-if (!empty($line =$this->getLine(`
	`125`	`+if (!is_null($line =$this->getLine(`
`126`	`126`	`$namespace,$group,$locale,$item,$replace`
`127`	`127`	`))) {`
`128`	`128`	`return$line ??$key;`

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,17 +104,6 @@ public function testGetMethodProperlyLoadsAndRetrievesItemForFallback()`
`104`	`104`	`$this->assertSame('foo',$t->get('foo::bar.foo'));`
`105`	`105`	`}`
`106`	`106`
`107`		`-publicfunctiontestGetMethodProperlyLoadsAndRetrievesItemForFallbackWhenLineIsEmpty()`
`108`		`- {`
`109`		`-$t =newTranslator($this->getLoader(),'en');`
`110`		`-$t->setFallback('lv');`
`111`		`-$t->getLoader()->shouldReceive('load')->once()->with('en','','')->andReturn([]);`
`112`		`-$t->getLoader()->shouldReceive('load')->once()->with('en','bar','foo')->andReturn(['baz' =>'']);`
`113`		`-$t->getLoader()->shouldReceive('load')->once()->with('lv','bar','foo')->andReturn(['foo' =>'foo','baz' =>'breeze :foo']);`
`114`		`-$this->assertSame('breeze bar',$t->get('foo::bar.baz', ['foo' =>'bar'],'en'));`
`115`		`-$this->assertSame('foo',$t->get('foo::bar.foo'));`
`116`		`- }`
`117`		`-`
`118`	`107`	`publicfunctiontestGetMethodProperlyLoadsAndRetrievesItemForGlobalNamespace()`
`119`	`108`	`{`
`120`	`109`	`$t =newTranslator($this->getLoader(),'en');`

Comments

(0)