From 8bbf7a849b57bc4f943b266ece0572b341d593ea Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Wed, 3 Nov 2021 13:10:10 +0200
Subject: [PATCH] Fixed `|t(variable)` twig filter in admin

---
 CHANGELOG.md                                            | 1 +
 system/src/Grav/Common/Twig/Extension/GravExtension.php | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da5de244c..fa41efcf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
     * Improved page cloning, added method `Page::initialize()`
 2. [](#bugfix)
     * Fixed unescaped error messages in JSON error responses
+    * Fixed `|t(variable)` twig filter in admin
 
 # v1.7.24
 ## 10/26/2021
diff --git a/system/src/Grav/Common/Twig/Extension/GravExtension.php b/system/src/Grav/Common/Twig/Extension/GravExtension.php
index bee1bbce8..20d264808 100644
--- a/system/src/Grav/Common/Twig/Extension/GravExtension.php
+++ b/system/src/Grav/Common/Twig/Extension/GravExtension.php
@@ -847,6 +847,12 @@ class GravExtension extends AbstractExtension implements GlobalsInterface
 
             if (($numargs === 3 && is_array($args[1])) || ($numargs === 2 && !is_array($args[1]))) {
                 $lang = array_pop($args);
+                /** @var Language $language */
+                $language = $this->grav['language'];
+                if (is_string($lang) && !$language->getLanguageCode($lang)) {
+                    $args[] = $lang;
+                    $lang = null;
+                }
             } elseif ($numargs === 2 && is_array($args[1])) {
                 $subs = array_pop($args);
                 $args = array_merge($args, $subs);