diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-05-16 23:13:50 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-05-16 23:13:50 +0200 |
| commit | 80be642a0b77d400dadce7a8a30c50d32c27bf1f (patch) | |
| tree | a4e1b0ca73e7bc17bb3471670fca9e39418ed921 /phpBB/language/en/help/bbcode.php | |
| parent | f6c246f8899edb480c7347cb43e2cbdc96c80d17 (diff) | |
| download | forums-80be642a0b77d400dadce7a8a30c50d32c27bf1f.tar forums-80be642a0b77d400dadce7a8a30c50d32c27bf1f.tar.gz forums-80be642a0b77d400dadce7a8a30c50d32c27bf1f.tar.bz2 forums-80be642a0b77d400dadce7a8a30c50d32c27bf1f.tar.xz forums-80be642a0b77d400dadce7a8a30c50d32c27bf1f.zip | |
[ticket/13844] Fix language file so the tests pass
PHPBB3-13844
Diffstat (limited to 'phpBB/language/en/help/bbcode.php')
| -rw-r--r-- | phpBB/language/en/help/bbcode.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/help/bbcode.php b/phpBB/language/en/help/bbcode.php index cfbba0b771..d3b36d8015 100644 --- a/phpBB/language/en/help/bbcode.php +++ b/phpBB/language/en/help/bbcode.php @@ -24,7 +24,7 @@ if (empty($lang) || !is_array($lang)) $lang = array(); } -$lang = array( +$lang = array_merge($lang, array( 'HELP_BBCODE_BLOCK_IMAGES' => 'Showing images in posts', 'HELP_BBCODE_BLOCK_INTRO' => 'Introduction', 'HELP_BBCODE_BLOCK_LINKS' => 'Creating Links', @@ -63,4 +63,4 @@ $lang = array( 'HELP_BBCODE_TEXT_COLOR_QUESTION' => 'How to change the text colour or size', 'HELP_BBCODE_TEXT_COMBINE_ANSWER' => 'Yes, of course you can, for example to get someones attention you may write:<br /><br /><strong>[size=200][color=red][b]</strong>LOOK AT ME!<strong>[/b][/color][/size]</strong><br /><br />this would output <span style="color:red;font-size:200%;"><strong>LOOK AT ME!</strong></span><br /><br />We don’t recommend you output lots of text that looks like this though! Remember it is up to you, the poster, to ensure tags are closed correctly. For example the following is incorrect:<br /><br /><strong>[b][u]</strong>This is wrong<strong>[/b][/u]</strong>', 'HELP_BBCODE_TEXT_COMBINE_QUESTION' => 'Can I combine formatting tags?', -); +)); |