From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Mon, 1 May 2006 20:55:26 +0000 (+0000)
Subject: * Use arabic numbers for ISO times
X-Git-Tag: 1.31.0-rc.0~57280
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=5b946d32dfb3ef182cc9b4b4d405eb52083e8f83;p=lhc%2Fweb%2Fwiklou.git

* Use arabic numbers for ISO times
---

diff --git a/languages/Language.php b/languages/Language.php
index 53f98cb548..50169a9627 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -644,20 +644,20 @@ class Language {
 		if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
 		$datePreference = $this->dateFormat( $format );
 
-		$sep = ($datePreference == MW_DATE_ISO)
-			? ':'
-			: $this->timeSeparator( $format );
+		$sep = $this->timeSeparator( $format );
 
-		$hh = $this->formatNum( substr( $ts, 8, 2 ), true );
-		$mm = $this->formatNum( substr( $ts, 10, 2 ), true );
-		$ss = $this->formatNum( substr( $ts, 12, 2 ), true );
+		$hh = substr( $ts, 8, 2 );
+		$mm = substr( $ts, 10, 2 );
+		$ss = substr( $ts, 12, 2 );
 
-		$t = $hh . $sep . $mm;
-
-		if ( $datePreference == MW_DATE_ISO ) {
-			$t .= $sep . $ss;
+		if ( $datePreference != MW_DATE_ISO ) {
+			$hh = $this->formatNum( $hh, true );
+			$mm = $this->formatNum( $mm, true );
+			//$ss = $this->formatNum( $ss, true );
+			return $hh . $sep . $mm;
+		} else {
+			return $hh . ':' . $mm . ':' . $ss;
 		}
-		return $t;
 	}
 
 	/**