From df60fb5c343230608d6abd1817afa581b6cf7d7b Mon Sep 17 00:00:00 2001 From: hkosaka Date: Wed, 20 Jun 2012 03:34:57 +0000 Subject: [PATCH] 2012-06-20 Hirofumi Kosaka * include/functions.php: Changed ambiguous time representation "MM:SS minutes", that can read 'MM hours SS minute', to "MM minutes SS seconds". Merged from 4.0.2 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6603 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/include/functions.php | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e027695c57..307b385f8b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2012-06-20 Hirofumi Kosaka + + * include/functions.php: Changed ambiguous time representation + "MM:SS minutes", that can read 'MM hours SS minute', to + "MM minutes SS seconds". + Merged from 4.0.2 + 2012-06-19 Sergio Martin * general/header.php: Add hint to explain the use of diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index ad0b57ff33..18fa72dad7 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -509,7 +509,7 @@ function human_time_description_raw ($seconds, $exactly = false, $units = 'large if ($seconds == 0) return $minutes.' ' . $minutesString; $seconds = sprintf ("%02d", $seconds); - return $minutes.':'.$seconds.' ' . $minutesString; + return $minutes.' '. $minutesString . ' ' .$seconds.' ' . $secondsString; } if ($seconds < 86400)