ACP2E-1012: No space between a custom currency symbol and a price

Author: pradeep1819

app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php

@@ -27,15 +27,11 @@ class Currencysymbol
     protected $_symbolsData = [];
 
     /**
-     * Store id
-     *
      * @var string|null
      */
     protected $_storeId;
 
     /**
-     * Website id
-     *
      * @var string|null
      */
     protected $_websiteId;
@@ -55,19 +51,19 @@ class Currencysymbol
     /**
      * Config path to custom currency symbol value
      */
-    const XML_PATH_CUSTOM_CURRENCY_SYMBOL = 'currency/options/customsymbol';
+    public const XML_PATH_CUSTOM_CURRENCY_SYMBOL = 'currency/options/customsymbol';
 
-    const XML_PATH_ALLOWED_CURRENCIES = \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW;
+    public const XML_PATH_ALLOWED_CURRENCIES = \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW;
 
     /*
      * Separator used in config in allowed currencies list
      */
-    const ALLOWED_CURRENCIES_CONFIG_SEPARATOR = ',';
+    public const ALLOWED_CURRENCIES_CONFIG_SEPARATOR = ',';
 
     /**
      * Config currency section
      */
-    const CONFIG_SECTION = 'currency';
+    public const CONFIG_SECTION = 'currency';
 
     /**
      * Core event manager proxy

app/code/Magento/Directory/Model/Currency.php

@@ -6,14 +6,14 @@
 
 namespace Magento\Directory\Model;
 
+use Magento\Directory\Model\Currency\Filter;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
-use Magento\Directory\Model\Currency\Filter;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Locale\Currency as LocaleCurrency;
 use Magento\Framework\Locale\ResolverInterface as LocalResolverInterface;
 use Magento\Framework\NumberFormatterFactory;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Currency model
@@ -432,6 +432,11 @@ private function formatCurrency(string $price, array $options): string
             $this->getCode() ?? $this->numberFormatter->getTextAttribute(\NumberFormatter::CURRENCY_CODE)
         );
 
+        if (array_key_exists(LocaleCurrency::CURRENCY_OPTION_SYMBOL, $options)
+            && !array_key_exists(LocaleCurrency::CURRENCY_OPTION_DISPLAY, $options)) {
+            // remove only one non-breaking space from custom currency symbol to allow custom NBSP in currency symbol
+            $formattedCurrency = preg_replace('/ /u', '', $formattedCurrency, 1);
+        }
         if ((array_key_exists(LocaleCurrency::CURRENCY_OPTION_DISPLAY, $options)
             && $options[LocaleCurrency::CURRENCY_OPTION_DISPLAY] === \Magento\Framework\Currency::NO_SYMBOL)) {
             $formattedCurrency = str_replace(' ', '', $formattedCurrency);
@@ -586,7 +591,7 @@ public function saveRates($rates)
     private function trimUnicodeDirectionMark($string)
     {
         if (preg_match('/^(\x{200E}|\x{200F})/u', $string, $match)) {
-            $string = preg_replace('/^'.$match[1].'/u', '', $string);
+            $string = preg_replace('/^' . $match[1] . '/u', '', $string);
         }
         return $string;
     }