Fix E_NOTICE in r55415 breaking Zh variants

[lhc/web/wiklou.git] / languages / classes / LanguageFi.php

diff --git a/languages/classes/LanguageFi.php b/languages/classes/LanguageFi.php
index 8fc2549..d1348f0 100644 (file)
--- a/languages/classes/LanguageFi.php
+++ b/languages/classes/LanguageFi.php
@@ -1,22 +1,12 @@
 <?php
+
 /** Finnish (Suomi)
  *
- * @package MediaWiki
- * @subpackage 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}}
@@ -32,6 +22,13 @@ class LanguageFi extends Language {
                # wovel harmony flag
                $aou = preg_match( '/[aou][^äöy]*$/i', $word );
 
+               # The flag should be false for compounds where the last word has only neutral vowels (e/i).
+               # The general case cannot be handled without a dictionary, but there's at least one notable
+               # special case we should check for:
+
+               if ( preg_match( '/wiki$/i', $word ) )
+                       $aou = false;
+
                # append i after final consonant
                if ( preg_match( '/[bcdfghjklmnpqrstvwxz]$/i', $word ) )
                        $word .= 'i';
@@ -58,7 +55,7 @@ class LanguageFi extends Language {
                return $word;
        }
 
-       function translateBlockExpiry( $str ) {
+       function translateBlockExpiry( $str, $forContent = false ) {
                /*
                        'ago', 'now', 'today', 'this', 'next',
                        'first', 'third', 'fourth', 'fifth', 'sixth', 'seventh', 'eighth', 'ninth', 'tenth', 'eleventh', 'twelfth',
@@ -132,9 +129,7 @@ class LanguageFi extends Language {
 
                        $final .= ' ' . $item;
                }
-               return '<span class="blockexpiry" title="' . htmlspecialchars($str). '">”' . trim( $final ) . '”</span>';
-       }
 
+               return htmlspecialchars( trim( $final ) );
+       }
 }
-
-?>