From 8af3735d9fbb631540128ea74411da4c7cb40963 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 30 Oct 2023 10:46:43 +1300
Subject: [PATCH] Move the locale default getting from the money() funciton to
 the getFormatter function

---
 Civi/Core/Format.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Civi/Core/Format.php b/Civi/Core/Format.php
index d7041e00ef..6531868871 100644
--- a/Civi/Core/Format.php
+++ b/Civi/Core/Format.php
@@ -44,10 +44,6 @@ class Format extends \Civi\Core\Service\AutoService {
     if (!$currency) {
       $currency = Civi::settings()->get('defaultCurrency');
     }
-    if (!isset($locale)) {
-      global $civicrmLocale;
-      $locale = $civicrmLocale->moneyFormat ?? (Civi::settings()->get('format_locale') ?? CRM_Core_I18n::getLocale());
-    }
     $currencyObject = CRM_Utils_Money::getCurrencyObject($currency);
     $money = Money::of($amount, $currencyObject, NULL, RoundingMode::HALF_UP);
     $formatter = $this->getMoneyFormatter($currency, $locale);
@@ -92,7 +88,7 @@ class Format extends \Civi\Core\Service\AutoService {
    * @noinspection PhpDocMissingThrowsInspection
    * @noinspection PhpUnhandledExceptionInspection
    */
-  public function moneyNumber($amount, string $currency, $locale): string {
+  public function moneyNumber($amount, string $currency, $locale = NULL): string {
     if (($amount = $this->checkAndConvertAmount($amount)) === '') {
       return '';
     }
@@ -195,9 +191,7 @@ class Format extends \Civi\Core\Service\AutoService {
   }
 
   /**
-   * Get the money formatter for when we are using configured thousand separators.
-   *
-   * Our intent is to phase out these settings in favour of deriving them from the locale.
+   * Get the cached money formatter.
    *
    * @param string|null $currency
    * @param string|null $locale
@@ -215,7 +209,10 @@ class Format extends \Civi\Core\Service\AutoService {
     if (!$currency) {
       $currency = Civi::settings()->get('defaultCurrency');
     }
-    $locale = $locale ?: \Civi\Core\Locale::detect()->moneyFormat;
+    if (!isset($locale)) {
+      global $civicrmLocale;
+      $locale = $civicrmLocale->moneyFormat ?? (Civi::settings()->get('format_locale') ?? CRM_Core_I18n::getLocale());
+    }
 
     $cacheKey = __CLASS__ . $currency . '_' . $locale . '_' . $style . (!empty($attributes) ? md5(json_encode($attributes)) : '');
     if (!isset(\Civi::$statics[$cacheKey])) {
-- 
2.25.1