http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98013
Revision: 98013
Author: aaron
Date: 2011-09-24 17:55:34 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
Minor cleanup and line breaking to formatTimePeriod()
Modified Paths:
--------------
trunk/phase3/languages/Language.php
Modified: trunk/phase3/languages/Language.php
===================================================================
--- trunk/phase3/languages/Language.php 2011-09-24 17:52:53 UTC (rev 98012)
+++ trunk/phase3/languages/Language.php 2011-09-24 17:55:34 UTC (rev 98013)
@@ -3558,7 +3558,7 @@
*/
function formatTimePeriod( $seconds, $format = array() ) {
if ( !is_array( $format ) ) {
- $format = array( 'avoid' => $format, 'noabbrevs' =>
false ); // For backwards compatibility
+ $format = array( 'avoid' => $format ); // For backwards
compatibility
}
if ( !isset( $format['avoid'] ) ) {
$format['avoid'] = false;
@@ -3566,10 +3566,14 @@
if ( !isset( $format['noabbrevs' ] ) ) {
$format['noabbrevs'] = false;
}
- $secondsMsg = wfMessage( $format['noabbrevs'] ? 'seconds' :
'seconds-abbrev' )->inLanguage( $this );
- $minutesMsg = wfMessage( $format['noabbrevs'] ? 'minutes' :
'minutes-abbrev' )->inLanguage( $this );
- $hoursMsg = wfMessage( $format['noabbrevs'] ? 'hours' :
'hours-abbrev' )->inLanguage( $this );
- $daysMsg = wfMessage( $format['noabbrevs'] ? 'days' :
'days-abbrev' )->inLanguage( $this );
+ $secondsMsg = wfMessage(
+ $format['noabbrevs'] ? 'seconds' : 'seconds-abbrev'
)->inLanguage( $this );
+ $minutesMsg = wfMessage(
+ $format['noabbrevs'] ? 'minutes' : 'minutes-abbrev'
)->inLanguage( $this );
+ $hoursMsg = wfMessage(
+ $format['noabbrevs'] ? 'hours' : 'hours-abbrev'
)->inLanguage( $this );
+ $daysMsg = wfMessage(
+ $format['noabbrevs'] ? 'days' : 'days-abbrev'
)->inLanguage( $this );
if ( round( $seconds * 10 ) < 100 ) {
$s = $this->formatNum( sprintf( "%.1f", round( $seconds
* 10 ) / 10 ) );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
