MediaWiki 1.17.0

[autoinstallsdev/mediawiki.git] / languages / classes / LanguageFi.php

diff --git a/languages/classes/LanguageFi.php b/languages/classes/LanguageFi.php
index 0d02dfe7c460419b32a1f139097b489f90600922..e3d922c47edf19ee8a0326bc46f3340052501be0 100644 (file)
--- a/languages/classes/LanguageFi.php
+++ b/languages/classes/LanguageFi.php
@@ -1,27 +1,18 @@
 <?php
+
 /** Finnish (Suomi)
  *
- * @addtogroup Language
+ * @ingroup Language
  *
  * @author Niklas Laxström
  */
 class LanguageFi extends Language {
-       /**
-        * Avoid grouping whole numbers between 0 to 9999
-        */
-       function commafy($_) {
-               if (!preg_match('/^-?\d{1,4}$/',$_)) {
-                       return strrev((string)preg_replace('/(\d{3})(?=\d)(?!\d*\.)/','$1,',strrev($_)));
-               } else {
-                       return $_;
-               }
-       }
 
        # Convert from the nominative form of a noun to some other case
        # Invoked with {{GRAMMAR:case|word}}
        function convertGrammar( $word, $case ) {
                global $wgGrammarForms;
-               if ( isset($wgGrammarForms['fi'][$case][$word]) ) {
+               if ( isset( $wgGrammarForms['fi'][$case][$word] ) ) {
                        return $wgGrammarForms['fi'][$case][$word];
                }
 
@@ -47,18 +38,18 @@ class LanguageFi extends Language {
                                $word .= 'n';
                                break;
                        case 'elative':
-                               $word .= ($aou ? 'sta' : 'stä');
+                               $word .= ( $aou ? 'sta' : 'stä' );
                                break;
                        case 'partitive':
-                               $word .= ($aou ? 'a' : 'ä');
+                               $word .= ( $aou ? 'a' : 'ä' );
                                break;
                        case 'illative':
                                # Double the last letter and add 'n'
                                # mb_substr has a compatibility function in GlobalFunctions.php
-                               $word = $word . mb_substr($word, -1) . 'n';
+                               $word = $word . mb_substr( $word, -1 ) . 'n';
                                break;
                        case 'inessive':
-                               $word .= ($aou ? 'ssa' : 'ssä');
+                               $word .= ( $aou ? 'ssa' : 'ssä' );
                                break;
                }
                return $word;
@@ -122,15 +113,15 @@ class LanguageFi extends Language {
                );
 
                $final = '';
-               $tokens = explode ( ' ', $str);
-               foreach( $tokens as $item ) {
-                       if ( !is_numeric($item) ) {
-                               if ( count ( explode( '-', $item ) ) == 3 && strlen($item) == 10 ) {
+               $tokens = explode ( ' ', $str );
+               foreach ( $tokens as $item ) {
+                       if ( !is_numeric( $item ) ) {
+                               if ( count ( explode( '-', $item ) ) == 3 && strlen( $item ) == 10 ) {
                                        list( $yyyy, $mm, $dd ) = explode( '-', $item );
-                                       $final .= ' ' . $this->date( "{$yyyy}{$mm}{$dd}00000000");
+                                       $final .= ' ' . $this->date( "{$yyyy}{$mm}{$dd}000000" );
                                        continue;
                                }
-                               if( isset( $weekds[$item] ) ) {
+                               if ( isset( $weekds[$item] ) ) {
                                        $final .= ' ' . $weekds[$item];
                                        continue;
                                }
@@ -139,13 +130,6 @@ class LanguageFi extends Language {
                        $final .= ' ' . $item;
                }
 
-               if ( $forContent ) {
-                       return htmlspecialchars( trim( $final ) );
-               } else {
-                       return '<span class="blockexpiry" title="' . htmlspecialchars($str). '">”' . trim( $final ) . '”</span>';
-               }
+               return htmlspecialchars( trim( $final ) );
        }
-
 }
-
-