Default to formatting money according to default locale

headsnet · Feb 27, 2023 · 58e3f03 · 58e3f03
1 parent 0489416
commit 58e3f03
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -20,6 +20,7 @@
         </service>
 
         <service id="headsnet_money.twig.extension.format" class="Headsnet\MoneyBundle\Twig\Extension\FormatMoneyExtension" public="false">
+            <argument type="service" id="request_stack"/>
             <tag name="twig.extension"/>
         </service>
 

diff --git a/src/Twig/Extension/FormatMoneyExtension.php b/src/Twig/Extension/FormatMoneyExtension.php
@@ -13,6 +13,7 @@
 use Money\Currencies\ISOCurrencies;
 use Money\Formatter\IntlMoneyFormatter;
 use Money\Money;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 
@@ -21,16 +22,24 @@
  */
 class FormatMoneyExtension extends AbstractExtension
 {
+    private RequestStack $requestStack;
+
+    public function __construct(RequestStack $requestStack)
+    {
+        $this->requestStack = $requestStack;
+    }
+
     public function getFilters(): array
     {
         return [new TwigFilter('money', [$this, 'moneyFilter'])];
     }
 
-    public function moneyFilter(Money $money): string
+    public function moneyFilter(Money $money, string $locale = null): string
     {
+        $defaultLocale = $this->requestStack->getCurrentRequest()->getLocale();
         $currencies = new ISOCurrencies();
 
-        $numberFormatter = new \NumberFormatter('fr_FR', \NumberFormatter::CURRENCY);
+        $numberFormatter = new \NumberFormatter($locale ?? $defaultLocale ?? 'fr_FR', \NumberFormatter::CURRENCY);
         $moneyFormatter = new IntlMoneyFormatter($numberFormatter, $currencies);
 
         return $moneyFormatter->format($money);