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

Merge branch '3.2.x' into 3.3.x

Browse source
This commit is contained in:
Marc Alexander 2020-01-22 21:21:07 +01:00
commit 9b12a923f5
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/language/en/common.php
View file

@ -168,6 +168,7 @@ $lang = array_merge($lang, array(
), ),
'COLLAPSE_VIEW' => 'Collapse view', 'COLLAPSE_VIEW' => 'Collapse view',
'CLOSE_WINDOW' => 'Close window', 'CLOSE_WINDOW' => 'Close window',
'CODE' => 'Code',
'COLOUR_SWATCH' => 'Colour swatch', 'COLOUR_SWATCH' => 'Colour swatch',
'COLON' => ':', 'COLON' => ':',
'COMMA_SEPARATOR' => ', ', // Comma used to join lists into a single string, use localised comma if appropriate, eg: Ideographic or Arabic 'COMMA_SEPARATOR' => ', ', // Comma used to join lists into a single string, use localised comma if appropriate, eg: Ideographic or Arabic
@ -618,6 +619,9 @@ $lang = array_merge($lang, array(
'POST_UNAPPROVED' => 'This post has not been approved.', 'POST_UNAPPROVED' => 'This post has not been approved.',
'POST_UNAPPROVED_EXPLAIN' => 'This post is not visible to other users until it has been approved by a moderator.', 'POST_UNAPPROVED_EXPLAIN' => 'This post is not visible to other users until it has been approved by a moderator.',
'POWERED_BY' => 'Powered by %s', 'POWERED_BY' => 'Powered by %s',
'QUOTE' => 'Quote',
'PREVIEW' => 'Preview', 'PREVIEW' => 'Preview',
'PREVIOUS' => 'Previous', // Used in pagination 'PREVIOUS' => 'Previous', // Used in pagination
'PREVIOUS_STEP' => 'Previous', 'PREVIOUS_STEP' => 'Previous',

3
phpBB/language/en/viewtopic.php
View file

@ -49,8 +49,6 @@ $lang = array_merge($lang, array(
'BUMPED_BY' => 'Last bumped by %1$s on %2$s.', 'BUMPED_BY' => 'Last bumped by %1$s on %2$s.',
'BUMP_TOPIC' => 'Bump topic', 'BUMP_TOPIC' => 'Bump topic',
'CODE' => 'Code',
'DELETE_TOPIC' => 'Delete topic', 'DELETE_TOPIC' => 'Delete topic',
'DELETED_INFORMATION' => 'Deleted by %1$s on %2$s', 'DELETED_INFORMATION' => 'Deleted by %1$s on %2$s',
'DISAPPROVE' => 'Disapprove', 'DISAPPROVE' => 'Disapprove',
@ -98,7 +96,6 @@ $lang = array_merge($lang, array(
'QUICK_MOD' => 'Quick-mod tools', 'QUICK_MOD' => 'Quick-mod tools',
'QUICKREPLY' => 'Quick Reply', 'QUICKREPLY' => 'Quick Reply',
'QUOTE' => 'Quote',
'REPLY_TO_TOPIC' => 'Reply to topic', 'REPLY_TO_TOPIC' => 'Reply to topic',
'RESTORE' => 'Restore', 'RESTORE' => 'Restore',

10
tests/text_formatter/s9e/default_formatting_test.php
View file

@ -82,7 +82,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
), ),
array( array(
'[code]unparsed code[/code]', '[code]unparsed code[/code]',
'<div class="codebox"><p>CODE: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><pre><code>unparsed code</code></pre></div>' '<div class="codebox"><p>Code: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><pre><code>unparsed code</code></pre></div>'
), ),
array( array(
'[list]no item[/list]', '[list]no item[/list]',
@ -195,12 +195,12 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
array( array(
// Do not parse textual bbcodes in code // Do not parse textual bbcodes in code
'[code]unparsed code [b]bold [i]bold + italic[/i][/b][/code]', '[code]unparsed code [b]bold [i]bold + italic[/i][/b][/code]',
'<div class="codebox"><p>CODE: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><pre><code>unparsed code [b]bold [i]bold + italic[/i][/b]</code></pre></div>' '<div class="codebox"><p>Code: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><pre><code>unparsed code [b]bold [i]bold + italic[/i][/b]</code></pre></div>'
), ),
array( array(
// Do not parse quote bbcodes in code // Do not parse quote bbcodes in code
'[code]unparsed code [quote="username"]quoted[/quote][/code]', '[code]unparsed code [quote="username"]quoted[/quote][/code]',
'<div class="codebox"><p>CODE: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><pre><code>unparsed code [quote="username"]quoted[/quote]</code></pre></div>' '<div class="codebox"><p>Code: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><pre><code>unparsed code [quote="username"]quoted[/quote]</code></pre></div>'
), ),
array( array(
// Textual bbcode nesting into textual bbcode // Textual bbcode nesting into textual bbcode
@ -209,11 +209,11 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
), ),
array( array(
"[code]\tline1\n line2[/code]", "[code]\tline1\n line2[/code]",
'<div class="codebox"><p>CODE: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><pre><code>' . "\tline1\n line2</code></pre></div>" '<div class="codebox"><p>Code: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><pre><code>' . "\tline1\n line2</code></pre></div>"
), ),
array( array(
"[code]\n\tline1\n line2[/code]", "[code]\n\tline1\n line2[/code]",
'<div class="codebox"><p>CODE: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><pre><code>' . "\tline1\n line2</code></pre></div>" '<div class="codebox"><p>Code: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><pre><code>' . "\tline1\n line2</code></pre></div>"
), ),
array( array(
'... http://example.org ...', '... http://example.org ...',

2
tests/text_processing/tickets_data/PHPBB3-11742.html
View file

@ -1 +1 @@
<div class="codebox"><p>CODE: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><pre><code> tab</code></pre></div> <div class="codebox"><p>Code: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><pre><code> tab</code></pre></div>