| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -3558,7 +3558,7 @@ |
| 3559 | 3559 | */ |
| 3560 | 3560 | function formatTimePeriod( $seconds, $format = array() ) { |
| 3561 | 3561 | if ( !is_array( $format ) ) { |
| 3562 | | - $format = array( 'avoid' => $format, 'noabbrevs' => false ); // For backwards compatibility |
| | 3562 | + $format = array( 'avoid' => $format ); // For backwards compatibility |
| 3563 | 3563 | } |
| 3564 | 3564 | if ( !isset( $format['avoid'] ) ) { |
| 3565 | 3565 | $format['avoid'] = false; |
| — | — | @@ -3566,10 +3566,14 @@ |
| 3567 | 3567 | if ( !isset( $format['noabbrevs' ] ) ) { |
| 3568 | 3568 | $format['noabbrevs'] = false; |
| 3569 | 3569 | } |
| 3570 | | - $secondsMsg = wfMessage( $format['noabbrevs'] ? 'seconds' : 'seconds-abbrev' )->inLanguage( $this ); |
| 3571 | | - $minutesMsg = wfMessage( $format['noabbrevs'] ? 'minutes' : 'minutes-abbrev' )->inLanguage( $this ); |
| 3572 | | - $hoursMsg = wfMessage( $format['noabbrevs'] ? 'hours' : 'hours-abbrev' )->inLanguage( $this ); |
| 3573 | | - $daysMsg = wfMessage( $format['noabbrevs'] ? 'days' : 'days-abbrev' )->inLanguage( $this ); |
| | 3570 | + $secondsMsg = wfMessage( |
| | 3571 | + $format['noabbrevs'] ? 'seconds' : 'seconds-abbrev' )->inLanguage( $this ); |
| | 3572 | + $minutesMsg = wfMessage( |
| | 3573 | + $format['noabbrevs'] ? 'minutes' : 'minutes-abbrev' )->inLanguage( $this ); |
| | 3574 | + $hoursMsg = wfMessage( |
| | 3575 | + $format['noabbrevs'] ? 'hours' : 'hours-abbrev' )->inLanguage( $this ); |
| | 3576 | + $daysMsg = wfMessage( |
| | 3577 | + $format['noabbrevs'] ? 'days' : 'days-abbrev' )->inLanguage( $this ); |
| 3574 | 3578 | |
| 3575 | 3579 | if ( round( $seconds * 10 ) < 100 ) { |
| 3576 | 3580 | $s = $this->formatNum( sprintf( "%.1f", round( $seconds * 10 ) / 10 ) ); |