clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10143 from nupplaphil/bug/fix_l10n 

Fix L10n in case of empty strings array
This commit is contained in:
Hypolite Petovan 2021-04-18 00:16:24 -04:00 committed by GitHub
parent a6eeb7af11 f10c24c83a
commit 52d6add84a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/L10n.php
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;