Merge commit '2b6dcbc2e2f1dc8d629225c19cbcedfb9ae969c4'

# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-06-26 18:46:29 +01:00
commit 111f4b3778

View File

@ -136,7 +136,7 @@ class Language{
$baseText = $this->parseTranslation(($onlyPrefix === null or strpos($str, $onlyPrefix) === 0) ? $baseText : $str, $onlyPrefix);
foreach($params as $i => $p){
$baseText = str_replace("{%$i}", $this->parseTranslation((string) $p), $baseText, $onlyPrefix);
$baseText = str_replace("{%$i}", $this->parseTranslation((string) $p), $baseText);
}
return $baseText;