From 0b1d23d84c92c0b5660abfafddc8b5e0e2e1be7d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Thu, 27 May 2010 14:24:34 +0000 Subject: [PATCH] Get rid of wfMsg() in Language --- languages/Language.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/languages/Language.php b/languages/Language.php index 0fbba3bdd6..05ad66b17d 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -2843,9 +2843,9 @@ class Language { function formatTimePeriod( $seconds ) { if ( $seconds < 10 ) { - return $this->formatNum( sprintf( "%.1f", $seconds ) ) . ' ' . wfMsg( 'seconds-abbrev' ); + return $this->formatNum( sprintf( "%.1f", $seconds ) ) . ' ' . $this->getMessageFromDB( 'seconds-abbrev' ); } elseif ( $seconds < 60 ) { - return $this->formatNum( round( $seconds ) ) . ' ' . wfMsg( 'seconds-abbrev' ); + return $this->formatNum( round( $seconds ) ) . ' ' . $this->getMessageFromDB( 'seconds-abbrev' ); } elseif ( $seconds < 3600 ) { $minutes = floor( $seconds / 60 ); $secondsPart = round( fmod( $seconds, 60 ) ); @@ -2853,8 +2853,8 @@ class Language { $secondsPart = 0; $minutes++; } - return $this->formatNum( $minutes ) . ' ' . wfMsg( 'minutes-abbrev' ) . ' ' . - $this->formatNum( $secondsPart ) . ' ' . wfMsg( 'seconds-abbrev' ); + return $this->formatNum( $minutes ) . ' ' . $this->getMessageFromDB( 'minutes-abbrev' ) . ' ' . + $this->formatNum( $secondsPart ) . ' ' . $this->getMessageFromDB( 'seconds-abbrev' ); } else { $hours = floor( $seconds / 3600 ); $minutes = floor( ( $seconds - $hours * 3600 ) / 60 ); @@ -2867,9 +2867,9 @@ class Language { $minutes = 0; $hours++; } - return $this->formatNum( $hours ) . ' ' . wfMsg( 'hours-abbrev' ) . ' ' . - $this->formatNum( $minutes ) . ' ' . wfMsg( 'minutes-abbrev' ) . ' ' . - $this->formatNum( $secondsPart ) . ' ' . wfMsg( 'seconds-abbrev' ); + return $this->formatNum( $hours ) . ' ' . $this->getMessageFromDB( 'hours-abbrev' ) . ' ' . + $this->formatNum( $minutes ) . ' ' . $this->getMessageFromDB( 'minutes-abbrev' ) . ' ' . + $this->formatNum( $secondsPart ) . ' ' . $this->getMessageFromDB( 'seconds-abbrev' ); } } -- 2.20.1