Merged with upstream

This commit is contained in:
ZonD Eighty 2013-01-16 17:12:22 +04:00
commit 52bdfc3aab
2 changed files with 382 additions and 191 deletions

View file

@ -67,14 +67,14 @@ function humanize_time($usage) {
$usage = $usage / 60;
if ( $usage > 24 ) {
$usage = $usage / 24;
$usage = number_format($usage, 0);
$usage = number_format($usage);
if ( $usage == 1 ) {
$usage = $usage." "._('day');
} else {
$usage = $usage." "._('days');
}
} else {
$usage = number_format($usage, 0);
$usage = number_format($usage);
if ( $usage == 1 ) {
$usage = $usage." "._('hour');
} else {
@ -174,4 +174,4 @@ function display_error_block() {
unset($_SESSION['error_msg']);
}
}
?>
?>