| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -2711,19 +2711,19 @@ |
| 2712 | 2712 | |
| 2713 | 2713 | function formatTimePeriod( $seconds ) { |
| 2714 | 2714 | if ( $seconds < 10 ) { |
| 2715 | | - return $this->formatNum( sprintf( "%.1f", $seconds ) ) . wfMsg( 'seconds-abbrev' ); |
| | 2715 | + return $this->formatNum( sprintf( "%.1f", $seconds ) ) . ' ' . wfMsg( 'seconds-abbrev' ); |
| 2716 | 2716 | } elseif ( $seconds < 60 ) { |
| 2717 | | - return $this->formatNum( round( $seconds ) ) . wfMsg( 'seconds-abbrev' ); |
| | 2717 | + return $this->formatNum( round( $seconds ) ) . ' ' . wfMsg( 'seconds-abbrev' ); |
| 2718 | 2718 | } elseif ( $seconds < 3600 ) { |
| 2719 | | - return $this->formatNum( floor( $seconds / 60 ) ) . wfMsg( 'minutes-abbrev' ) . |
| 2720 | | - $this->formatNum( round( fmod( $seconds, 60 ) ) ) . wfMsg( 'seconds-abbrev' ); |
| | 2719 | + return $this->formatNum( floor( $seconds / 60 ) ) . ' ' . wfMsg( 'minutes-abbrev' ) . ' ' . |
| | 2720 | + $this->formatNum( round( fmod( $seconds, 60 ) ) ) . ' ' . wfMsg( 'seconds-abbrev' ); |
| 2721 | 2721 | } else { |
| 2722 | 2722 | $hours = floor( $seconds / 3600 ); |
| 2723 | 2723 | $minutes = floor( ( $seconds - $hours * 3600 ) / 60 ); |
| 2724 | 2724 | $secondsPart = round( $seconds - $hours * 3600 - $minutes * 60 ); |
| 2725 | | - return $this->formatNum( $hours ) . wfMsg( 'hours-abbrev' ) . |
| 2726 | | - $this->formatNum( $minutes ) . wfMsg( 'minutes-abbrev' ) . |
| 2727 | | - $this->formatNum( $secondsPart ) . wfMsg( 'seconds-abbrev' ); |
| | 2725 | + return $this->formatNum( $hours ) . ' ' . wfMsg( 'hours-abbrev' ) . ' ' . |
| | 2726 | + $this->formatNum( $minutes ) . ' ' . wfMsg( 'minutes-abbrev' ) . ' ' . |
| | 2727 | + $this->formatNum( $secondsPart ) . ' ' . wfMsg( 'seconds-abbrev' ); |
| 2728 | 2728 | } |
| 2729 | 2729 | } |
| 2730 | 2730 | |