| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -2843,9 +2843,9 @@ |
| 2844 | 2844 | |
| 2845 | 2845 | function formatTimePeriod( $seconds ) { |
| 2846 | 2846 | if ( $seconds < 10 ) { |
| 2847 | | - return $this->formatNum( sprintf( "%.1f", $seconds ) ) . ' ' . $this->getMessageFromDB( 'seconds-abbrev' ); |
| | 2847 | + return $this->formatNum( sprintf( "%.1f", $seconds ) ) . $this->getMessageFromDB( 'seconds-abbrev' ); |
| 2848 | 2848 | } elseif ( $seconds < 60 ) { |
| 2849 | | - return $this->formatNum( round( $seconds ) ) . ' ' . $this->getMessageFromDB( 'seconds-abbrev' ); |
| | 2849 | + return $this->formatNum( round( $seconds ) ) . $this->getMessageFromDB( 'seconds-abbrev' ); |
| 2850 | 2850 | } elseif ( $seconds < 3600 ) { |
| 2851 | 2851 | $minutes = floor( $seconds / 60 ); |
| 2852 | 2852 | $secondsPart = round( fmod( $seconds, 60 ) ); |
| — | — | @@ -2853,8 +2853,8 @@ |
| 2854 | 2854 | $secondsPart = 0; |
| 2855 | 2855 | $minutes++; |
| 2856 | 2856 | } |
| 2857 | | - return $this->formatNum( $minutes ) . ' ' . $this->getMessageFromDB( 'minutes-abbrev' ) . ' ' . |
| 2858 | | - $this->formatNum( $secondsPart ) . ' ' . $this->getMessageFromDB( 'seconds-abbrev' ); |
| | 2857 | + return $this->formatNum( $minutes ) . $this->getMessageFromDB( 'minutes-abbrev' ) . ' ' . |
| | 2858 | + $this->formatNum( $secondsPart ) . $this->getMessageFromDB( 'seconds-abbrev' ); |
| 2859 | 2859 | } else { |
| 2860 | 2860 | $hours = floor( $seconds / 3600 ); |
| 2861 | 2861 | $minutes = floor( ( $seconds - $hours * 3600 ) / 60 ); |
| — | — | @@ -2867,9 +2867,9 @@ |
| 2868 | 2868 | $minutes = 0; |
| 2869 | 2869 | $hours++; |
| 2870 | 2870 | } |
| 2871 | | - return $this->formatNum( $hours ) . ' ' . $this->getMessageFromDB( 'hours-abbrev' ) . ' ' . |
| 2872 | | - $this->formatNum( $minutes ) . ' ' . $this->getMessageFromDB( 'minutes-abbrev' ) . ' ' . |
| 2873 | | - $this->formatNum( $secondsPart ) . ' ' . $this->getMessageFromDB( 'seconds-abbrev' ); |
| | 2871 | + return $this->formatNum( $hours ) . $this->getMessageFromDB( 'hours-abbrev' ) . ' ' . |
| | 2872 | + $this->formatNum( $minutes ) . $this->getMessageFromDB( 'minutes-abbrev' ) . ' ' . |
| | 2873 | + $this->formatNum( $secondsPart ) . $this->getMessageFromDB( 'seconds-abbrev' ); |
| 2874 | 2874 | } |
| 2875 | 2875 | } |
| 2876 | 2876 | |