Merge pull request #5599 from annando/postupdate

[friendica.git] / src / Core / L10n.php

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 32f87a4703c9728d7076ff4ae9e6d6f57f79a1f6..8cdd935917539d3bac262de4909ee5d93424ffee 100644 (file)
--- 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;
                        }