makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Máté Bartus 2021-09-02 10:48:56 +02:00
commit aa06580807
4 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/adm/style/overall_header.html
View file

@ -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

15
phpBB/phpbb/template/twig/extension.php
View file

@ -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 @@ class extension extends \Twig\Extension\AbstractExtension
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 @@ class extension extends \Twig\Extension\AbstractExtension
{
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');
}
}

15
tests/template/template_test.php
View file

@ -367,6 +367,21 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
"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(),

5
tests/template/templates/lang_twig.html Normal file
View file

@ -0,0 +1,5 @@
{{ lang('VARIABLE') }}
{{ lang('1_VARIABLE') }}
{{ lang_js('VARIABLE') }}
{{ lang_js('1_VARIABLE') }}