Pass variables to {lang} in Template.grammar
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 20 Apr 2017 19:09:42 +0000 (21:09 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 20 Apr 2017 19:10:10 +0000 (21:10 +0200)
wcfsetup/install/files/js/WoltLabSuite/Core/Template.grammar.jison
wcfsetup/install/files/js/WoltLabSuite/Core/Template.grammar.js

index 51a84c8dab61a76b8fb45cca51c27193b20eb721..58e92b5351e5dfa4b4b3301e8625894ee96fbaba 100644 (file)
@@ -122,7 +122,7 @@ COMMAND:
                + "}"
                + "return (looped ? result : " + ($5 || "''") + "); })()"
        }
-|      '{lang}' CHUNK_STAR '{/lang}' -> "Language.get(" + $2 + ")"
+|      '{lang}' CHUNK_STAR '{/lang}' -> "Language.get(" + $2 + ", v)"
 |      '{' VARIABLE '}'  -> "StringUtil.escapeHTML(" + $2 + ")"
 |      '{#' VARIABLE '}' -> "StringUtil.formatNumeric(" + $2 + ")"
 |      '{@' VARIABLE '}' -> $2
index 97370312b6f780ba77f7a5b2df374eff48ed68d2..5ccb6e73f204f08fbee18c1dbbed7b80a43b5acd 100644 (file)
@@ -84,7 +84,7 @@ case 11:
        
 break;
 case 12:
-this.$ = "Language.get(" + $$[$0-1] + ")";
+this.$ = "Language.get(" + $$[$0-1] + ", v)";
 break;
 case 13:
 this.$ = "StringUtil.escapeHTML(" + $$[$0-1] + ")";