diff options
| author | rxu <rxu@mail.ru> | 2011-11-05 01:02:40 +0800 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2011-11-05 01:02:40 +0800 |
| commit | 2918fbc9709fd1cd698eb3ba5b9459f1301ae898 (patch) | |
| tree | 4f336eec5eaaf748e059a63c7d4836db91f75661 | |
| parent | 88b31c2ab3f2fe1e88920b3d3b022ee1355321f7 (diff) | |
| download | forums-2918fbc9709fd1cd698eb3ba5b9459f1301ae898.tar forums-2918fbc9709fd1cd698eb3ba5b9459f1301ae898.tar.gz forums-2918fbc9709fd1cd698eb3ba5b9459f1301ae898.tar.bz2 forums-2918fbc9709fd1cd698eb3ba5b9459f1301ae898.tar.xz forums-2918fbc9709fd1cd698eb3ba5b9459f1301ae898.zip | |
[ticket/10419] Reword some language strings, minor code changes
PHPBB3-10419
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 8 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index e31acfb7d1..c8df21f5a9 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -600,15 +600,15 @@ class acp_main $template->assign_var('S_WRITABLE_CONFIG', (bool) (@fileperms($phpbb_root_path . 'config.' . $phpEx) & 0x0002)); } - if (@extension_loaded('mbstring')) + if (extension_loaded('mbstring')) { $template->assign_vars(array( 'S_MBSTRING_LOADED' => true, - 'S_MBSTRING_FUNC_OVERLOAD_FAIL' => (intval(@ini_get('mbstring.func_overload')) & (MB_OVERLOAD_MAIL|MB_OVERLOAD_STRING)), + 'S_MBSTRING_FUNC_OVERLOAD_FAIL' => (intval(@ini_get('mbstring.func_overload')) & (MB_OVERLOAD_MAIL | MB_OVERLOAD_STRING)), 'S_MBSTRING_ENCODING_TRANSLATION_FAIL' => (@ini_get('mbstring.encoding_translation') != 0), 'S_MBSTRING_HTTP_INPUT_FAIL' => (@ini_get('mbstring.http_input') != 'pass'), - 'S_MBSTRING_HTTP_OUTPUT_FAIL' => (@ini_get('mbstring.http_output') != 'pass')) - ); + 'S_MBSTRING_HTTP_OUTPUT_FAIL' => (@ini_get('mbstring.http_output') != 'pass'), + )); } // Fill dbms version if not yet filled diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index a8cfaf8aa8..85da6fbd79 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -328,13 +328,13 @@ $lang = array_merge($lang, array( 'DATABASE_SIZE' => 'Database size', // Enviroment configuration checks, mbstring related - 'ERROR_MBSTRING_FUNC_OVERLOAD' => 'Functions overloading setting failed', + 'ERROR_MBSTRING_FUNC_OVERLOAD' => 'Function overloading setting is invalid', 'ERROR_MBSTRING_FUNC_OVERLOAD_EXPLAIN' => '<var>mbstring.func_overload</var> must be set to either 0 or 4. You can check current value on <samp>PHP information</samp> page.', - 'ERROR_MBSTRING_ENCODING_TRANSLATION' => 'Transparent character encoding setting failed', + 'ERROR_MBSTRING_ENCODING_TRANSLATION' => 'Transparent character encoding setting is invalid', 'ERROR_MBSTRING_ENCODING_TRANSLATION_EXPLAIN' => '<var>mbstring.encoding_translation</var> must be set to 0. You can check current value on <samp>PHP information</samp> page.', - 'ERROR_MBSTRING_HTTP_INPUT' => 'HTTP input character conversion setting failed', + 'ERROR_MBSTRING_HTTP_INPUT' => 'HTTP input character conversion setting is invalid', 'ERROR_MBSTRING_HTTP_INPUT_EXPLAIN' => '<var>mbstring.http_input</var> must be set to <samp>pass</samp>. You can check current value on <samp>PHP information</samp> page.', - 'ERROR_MBSTRING_HTTP_OUTPUT' => 'HTTP output character conversion setting failed', + 'ERROR_MBSTRING_HTTP_OUTPUT' => 'HTTP output character conversion setting is invalid', 'ERROR_MBSTRING_HTTP_OUTPUT_EXPLAIN' => '<var>mbstring.http_output</var> must be set to <samp>pass</samp>. You can check current value on <samp>PHP information</samp> page.', 'FILES_PER_DAY' => 'Attachments per day', |