Merge pull request #11837 from MrPetovan/task/remove-poke

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

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 08296068bb91f9e4b476915764387c42fd14aad5..0f879c494848ae6c73239b9b922dd8e194dfaea9 100644 (file)
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -50,6 +50,7 @@ class L10n
                'et'    => 'Eesti',
                'fi-fi' => 'Suomi',
                'fr'    => 'Français',
+               'gd'    => 'Gàidhlig',
                'hu'    => 'Magyar',
                'is'    => 'Íslenska',
                'it'    => 'Italiano',
@@ -269,7 +270,7 @@ class L10n
         *
         * @return string
         */
-       public function t(array $s, ...$vars): string
+       public function t(string $s, ...$vars): string
        {
                if (empty($s)) {
                        return '';
@@ -303,11 +304,12 @@ class L10n
         * @param string $singular
         * @param string $plural
         * @param int    $count
+        * @param array  $vars Variables to interpolate in the translation string
         *
         * @return string
         * @throws \Exception
         */
-       public function tt(string $singular, string $plural, int $count): string
+       public function tt(string $singular, string $plural, int $count, ...$vars): string
        {
                $s = null;
 
@@ -340,7 +342,9 @@ class L10n
                        $s = $singular;
                }
 
-               $s = @sprintf($s, $count);
+               // We mute errors here because the translation strings may not be referencing the count at all,
+               // but we still have to try the interpolation just in case it is indeed referenced.
+               $s = @sprintf($s, $count, ...$vars);
 
                return $s;
        }
@@ -425,32 +429,6 @@ class L10n
                return $ret;
        }
 
-       /**
-        * Load poke verbs
-        *
-        * @return array index is present tense verb
-        *                 value is array containing past tense verb, translation of present, translation of past
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-        * @hook poke_verbs pokes array
-        */
-       public function getPokeVerbs(): array
-       {
-               // index is present tense verb
-               // value is array containing past tense verb, translation of present, translation of past
-               $arr = [
-                       'poke'   => ['poked', $this->t('poke'), $this->t('poked')],
-                       'ping'   => ['pinged', $this->t('ping'), $this->t('pinged')],
-                       'prod'   => ['prodded', $this->t('prod'), $this->t('prodded')],
-                       'slap'   => ['slapped', $this->t('slap'), $this->t('slapped')],
-                       'finger' => ['fingered', $this->t('finger'), $this->t('fingered')],
-                       'rebuff' => ['rebuffed', $this->t('rebuff'), $this->t('rebuffed')],
-               ];
-
-               Hook::callAll('poke_verbs', $arr);
-
-               return $arr;
-       }
-
        /**
         * Creates a new L10n instance based on the given langauge
         *