summaryrefslogtreecommitdiff
path: root/languages/classes/LanguageFi.php
diff options
context:
space:
mode:
Diffstat (limited to 'languages/classes/LanguageFi.php')
-rw-r--r--languages/classes/LanguageFi.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/languages/classes/LanguageFi.php b/languages/classes/LanguageFi.php
index d7363969..0d02dfe7 100644
--- 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,9 +138,14 @@ 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>';
+ }
}
}
-?>
+