From 954ef59e627ae469b8db46b0c9be736844932224 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sat, 21 Aug 2010 14:57:08 +0000 Subject: [PATCH] * (bug 24804) Corrected commafying in Polish and Ukrainian --- RELEASE-NOTES | 1 + languages/classes/LanguagePl.php | 2 +- languages/classes/LanguageUk.php | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 803038e423..070dca32fa 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -296,6 +296,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 17031) Correct which characters the parser allows in tag attributes. * Save 200 useless queries on each category page view * Shell commands will now work on Linux in filesystems mounted noexec +* (bug 24804) Corrected commafying in Polish and Ukrainian === API changes in 1.17 === * (bug 22738) Allow filtering by action type on query=logevent. diff --git a/languages/classes/LanguagePl.php b/languages/classes/LanguagePl.php index 1d96bc44ad..40477f42f7 100644 --- a/languages/classes/LanguagePl.php +++ b/languages/classes/LanguagePl.php @@ -23,7 +23,7 @@ class LanguagePl extends Language { } function commafy( $_ ) { - if ( !preg_match( '/^\d{1,4}(.\d+)?$/', $_ ) ) { + if ( !preg_match( '/^\-?\d{1,4}(\.\d+)?$/', $_ ) ) { return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) ); } else { return $_; diff --git a/languages/classes/LanguageUk.php b/languages/classes/LanguageUk.php index 88655ff767..6c0cf8daf0 100644 --- a/languages/classes/LanguageUk.php +++ b/languages/classes/LanguageUk.php @@ -82,9 +82,8 @@ class LanguageUk extends Language { /* * Ukrainian numeric format is "12 345,67" but "1234,56" */ - function commafy( $_ ) { - if ( !preg_match( '/^\d{1,4}$/', $_ ) ) { + if ( !preg_match( '/^\-?\d{1,4}(\.\d+)?$/', $_ ) ) { return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) ); } else { return $_; -- 2.20.1