diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-11-11 14:35:31 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-11-11 14:35:31 +0100 |
| commit | c699b88bc58ae07fffb33611a6d7ed950bbb1e15 (patch) | |
| tree | a78a8704cfc77f4e0fba9ffdc7fe30ee00822866 /phpBB | |
| parent | 3ebabc8da2b04a8ec157345b7c8185b5440cb5ee (diff) | |
| download | forums-c699b88bc58ae07fffb33611a6d7ed950bbb1e15.tar forums-c699b88bc58ae07fffb33611a6d7ed950bbb1e15.tar.gz forums-c699b88bc58ae07fffb33611a6d7ed950bbb1e15.tar.bz2 forums-c699b88bc58ae07fffb33611a6d7ed950bbb1e15.tar.xz forums-c699b88bc58ae07fffb33611a6d7ed950bbb1e15.zip | |
[ticket/11192] Add Tebibyte to get_formatted_filesize().
PHPBB3-11192
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 6 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 65d8be32ad..33545ab845 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -301,6 +301,12 @@ function get_formatted_filesize($value, $string_only = true, $allowed_units = fa global $user; $available_units = array( + 'tb' => array( + 'min' => 1099511627776, // pow(2, 40) + 'index' => 4, + 'si_unit' => 'TB', + 'iec_unit' => 'TIB', + ), 'gb' => array( 'min' => 1073741824, // pow(2, 30) 'index' => 3, diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 0184dd083b..844d5ef3ef 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -568,9 +568,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', 'TOO_LARGE' => 'The value you entered is too large.', |