X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FL10n.php;h=8cdd935917539d3bac262de4909ee5d93424ffee;hb=08fc86802a4ad2a265ed45d4e3a6603c65f6c70f;hp=32f87a4703c9728d7076ff4ae9e6d6f57f79a1f6;hpb=daa1177e3a1e42b4c95e0a8759f1610942b952c7;p=friendica.git diff --git a/src/Core/L10n.php b/src/Core/L10n.php index 32f87a4703..8cdd935917 100644 --- a/src/Core/L10n.php +++ b/src/Core/L10n.php @@ -5,7 +5,8 @@ namespace Friendica\Core; use Friendica\BaseObject; -use Friendica\Database\dba; +use Friendica\Database\DBA; +use Friendica\Core\System; require_once 'boot.php'; require_once 'include/dba.php'; @@ -111,8 +112,8 @@ class L10n extends BaseObject $a->strings = []; // load enabled addons strings - $addons = dba::select('addon', ['name'], ['installed' => true]); - while ($p = dba::fetch($addons)) { + $addons = DBA::select('addon', ['name'], ['installed' => true]); + while ($p = DBA::fetch($addons)) { $name = $p['name']; if (file_exists("addon/$name/lang/$lang/strings.php")) { include "addon/$name/lang/$lang/strings.php"; @@ -180,6 +181,8 @@ class L10n extends BaseObject */ public static function tt($singular, $plural, $count) { + $a = self::getApp(); + $lang = Config::get('system', 'language'); if (!empty($a->strings[$singular])) { @@ -191,7 +194,13 @@ class L10n extends BaseObject } else { $i = self::stringPluralSelectDefault($count); } - $s = $t[$i]; + + // for some languages there is only a single array item + if (!isset($t[$i])) { + $s = $t[0]; + } else { + $s = $t[$i]; + } } else { $s = $t; }