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 | |
| 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
| -rw-r--r-- | phpBB/develop/lang_migrate_help_lang.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/help/bbcode.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/help/faq.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/develop/lang_migrate_help_lang.php b/phpBB/develop/lang_migrate_help_lang.php index d523493c83..d5a2573ee0 100644 --- a/phpBB/develop/lang_migrate_help_lang.php +++ b/phpBB/develop/lang_migrate_help_lang.php @@ -252,7 +252,7 @@ function write_help($help, array $lang) global $phpbb_root_path; $fp = fopen($phpbb_root_path . 'language/en/help/' . $help . '.php', 'wb'); fwrite($fp, get_language_file_header()); - fwrite($fp, '$lang = array(' . "\n"); + fwrite($fp, '$lang = array_merge($lang, array(' . "\n"); $last_key = ''; ksort($lang); @@ -270,7 +270,7 @@ function write_help($help, array $lang) $last_key = $key_start; } - fwrite($fp, ');' . "\n"); + fwrite($fp, '));' . "\n"); #fwrite($fp, $lang); fclose($fp); } 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?', -); +)); diff --git a/phpBB/language/en/help/faq.php b/phpBB/language/en/help/faq.php index fdb6f62aee..e59d950948 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -24,7 +24,7 @@ if (empty($lang) || !is_array($lang)) $lang = array(); } -$lang = array( +$lang = array_merge($lang, array( 'HELP_FAQ_ATTACHMENTS_ALLOWED_ANSWER' => 'Each board administrator can allow or disallow certain attachment types. If you are unsure what is allowed to be uploaded, contact the board administrator for assistance.', 'HELP_FAQ_ATTACHMENTS_ALLOWED_QUESTION' => 'What attachments are allowed on this board?', 'HELP_FAQ_ATTACHMENTS_OWN_ANSWER' => 'To find your list of attachments that you have uploaded, go to your User Control Panel and follow the links to the attachments section.', @@ -183,4 +183,4 @@ $lang = array( 'HELP_FAQ_USERSETTINGS_SERVERTIME_QUESTION' => 'I changed the timezone and the time is still wrong!', 'HELP_FAQ_USERSETTINGS_TIMEZONE_ANSWER' => 'It is possible the time displayed is from a timezone different from the one you are in. If this is the case, visit your User Control Panel and change your timezone to match your particular area, e.g. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings, can only be done by registered users. If you are not registered, this is a good time to do so.', 'HELP_FAQ_USERSETTINGS_TIMEZONE_QUESTION' => 'The times are not correct!', -); +)); |