BaseLang: get() never returns null

This commit is contained in:
Dylan K. Taylor 2020-02-05 20:38:45 +00:00
parent fe5620f097
commit e1a61cb51a

View File

@ -128,7 +128,7 @@ class BaseLang{
*/ */
public function translateString(string $str, array $params = [], string $onlyPrefix = null) : string{ public function translateString(string $str, array $params = [], string $onlyPrefix = null) : string{
$baseText = $this->get($str); $baseText = $this->get($str);
$baseText = $this->parseTranslation(($baseText !== null and ($onlyPrefix === null or strpos($str, $onlyPrefix) === 0)) ? $baseText : $str, $onlyPrefix); $baseText = $this->parseTranslation(($onlyPrefix === null or strpos($str, $onlyPrefix) === 0) ? $baseText : $str, $onlyPrefix);
foreach($params as $i => $p){ foreach($params as $i => $p){
$baseText = str_replace("{%$i}", $this->parseTranslation((string) $p), $baseText, $onlyPrefix); $baseText = str_replace("{%$i}", $this->parseTranslation((string) $p), $baseText, $onlyPrefix);