jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/383444 )
Change subject: Generalize non-digit-grouping of four-digit numbers ...................................................................... Generalize non-digit-grouping of four-digit numbers In some languages it's conventional not to insert a thousands separator in numbers that are four digits long (1000-9999). Rather than copy-paste the custom code to do this between 13 files, introduce another option and have the base Language class handle it. This also fixes an issue in several languages where this logic previously would not work for negative or fractional numbers. To implement this, a new option is added to MessagesXx.php files, `$minimumGroupingDigits = 2;`, with the meaning as defined in <http://unicode.org/reports/tr35/tr35-numbers.html>. It is a little roundabout, but it could allow us to migrate the number formatting (currently all custom code) to some generic library easily. Bug: T177846 Change-Id: Iedd8de5648cf2de1c94044918626de2f96365d48 --- M autoload.php M includes/cache/localisation/LocalisationCache.php M languages/Language.php M languages/classes/LanguageBe_tarask.php D languages/classes/LanguageBg.php D languages/classes/LanguageEs.php D languages/classes/LanguageEt.php M languages/classes/LanguageHy.php M languages/classes/LanguageKaa.php M languages/classes/LanguageKk_cyrl.php M languages/classes/LanguageKsh.php M languages/classes/LanguageKu.php D languages/classes/LanguageKu_ku.php D languages/classes/LanguagePl.php D languages/classes/LanguageRu.php D languages/classes/LanguageUk.php M languages/messages/MessagesBe_tarask.php M languages/messages/MessagesBg.php M languages/messages/MessagesEs.php M languages/messages/MessagesEt.php M languages/messages/MessagesHy.php M languages/messages/MessagesKaa.php M languages/messages/MessagesKk_cyrl.php M languages/messages/MessagesKsh.php M languages/messages/MessagesKu_latn.php M languages/messages/MessagesPl.php M languages/messages/MessagesRu.php M languages/messages/MessagesUk.php M tests/phpunit/languages/classes/LanguagePlTest.php M tests/phpunit/languages/classes/LanguageRuTest.php M tests/phpunit/languages/classes/LanguageUkTest.php 31 files changed, 41 insertions(+), 406 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified Nikerabbit: Looks good to me, approved diff --git a/autoload.php b/autoload.php index 884dbbe..4a8e18d 100644 --- a/autoload.php +++ b/autoload.php @@ -705,7 +705,6 @@ 'LanguageAr' => __DIR__ . '/languages/classes/LanguageAr.php', 'LanguageAz' => __DIR__ . '/languages/classes/LanguageAz.php', 'LanguageBe_tarask' => __DIR__ . '/languages/classes/LanguageBe_tarask.php', - 'LanguageBg' => __DIR__ . '/languages/classes/LanguageBg.php', 'LanguageBs' => __DIR__ . '/languages/classes/LanguageBs.php', 'LanguageCode' => __DIR__ . '/languages/LanguageCode.php', 'LanguageConverter' => __DIR__ . '/languages/LanguageConverter.php', @@ -713,8 +712,6 @@ 'LanguageCu' => __DIR__ . '/languages/classes/LanguageCu.php', 'LanguageDsb' => __DIR__ . '/languages/classes/LanguageDsb.php', 'LanguageEn' => __DIR__ . '/languages/classes/LanguageEn.php', - 'LanguageEs' => __DIR__ . '/languages/classes/LanguageEs.php', - 'LanguageEt' => __DIR__ . '/languages/classes/LanguageEt.php', 'LanguageFi' => __DIR__ . '/languages/classes/LanguageFi.php', 'LanguageGa' => __DIR__ . '/languages/classes/LanguageGa.php', 'LanguageGan' => __DIR__ . '/languages/classes/LanguageGan.php', @@ -729,21 +726,17 @@ 'LanguageKm' => __DIR__ . '/languages/classes/LanguageKm.php', 'LanguageKsh' => __DIR__ . '/languages/classes/LanguageKsh.php', 'LanguageKu' => __DIR__ . '/languages/classes/LanguageKu.php', - 'LanguageKu_ku' => __DIR__ . '/languages/classes/LanguageKu_ku.php', 'LanguageLa' => __DIR__ . '/languages/classes/LanguageLa.php', 'LanguageMl' => __DIR__ . '/languages/classes/LanguageMl.php', 'LanguageMy' => __DIR__ . '/languages/classes/LanguageMy.php', 'LanguageOs' => __DIR__ . '/languages/classes/LanguageOs.php', - 'LanguagePl' => __DIR__ . '/languages/classes/LanguagePl.php', 'LanguageQqx' => __DIR__ . '/languages/classes/LanguageQqx.php', - 'LanguageRu' => __DIR__ . '/languages/classes/LanguageRu.php', 'LanguageShi' => __DIR__ . '/languages/classes/LanguageShi.php', 'LanguageSl' => __DIR__ . '/languages/classes/LanguageSl.php', 'LanguageSr' => __DIR__ . '/languages/classes/LanguageSr.php', 'LanguageTg' => __DIR__ . '/languages/classes/LanguageTg.php', 'LanguageTr' => __DIR__ . '/languages/classes/LanguageTr.php', 'LanguageTyv' => __DIR__ . '/languages/classes/LanguageTyv.php', - 'LanguageUk' => __DIR__ . '/languages/classes/LanguageUk.php', 'LanguageUz' => __DIR__ . '/languages/classes/LanguageUz.php', 'LanguageWa' => __DIR__ . '/languages/classes/LanguageWa.php', 'LanguageYue' => __DIR__ . '/languages/classes/LanguageYue.php', diff --git a/includes/cache/localisation/LocalisationCache.php b/includes/cache/localisation/LocalisationCache.php index a0ce95e..5e0a688 100644 --- a/includes/cache/localisation/LocalisationCache.php +++ b/includes/cache/localisation/LocalisationCache.php @@ -109,7 +109,8 @@ static public $allKeys = [ 'fallback', 'namespaceNames', 'bookstoreList', 'magicWords', 'messages', 'rtl', 'capitalizeAllNouns', 'digitTransformTable', - 'separatorTransformTable', 'fallback8bitEncoding', 'linkPrefixExtension', + 'separatorTransformTable', 'minimumGroupingDigits', + 'fallback8bitEncoding', 'linkPrefixExtension', 'linkTrail', 'linkPrefixCharset', 'namespaceAliases', 'dateFormats', 'datePreferences', 'datePreferenceMigrationMap', 'defaultDateFormat', 'extraUserToggles', 'specialPageAliases', diff --git a/languages/Language.php b/languages/Language.php index 7ef441b..fdf2d05 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -3313,12 +3313,25 @@ */ function commafy( $number ) { $digitGroupingPattern = $this->digitGroupingPattern(); + $minimumGroupingDigits = $this->minimumGroupingDigits(); if ( $number === null ) { return ''; } if ( !$digitGroupingPattern || $digitGroupingPattern === "###,###,###" ) { - // default grouping is at thousands, use the same for ###,###,### pattern too. + // Default grouping is at thousands, use the same for ###,###,### pattern too. + // In some languages it's conventional not to insert a thousands separator + // in numbers that are four digits long (1000-9999). + if ( $minimumGroupingDigits ) { + // Number of '#' characters after last comma in the grouping pattern. + // The pattern is hardcoded here, but this would vary for different patterns. + $primaryGroupingSize = 3; + // Maximum length of a number to suppress digit grouping for. + $maximumLength = $minimumGroupingDigits + $primaryGroupingSize - 1; + if ( preg_match( '/^\-?\d{1,' . $maximumLength . '}(\.\d+)?$/', $number ) ) { + return $number; + } + } return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $number ) ) ); } else { // Ref: http://cldr.unicode.org/translation/number-patterns @@ -3382,6 +3395,13 @@ } /** + * @return int|null + */ + function minimumGroupingDigits() { + return self::$dataCache->getItem( $this->mCode, 'minimumGroupingDigits' ); + } + + /** * Take a list of strings and build a locale-friendly comma-separated * list, using the local comma-separator message. * The last two strings are chained with an "and". diff --git a/languages/classes/LanguageBe_tarask.php b/languages/classes/LanguageBe_tarask.php index 96e040f..1f9b767 100644 --- a/languages/classes/LanguageBe_tarask.php +++ b/languages/classes/LanguageBe_tarask.php @@ -53,20 +53,4 @@ return $s; } - - /** - * Four-digit number should be without group commas (spaces) - * So "1 234 567", "12 345" but "1234" - * - * @param string $_ - * - * @return string - */ - function commafy( $_ ) { - if ( preg_match( '/^-?\d{1,4}(\.\d*)?$/', $_ ) ) { - return $_; - } else { - return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) ); - } - } } diff --git a/languages/classes/LanguageBg.php b/languages/classes/LanguageBg.php deleted file mode 100644 index a592d02..0000000 --- a/languages/classes/LanguageBg.php +++ /dev/null @@ -1,45 +0,0 @@ -<?php -/** - * Bulgarian (Български) specific code. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * http://www.gnu.org/copyleft/gpl.html - * - * @file - * @ingroup Language - */ - -/** - * Bulgarian (Български) - * - * @ingroup Language - */ -class LanguageBg extends Language { - /** - * ISO number formatting: 123 456 789,99. - * Avoid tripple grouping by numbers with whole part up to 4 digits. - * - * @param string $_ - * - * @return string - */ - function commafy( $_ ) { - if ( !preg_match( '/^\d{1,4}$/', $_ ) ) { - return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) ); - } else { - return $_; - } - } -} diff --git a/languages/classes/LanguageEs.php b/languages/classes/LanguageEs.php deleted file mode 100644 index 098148f..0000000 --- a/languages/classes/LanguageEs.php +++ /dev/null @@ -1,42 +0,0 @@ -<?php -/** - * Spanish (español) specific code. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * http://www.gnu.org/copyleft/gpl.html - * - * @file - * @ingroup Language - */ - -/** - * Spanish (español) - * - * @ingroup Language - */ -class LanguageEs extends Language { - - /** - * @param string $_ - * @return string - */ - function commafy( $_ ) { - 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/LanguageEt.php b/languages/classes/LanguageEt.php deleted file mode 100644 index 759531b..0000000 --- a/languages/classes/LanguageEt.php +++ /dev/null @@ -1,42 +0,0 @@ -<?php -/** - * Estonian (eesti) specific code. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * http://www.gnu.org/copyleft/gpl.html - * - * @file - * @ingroup Language - */ - -/** - * Estonian (eesti) - * - * @ingroup Language - */ -class LanguageEt extends Language { - /** - * Avoid grouping whole numbers between -9999 to 9999 - * @param string $_ - * @return string - */ - function commafy( $_ ) { - 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/LanguageHy.php b/languages/classes/LanguageHy.php index 05b0ebe..602a589 100644 --- a/languages/classes/LanguageHy.php +++ b/languages/classes/LanguageHy.php @@ -78,19 +78,4 @@ } return $word; } - - /** - * Armenian numeric format is "12 345,67" but "1234,56" - * - * @param string $_ - * - * @return string - */ - function commafy( $_ ) { - if ( !preg_match( '/^\d{1,4}$/', $_ ) ) { - return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) ); - } else { - return $_; - } - } } diff --git a/languages/classes/LanguageKaa.php b/languages/classes/LanguageKaa.php index 30abe25..57f9529 100644 --- a/languages/classes/LanguageKaa.php +++ b/languages/classes/LanguageKaa.php @@ -75,19 +75,4 @@ return parent::lcfirst( $string ); } - /** - * Avoid grouping whole numbers between 0 to 9999 - * - * @param string $_ - * - * @return string - */ - function commafy( $_ ) { - if ( !preg_match( '/^\d{1,4}$/', $_ ) ) { - return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) ); - } else { - return $_; - } - } - } diff --git a/languages/classes/LanguageKk_cyrl.php b/languages/classes/LanguageKk_cyrl.php index da97c5e..7353a82 100644 --- a/languages/classes/LanguageKk_cyrl.php +++ b/languages/classes/LanguageKk_cyrl.php @@ -773,19 +773,4 @@ return $lastLetter; } - - /** - * Avoid grouping whole numbers between 0 to 9999 - * - * @param string $_ - * - * @return string - */ - function commafy( $_ ) { - if ( !preg_match( '/^\d{1,4}$/', $_ ) ) { - return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) ); - } else { - return $_; - } - } } diff --git a/languages/classes/LanguageKsh.php b/languages/classes/LanguageKsh.php index 9ef53e5..0185a03 100644 --- a/languages/classes/LanguageKsh.php +++ b/languages/classes/LanguageKsh.php @@ -164,21 +164,6 @@ } /** - * Avoid grouping whole numbers between 0 to 9999 - * - * @param string $_ - * - * @return string - */ - public function commafy( $_ ) { - if ( !preg_match( '/^\d{1,4}$/', $_ ) ) { - return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) ); - } else { - return $_; - } - } - - /** * Handle cases of (1, other, 0) or (1, other) * * @param int $count diff --git a/languages/classes/LanguageKu.php b/languages/classes/LanguageKu.php index c837409..ef77775 100644 --- a/languages/classes/LanguageKu.php +++ b/languages/classes/LanguageKu.php @@ -227,7 +227,7 @@ * * @ingroup Language */ -class LanguageKu extends LanguageKu_ku { +class LanguageKu extends Language { function __construct() { parent::__construct(); diff --git a/languages/classes/LanguageKu_ku.php b/languages/classes/LanguageKu_ku.php deleted file mode 100644 index a9db9e7..0000000 --- a/languages/classes/LanguageKu_ku.php +++ /dev/null @@ -1,45 +0,0 @@ -<?php -/** - * Kurdish specific code. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * http://www.gnu.org/copyleft/gpl.html - * - * @file - * @ingroup Language - */ - -/** - * Kurdish - * - * @ingroup Language - */ -// phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps -class LanguageKu_ku extends Language { - /** - * Avoid grouping whole numbers between 0 to 9999 - * - * @param string $_ - * - * @return string - */ - function commafy( $_ ) { - if ( !preg_match( '/^\d{1,4}$/', $_ ) ) { - return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) ); - } else { - return $_; - } - } -} diff --git a/languages/classes/LanguagePl.php b/languages/classes/LanguagePl.php deleted file mode 100644 index e0bf069..0000000 --- a/languages/classes/LanguagePl.php +++ /dev/null @@ -1,41 +0,0 @@ -<?php -/** - * Polish (polski) specific code. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * http://www.gnu.org/copyleft/gpl.html - * - * @file - * @ingroup Language - */ - -/** - * Polish (polski) - * - * @ingroup Language - */ -class LanguagePl extends Language { - /** - * @param string $_ - * @return string - */ - function commafy( $_ ) { - 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/LanguageRu.php b/languages/classes/LanguageRu.php deleted file mode 100644 index 7b15721..0000000 --- a/languages/classes/LanguageRu.php +++ /dev/null @@ -1,50 +0,0 @@ -<?php -/** - * Russian (русский язык) specific code. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * http://www.gnu.org/copyleft/gpl.html - * - * @file - * @ingroup Language - */ - -/** - * Russian (русский язык) - * - * You can contact: - * Alexander Sigachov (alexander.sigachov at Googgle Mail) - * Amir E. Aharoni ([email protected]) - * - * @ingroup Language - */ -class LanguageRu extends Language { - /** - * Four-digit number should be without group commas (spaces) - * See manual of style at https://ru.wikipedia.org/wiki/Википедия:Оформление_статей - * So "1 234 567", "12 345" but "1234" - * - * @param string $_ - * - * @return string - */ - function commafy( $_ ) { - if ( preg_match( '/^-?\d{1,4}(\.\d*)?$/', $_ ) ) { - return $_; - } else { - return strrev( (string)preg_replace( '/(\d{3})(?=\d)(?!\d*\.)/', '$1,', strrev( $_ ) ) ); - } - } -} diff --git a/languages/classes/LanguageUk.php b/languages/classes/LanguageUk.php deleted file mode 100644 index a155d03..0000000 --- a/languages/classes/LanguageUk.php +++ /dev/null @@ -1,48 +0,0 @@ -<?php -/** - * Ukrainian (українська мова) specific code. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * http://www.gnu.org/copyleft/gpl.html - * - * @file - * @ingroup Language - */ - -/** - * Ukrainian (українська мова) - * - * @ingroup Language - */ -class LanguageUk extends Language { - /** - * Ukrainian numeric format is "12 345,67" but "1234,56" - * - * @param string $_ - * - * @return string - */ - function commafy( $_ ) { - if ( !preg_match( '/^\-?\d{1,4}(\.\d+)?$/', $_ ) ) { - return strrev( (string)preg_replace( - '/(\d{3})(?=\d)(?!\d*\.)/', - '$1,', - strrev( $_ ) - ) ); - } else { - return $_; - } - } -} diff --git a/languages/messages/MessagesBe_tarask.php b/languages/messages/MessagesBe_tarask.php index a6fd58aa..ee2bbb3 100644 --- a/languages/messages/MessagesBe_tarask.php +++ b/languages/messages/MessagesBe_tarask.php @@ -236,6 +236,7 @@ ',' => "\xc2\xa0", # nbsp '.' => ',' ]; +$minimumGroupingDigits = 2; $linkTrail = '/^([абвгґджзеёжзійклмнопрстуўфхцчшыьэюяćčłńśšŭźža-z]+)(.*)$/sDu'; diff --git a/languages/messages/MessagesBg.php b/languages/messages/MessagesBg.php index 3a21e75..383a3cd 100644 --- a/languages/messages/MessagesBg.php +++ b/languages/messages/MessagesBg.php @@ -218,3 +218,4 @@ $linkTrail = '/^([a-zабвгдежзийклмнопрстуфхцчшщъыьэюя]+)(.*)$/sDu'; $separatorTransformTable = [ ',' => "\xc2\xa0", '.' => ',' ]; +$minimumGroupingDigits = 2; diff --git a/languages/messages/MessagesEs.php b/languages/messages/MessagesEs.php index d7a780e..16698d1 100644 --- a/languages/messages/MessagesEs.php +++ b/languages/messages/MessagesEs.php @@ -299,4 +299,6 @@ ]; $separatorTransformTable = [ ',' => "\xc2\xa0", '.' => ',' ]; +$minimumGroupingDigits = 2; + $linkTrail = '/^([a-záéíóúñ]+)(.*)$/sDu'; diff --git a/languages/messages/MessagesEt.php b/languages/messages/MessagesEt.php index fcc12c9..d2f8f32 100644 --- a/languages/messages/MessagesEt.php +++ b/languages/messages/MessagesEt.php @@ -259,6 +259,8 @@ ]; $separatorTransformTable = [ ',' => "\xc2\xa0", '.' => ',' ]; +$minimumGroupingDigits = 2; + $linkTrail = '/^([äöõšüža-z]+)(.*)$/sDu'; $datePreferences = [ diff --git a/languages/messages/MessagesHy.php b/languages/messages/MessagesHy.php index 9a5a809..34306d3 100644 --- a/languages/messages/MessagesHy.php +++ b/languages/messages/MessagesHy.php @@ -12,6 +12,7 @@ ',' => "\xc2\xa0", # nbsp '.' => ',' ]; +$minimumGroupingDigits = 2; $fallback8bitEncoding = 'UTF-8'; diff --git a/languages/messages/MessagesKaa.php b/languages/messages/MessagesKaa.php index 52e8e77..2c7cb9e 100644 --- a/languages/messages/MessagesKaa.php +++ b/languages/messages/MessagesKaa.php @@ -14,6 +14,7 @@ ',' => "\xc2\xa0", '.' => ',', ]; +$minimumGroupingDigits = 2; $fallback8bitEncoding = 'windows-1254'; diff --git a/languages/messages/MessagesKk_cyrl.php b/languages/messages/MessagesKk_cyrl.php index 2857721..c559d02 100644 --- a/languages/messages/MessagesKk_cyrl.php +++ b/languages/messages/MessagesKk_cyrl.php @@ -22,6 +22,7 @@ ',' => "\xc2\xa0", '.' => ',', ]; +$minimumGroupingDigits = 2; $fallback8bitEncoding = 'windows-1251'; diff --git a/languages/messages/MessagesKsh.php b/languages/messages/MessagesKsh.php index 1fef838..291ed14 100644 --- a/languages/messages/MessagesKsh.php +++ b/languages/messages/MessagesKsh.php @@ -95,6 +95,8 @@ ]; $separatorTransformTable = [ ',' => "\xc2\xa0", '.' => ',' ]; +$minimumGroupingDigits = 2; + $linkTrail = '/^([äöüėëijßəğåůæœça-z]+)(.*)$/sDu'; // Remove German aliases diff --git a/languages/messages/MessagesKu_latn.php b/languages/messages/MessagesKu_latn.php index 32844a2..c1bf76d 100644 --- a/languages/messages/MessagesKu_latn.php +++ b/languages/messages/MessagesKu_latn.php @@ -51,6 +51,7 @@ ]; $separatorTransformTable = [ ',' => '.', '.' => ',' ]; +$minimumGroupingDigits = 2; $specialPageAliases = [ 'Allmessages' => [ 'Hemû_Peyam' ], diff --git a/languages/messages/MessagesPl.php b/languages/messages/MessagesPl.php index 01a9d1a..1af008f 100644 --- a/languages/messages/MessagesPl.php +++ b/languages/messages/MessagesPl.php @@ -119,10 +119,12 @@ ]; $fallback8bitEncoding = 'iso-8859-2'; + $separatorTransformTable = [ ',' => "\xc2\xa0", // T4749 '.' => ',' ]; +$minimumGroupingDigits = 2; $linkTrail = '/^([a-zęóąśłżźćńĘÓĄŚŁŻŹĆŃ]+)(.*)$/sDu'; diff --git a/languages/messages/MessagesRu.php b/languages/messages/MessagesRu.php index b5f310d..1abecad 100644 --- a/languages/messages/MessagesRu.php +++ b/languages/messages/MessagesRu.php @@ -420,6 +420,7 @@ ',' => "\xc2\xa0", # nbsp '.' => ',' ]; +$minimumGroupingDigits = 2; $fallback8bitEncoding = 'windows-1251'; $linkPrefixExtension = false; diff --git a/languages/messages/MessagesUk.php b/languages/messages/MessagesUk.php index d851e1c..55bc1fc 100644 --- a/languages/messages/MessagesUk.php +++ b/languages/messages/MessagesUk.php @@ -58,6 +58,7 @@ ',' => "\xc2\xa0", # nbsp '.' => ',' ]; +$minimumGroupingDigits = 2; $fallback8bitEncoding = 'windows-1251'; $linkPrefixExtension = true; diff --git a/tests/phpunit/languages/classes/LanguagePlTest.php b/tests/phpunit/languages/classes/LanguagePlTest.php index d7a0074..1487729 100644 --- a/tests/phpunit/languages/classes/LanguagePlTest.php +++ b/tests/phpunit/languages/classes/LanguagePlTest.php @@ -76,7 +76,7 @@ } /** - * @covers LanguagePl::commafy() + * @covers Language::commafy() * @dataProvider provideCommafyData */ public function testCommafy( $number, $numbersWithCommas ) { diff --git a/tests/phpunit/languages/classes/LanguageRuTest.php b/tests/phpunit/languages/classes/LanguageRuTest.php index 9124040..3e120f4 100644 --- a/tests/phpunit/languages/classes/LanguageRuTest.php +++ b/tests/phpunit/languages/classes/LanguageRuTest.php @@ -6,9 +6,6 @@ * @file */ -/** - * @covers LanguageRu - */ class LanguageRuTest extends LanguageClassesTestCase { /** * @dataProvider providePlural diff --git a/tests/phpunit/languages/classes/LanguageUkTest.php b/tests/phpunit/languages/classes/LanguageUkTest.php index 3791622..0ccebbe 100644 --- a/tests/phpunit/languages/classes/LanguageUkTest.php +++ b/tests/phpunit/languages/classes/LanguageUkTest.php @@ -6,9 +6,6 @@ * @file */ -/** - * @covers LanguageUk - */ class LanguageUkTest extends LanguageClassesTestCase { /** * @dataProvider providePlural -- To view, visit https://gerrit.wikimedia.org/r/383444 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iedd8de5648cf2de1c94044918626de2f96365d48 Gerrit-PatchSet: 11 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński <[email protected]> Gerrit-Reviewer: Amire80 <[email protected]> Gerrit-Reviewer: Bartosz Dziewoński <[email protected]> Gerrit-Reviewer: Catrope <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: Nikerabbit <[email protected]> Gerrit-Reviewer: Santhosh <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
