mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00
Code Issues Releases Wiki Activity

Merge PR #1074 branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/11192] Merge dataProvider arrays because the test is the same now.
  [ticket/11192] Update $value parameter description to support other types.
  [ticket/11192] Mark negative byte numbers as unsupported.
  [ticket/11192] Test strings not converted to int/float before.
  [ticket/11192] Also test strings, e.g. sums returned by the database.
  [ticket/11192] Also test powers of 10 / 1000.
  [ticket/11192] Add tests.
  [ticket/11192] Add Tebibyte to get_formatted_filesize().
This commit is contained in:
Oleg Pudeyev
2012-11-16 10:29:22 -05:00
parent 9c86f70b4a af5d8b502e
commit 1a2dfa6d4c
3 changed files with 81 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/language/en/common.php
View File

@@ -605,9 +605,11 @@ $lang = array_merge($lang, array(
'SUBJECT' => 'Subject',
'SUBMIT' => 'Submit',
'TB' => 'TB',
'TERMS_USE' => 'Terms of use',
'TEST_CONNECTION' => 'Test connection',
'THE_TEAM' => 'The team',
'TIB' => 'TiB',
'TIME' => 'Time',
'TIMEOUT_PROCESSING_REQ' => 'Request timed out.',