From 56002189242f8c4cd8d1e1314b88b48032ff167b Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@hsal.es>
Date: Tue, 1 Mar 2022 17:25:51 +0000
Subject: [PATCH] [TWIG][I18N] Remove unnecessary wrappers for translation
 functions, use them directly

---
 src/Twig/Extension.php |  4 ++--
 src/Twig/Runtime.php   | 12 ------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/Twig/Extension.php b/src/Twig/Extension.php
index f53bdb7ace..71493d98dd 100644
--- a/src/Twig/Extension.php
+++ b/src/Twig/Extension.php
@@ -79,8 +79,8 @@ class Extension extends AbstractExtension
             new TwigFunction('open_details', [Runtime::class, 'openDetails']),
             new TwigFunction('show_stylesheets', [Runtime::class, 'getShowStylesheets']),
             new TwigFunction('add_right_panel_block', [Runtime::class, 'addRightPanelBlock']),
-            new TwigFunction('trans', [Runtime::class, 'trans']),
-            new TwigFunction('trans_list', [Runtime::class, 'transList']),
+            new TwigFunction('trans', '\App\Core\I18n\_m'),
+            new TwigFunction('trans_list', '\App\Core\I18n\_m_list'),
         ];
     }
 }
diff --git a/src/Twig/Runtime.php b/src/Twig/Runtime.php
index f87cf920fe..bb1007141e 100644
--- a/src/Twig/Runtime.php
+++ b/src/Twig/Runtime.php
@@ -33,8 +33,6 @@ declare(strict_types = 1);
 namespace App\Twig;
 
 use App\Core\Event;
-use function App\Core\I18n\_m;
-use function App\Core\I18n\_m_list;
 use App\Core\Router\Router;
 use App\Entity\Actor;
 use App\Entity\Feed;
@@ -58,16 +56,6 @@ class Runtime implements RuntimeExtensionInterface, EventSubscriberInterface
         $this->request = $req;
     }
 
-    public function trans(array $message, array $arguments): string
-    {
-        return _m($message, $arguments);
-    }
-
-    public function transList(array $elements): string
-    {
-        return _m_list($elements);
-    }
-
     public function isCurrentRouteActive(string ...$routes): string
     {
         return $this->isCurrentRoute('active', ...$routes);