* (bug 5679) time units are now using local numerals

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1d41c07..0757894 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -129,11 +129,11 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Updated maintenance/transstat.php so it can show duplicate messages
 * Improvements to update scripts; print out the version, check for superuser credentials
   before attempting a connection, and produce a friendlier error if the connection fails
-* (bug 5005): Fix XHTML <gallery> output.
+* (bug 5005) Fix XHTML <gallery> output.
 * (bug 5315) "Expires: -1" HTTP header made strictly valid (using 1970 date).
-* (bug 4825): note in DefaultSettings.php about 'profiling' table creation
+* (bug 4825) note in DefaultSettings.php about 'profiling' table creation
 * Remove unneeded extra whitespace at top of Special:Categories
-* (bug 5679): format number on timeanddate() calls for fa: hi: bn:.
+* (bug 5679) time units are now using local numerals
 * (bug 5751) Updates to Portuguese localisation files
 * (bug 5741) Introduce {{NUMBEROFUSERS}} magic word
 * (bug 93) <nowiki> tags and tildes in templates

diff --git a/languages/Language.php b/languages/Language.php
index a524512..47753e6 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -642,10 +642,14 @@ class Language {
                        ? ':'
                        : $this->timeSeparator( $format );
 
-               $t = substr( $ts, 8, 2 ) . $sep . substr( $ts, 10, 2 );
+               $hh = $this->formatNum( substr( $ts, 8, 2 ), true );
+               $mm = $this->formatNum( substr( $ts, 10, 2 ), true );
+               $ss = $this->formatNum( substr( $ts, 12, 2 ), true );
+
+               $t = $hh . $sep . $mm;
 
                if ( $datePreference == MW_DATE_ISO ) {
-                       $t .= $sep . substr( $ts, 12, 2 );
+                       $t .= $sep . $ss;
                }
                return $t;
        }

diff --git a/languages/LanguageBn.php b/languages/LanguageBn.php
index 30f3a6f..2e52651 100644 (file)
--- a/languages/LanguageBn.php
+++ b/languages/LanguageBn.php
@@ -62,10 +62,6 @@ class LanguageBn extends LanguageUtf8 {
                );
        }
 
-       function timeanddate( $ts, $adj = false ) {
-               return $this->formatNum( Language::timeanddate( $ts, $adj ) );
-       }
-
 }
 
 ?>

diff --git a/languages/LanguageFa.php b/languages/LanguageFa.php
index 53392ec..3c690a2 100644 (file)
--- a/languages/LanguageFa.php
+++ b/languages/LanguageFa.php
@@ -106,8 +106,5 @@ class LanguageFa extends LanguageUtf8 {
        # For right-to-left language support
        function isRTL() { return true; }
 
-       function timeanddate( $ts, $adj = false ) {
-               return $this->formatNum( Language::timeanddate( $ts, $adj ) );
-       }
 }
 ?>

diff --git a/languages/LanguageHi.php b/languages/LanguageHi.php
index 9f55bc4..9eb215e 100644 (file)
--- a/languages/LanguageHi.php
+++ b/languages/LanguageHi.php
@@ -59,10 +59,6 @@ class LanguageHi extends LanguageUtf8 {
                        return parent::getMessage($key);
        }
 
-       function timeanddate( $ts, $adj = false ) {
-               return $this->formatNum( Language::timeanddate( $ts, $adj ) );
-       }
-
 }
 
 ?>