Merge remote-tracking branch 'upstream/2021.03-rc' into extid-update

This commit is contained in:
Michael 2021-04-18 07:40:35 +00:00
commit be16bdcc24
3 changed files with 10372 additions and 10351 deletions

View file

@ -287,6 +287,8 @@ class L10n
*/
public function tt(string $singular, string $plural, int $count)
{
$s = null;
if (!empty($this->strings[$singular])) {
$t = $this->strings[$singular];
if (is_array($t)) {
@ -297,16 +299,20 @@ class L10n
$i = $this->stringPluralSelectDefault($count);
}
// for some languages there is only a single array item
if (!isset($t[$i])) {
$s = $t[0];
} else {
if (isset($t[$i])) {
$s = $t[$i];
} elseif (count($t) > 0) {
// for some languages there is only a single array item
$s = $t[0];
}
// if $t is empty, skip it, because empty strings array are indended
// to make string file smaller when there's no translation
} else {
$s = $t;
}
} elseif ($this->stringPluralSelectDefault($count)) {
}
if (is_null($s) && $this->stringPluralSelectDefault($count)) {
$s = $plural;
} else {
$s = $singular;

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff