Fixed |t(variable) twig filter in admin

getgrav · Nov 3, 2021 · 8bbf7a8 · 8bbf7a8
1 parent a723bcd
commit 8bbf7a8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git 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
@@ -847,6 +847,12 @@ public function translate(Environment $twig, ...$args)
 
             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);