Merge branch '3.3.x'

365-W · Sep 2, 2021 · aa06580 · aa06580
2 parents 860663d + 86af3a2
commit aa06580
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 4 deletions.
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
@@ -12,10 +12,10 @@
 
 <script>
 // <![CDATA[
-var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
-var on_page = '{CURRENT_PAGE}';
-var per_page = '{PER_PAGE}';
-var base_url = '{BASE_URL|e('js')}';
+var jump_page = "{{ lang_js('JUMP_PAGE') ~ lang_js('COLON') }}";
+var on_page = '{{ CURRENT_PAGE }}';
+var per_page = '{{ PER_PAGE }}';
+var base_url = "{{ BASE_URL|e('js') }}";
 
 /**
 * Jump to page

diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php
@@ -13,6 +13,8 @@
 
 namespace phpbb\template\twig;
 
+use Twig\Error\RuntimeError;
+
 class extension extends \Twig\Extension\AbstractExtension
 {
 	/** @var \phpbb\template\context */
@@ -90,6 +92,7 @@ public function getFunctions()
 		return array(
 			new \Twig\TwigFunction('lang', array($this, 'lang')),
 			new \Twig\TwigFunction('lang_defined', array($this, 'lang_defined')),
+			new \Twig\TwigFunction('lang_js', [$this, 'lang_js']),
 			new \Twig\TwigFunction('get_class', 'get_class'),
 		);
 	}
@@ -198,4 +201,16 @@ public function lang_defined($key)
 	{
 		return call_user_func_array([$this->language, 'is_set'], [$key]);
 	}
+
+	/**
+	 * Get output for language variable in JS code
+	 *
+	 * @throws RuntimeError When data passed to twig_escape_filter is not a UTF8 string
+	 */
+	public function lang_js(): string
+	{
+		$args = func_get_args();
+
+		return twig_escape_filter($this->environment, call_user_func_array([$this, 'lang'], $args), 'js');
+	}
 }
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
@@ -367,6 +367,21 @@ public function template_data()
 				"Value'\n1 O'Clock\nValue\\u0027\n1\\u0020O\\u0027Clock",
 				array('VARIABLE' => "Value'", '1_VARIABLE' => "1 O'Clock"),
 			),
+			array(
+				'lang_twig.html',
+				array(),
+				array(),
+				array(),
+				"VARIABLE\n1_VARIABLE\nVARIABLE\n1_VARIABLE",
+			),
+			array(
+				'lang_twig.html',
+				array(),
+				array(),
+				array(),
+				"Value'\n1 O'Clock\nValue\\u0027\n1\\u0020O\\u0027Clock",
+				array('VARIABLE' => "Value'", '1_VARIABLE' => "1 O'Clock"),
+			),
 			array(
 				'loop_nested_multilevel_ref.html',
 				array(),

diff --git a/tests/template/templates/lang_twig.html b/tests/template/templates/lang_twig.html
@@ -0,0 +1,5 @@
+{{ lang('VARIABLE') }}
+{{ lang('1_VARIABLE') }}
+
+{{ lang_js('VARIABLE') }}
+{{ lang_js('1_VARIABLE') }}