* Some updates

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

diff --git a/languages/classes/LanguageFi.php b/languages/classes/LanguageFi.php
index d736396..794febe 100644 (file)
--- a/languages/classes/LanguageFi.php
+++ b/languages/classes/LanguageFi.php
@@ -10,7 +10,7 @@ class LanguageFi extends Language {
         * Avoid grouping whole numbers between 0 to 9999
         */
        function commafy($_) {
-               if (!preg_match('/^\d{1,4}$/',$_)) {
+               if (!preg_match('/^-?\d{1,4}$/',$_)) {
                        return strrev((string)preg_replace('/(\d{3})(?=\d)(?!\d*\.)/','$1,',strrev($_)));
                } else {
                        return $_;
@@ -64,7 +64,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',
@@ -138,7 +138,12 @@ class LanguageFi extends Language {
 
                        $final .= ' ' . $item;
                }
-               return '<span class="blockexpiry" title="' . htmlspecialchars($str). '">”' . trim( $final ) . '”</span>';
+
+               if ( $forContent ) {
+                       return htmlspecialchars( trim( $final ) );
+               } else {
+                       return '<span class="blockexpiry" title="' . htmlspecialchars($str). '">”' . trim( $final ) . '”</span>';
+               }
        }
 
 }