feat(siteStats): ✨ always use NumberFormatter for site stats

- Use fallback chain to create NumberFormatter (T376711)
- Drop `$wgCitizenUseNumberFormatter`
- Minor refactor

Author: alistair3149

docs/src/config/index.md

@@ -78,16 +78,6 @@ $wgCitizenEnableDrawerSiteStats = true;
 
 **Values**: `true`, `false`
 
-### `$wgCitizenUseNumberFormatter`
-
-Formats numbers in site statistics according to the wiki's language rules (e.g., using commas or dots as separators).
-
-```php [LocalSettings.php]
-$wgCitizenUseNumberFormatter = true;
-```
-
-**Values**: `true`, `false`
-
 ### `$wgCitizenThemeColor`
 
 Sets the color of the browser address bar on mobile devices to match your brand.

includes/Components/CitizenComponentSiteStats.php

@@ -4,12 +4,16 @@
 
 namespace MediaWiki\Skins\Citizen\Components;
 
-use IntlException;
 use MediaWiki\Config\Config;
 use MediaWiki\Language\Language;
+use MediaWiki\Languages\LanguageNameUtils;
+use MediaWiki\MainConfigNames;
 use MediaWiki\SiteStats\SiteStats;
+use Locale;
 use MessageLocalizer;
 use NumberFormatter;
+use RuntimeException;
+use ValueError;
 
 /**
  * CitizenComponentSiteStats component
@@ -24,51 +28,92 @@ class CitizenComponentSiteStats implements CitizenComponent {
 		'edits' => 'edit'
 	];
 
+	private ?NumberFormatter $fmt = null;
+
 	public function __construct(
 		private readonly Config $config,
 		private readonly MessageLocalizer $localizer,
-		private readonly Language $lang
+		private readonly Language $lang,
+		private readonly LanguageNameUtils $langNameUtils
 	) {
 	}
 
-	/**
-	 * Get and format sitestat value
-	 */
-	private function getSiteStatValue( string $key, ?NumberFormatter $fmt ): string {
+	private function createNumberFormatter( string $locale ): ?NumberFormatter {
+		try {
+			return new NumberFormatter(
+				$locale,
+				// PHP 8.4 introduced NumberFormatter::DECIMAL_COMPACT_SHORT
+				defined( 'NumberFormatter::DECIMAL_COMPACT_SHORT' )
+					? NumberFormatter::DECIMAL_COMPACT_SHORT
+					: 14
+			);
+		} catch ( ValueError $exception ) {
+			// Value Errors are thrown since php8.4 for invalid locales (T376711)
+			return null;
+		}
+	}
+
+	private function getNumberFormatter(): NumberFormatter {
+		if ( $this->fmt ) {
+			return $this->fmt;
+		}
+
+		$locale = $this->lang->getCode();
+
+		if ( !(
+			$this->config->get( MainConfigNames::TranslateNumerals )
+			&& $this->langNameUtils->isValidCode( $locale )
+		) ) {
+			$locale = Locale::getDefault(); // POSIX system default locale
+		}
+
+		$fmt = $this->createNumberFormatter( $locale );
+
+		if ( !$fmt ) {
+			$fallbacks = $this->lang->getFallbackLanguages( $locale );
+			foreach ( $fallbacks as $fallbackCode ) {
+				$fmt = $this->createNumberFormatter( $fallbackCode );
+				if ( $fmt ) {
+					break;
+				}
+			}
+			if ( !$fmt ) {
+				throw new RuntimeException(
+					'Could not instance NumberFormatter for ' . $locale . ' and all fallbacks'
+				);
+			}
+		}
+
+		$fmt->setAttribute( NumberFormatter::ROUNDING_MODE, NumberFormatter::ROUND_DOWN );
+		$fmt->setAttribute( NumberFormatter::MAX_FRACTION_DIGITS, 1 );
+
+		$this->fmt = $fmt;
+
+		return $this->fmt;
+	}
+
+	private function getSiteStatValue( string $key ): string {
 		$value = SiteStats::$key();
 
 		if ( !$value ) {
 			return '';
 		}
 
-		return $fmt ? $fmt->format( $value ) : number_format( $value );
+		return (string)$this->getNumberFormatter()->format( $value );
 	}
 
 	public function getTemplateData(): array {
-		$config = $this->config;
-		if ( !$config->get( 'CitizenEnableDrawerSiteStats' ) ) {
+		if ( !$this->config->get( 'CitizenEnableDrawerSiteStats' ) ) {
 			return [];
 		}
 
 		$items = [];
-		$fmt = null;
-
-		// Get NumberFormatter here so that we don't have to call it for every stats
-		if ( $config->get( 'CitizenUseNumberFormatter' ) && class_exists( NumberFormatter::class ) ) {
-			$locale = $this->lang->getHtmlCode() ?? 'en_US';
-
-			try {
-				$fmt = new NumberFormatter( $locale, NumberFormatter::PADDING_POSITION );
-				$fmt->setAttribute( NumberFormatter::ROUNDING_MODE, NumberFormatter::ROUND_DOWN );
-				$fmt->setAttribute( NumberFormatter::MAX_FRACTION_DIGITS, 1 );
-			} catch ( IntlException $exception ) {}
-		}
 
 		foreach ( self::SITESTATS_ICON_MAP as $key => $icon ) {
 			$items[] = [
 				'id' => $key,
 				'icon' => $icon,
-				'value' => $this->getSiteStatValue( $key, $fmt ),
+				'value' => $this->getSiteStatValue( $key ),
 				'label' => $this->localizer->msg( "citizen-sitestats-$key-label" )->text(),
 			];
 		}

includes/SkinCitizen.php

@@ -5,8 +5,8 @@
 namespace MediaWiki\Skins\Citizen;
 
 use MediaWiki\Cache\GenderCache;
-use MediaWiki\Language\Language;
 use MediaWiki\Languages\LanguageConverterFactory;
+use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\Skins\Citizen\Components\CitizenComponentBodyContent;
@@ -50,7 +50,7 @@ public function __construct(
 		private readonly GenderCache $genderCache,
 		private readonly UserIdentityLookup $userIdentityLookup,
 		private readonly LanguageConverterFactory $languageConverterFactory,
-		private readonly Language $contentLanguage,
+		private readonly LanguageNameUtils $languageNameUtils,
 		private readonly PermissionManager $permissionManager,
 		private readonly ExtensionRegistry $extensionRegistry,
 		private readonly UserGroupManager $userGroupManager,
@@ -102,7 +102,6 @@ public function getTemplateData(): array {
 		$out = $this->getOutput();
 		$title = $this->getTitle();
 		$user = $this->getUser();
-		$pageLang = $title->getPageLanguage();
 
 		$sidebar = $parentData['data-portlets-sidebar'];
 		$pageToolsMenu = [];
@@ -155,7 +154,8 @@ public function getTemplateData(): array {
 			'data-site-stats' => new CitizenComponentSiteStats(
 				$config,
 				$localizer,
-				$lang
+				$lang,
+				$this->languageNameUtils
 			),
 			'data-user-info' => new CitizenComponentUserInfo(
 				$this->userGroupManager,

skin.json

@@ -34,7 +34,7 @@
 				"GenderCache",
 				"UserIdentityLookup",
 				"LanguageConverterFactory",
-				"ContentLanguage",
+				"LanguageNameUtils",
 				"PermissionManager",
 				"ExtensionRegistry",
 				"UserGroupManager",
@@ -846,12 +846,6 @@
 			"descriptionmsg": "citizen-config-enabledrawersitestats",
 			"public": true
 		},
-		"UseNumberFormatter": {
-			"value": true,
-			"description": "Use NumberFormatter for site statistics",
-			"descriptionmsg": "citizen-config-usenumberformatter",
-			"public": true
-		},
 		"EnableCJKFonts": {
 			"value": false,
 			"description": "Enable included Noto Sans CJK for wikis that serves CJK languages",