Skip to content

Commit

Permalink
https://github.com/innomuebles/m2/issues/25
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitrii-fediuk committed Jan 31, 2024
1 parent 26431e8 commit 504ede0
Show file tree
Hide file tree
Showing 3 changed files with 245 additions and 0 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
# "How to fix the «Invalid template file» / «require_js.phtml» failure of Magento 2.3.x in Windows?"
# https://mage2.pro/t/5774
!/vendor/magento/framework/View/Element/Template/File/Validator.php
# 2024-01-31 Dmitrii Fediuk https://upwork.com/fl/mage2pro
# "Add the modified Magento files to the source control": https://github.com/innomuebles/m2/issues/25
!/vendor/magento/framework/Locale/Format.php
# 2021-05-14 Dmitrii Fediuk https://upwork.com/fl/mage2pro
# 1) «Broken reference: the 'view.addto.compare' tries to reorder itself towards 'view.addto.wishlist',
# but their parents are different: 'product.info.addto' and 'product.info.addtocart' respectively»:
Expand All @@ -29,6 +32,9 @@
# but their parents are different: 'skip_gallery_before.wrapper' and 'product.info.media' respectively»:
# https://github.com/innomuebles/m2/issues/19
!/vendor/magento/module-catalog/view/frontend/layout/catalog_product_view.xml
# 2024-01-31 Dmitrii Fediuk https://upwork.com/fl/mage2pro
# "Add the modified Magento files to the source control": https://github.com/innomuebles/m2/issues/25
!/vendor/magento/zendframework1/library/Zend/Locale/Data/es_CR.xml
/dev
/vendor/codeception
/vendor/magento/framework/Test
Expand Down
207 changes: 207 additions & 0 deletions vendor/magento/framework/Locale/Format.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\Framework\Locale;

/**
* Price locale format.
*/
class Format implements \Magento\Framework\Locale\FormatInterface
{
/**
* Japan locale code
*/
private const JAPAN_LOCALE_CODE = 'ja_JP';

/**
* Arab locale code
*/
private const ARABIC_LOCALE_CODES = [
'ar_DZ',
'ar_EG',
'ar_KW',
'ar_MA',
'ar_SA',
];

/**
* @var \Magento\Framework\App\ScopeResolverInterface
*/
protected $_scopeResolver;

/**
* @var \Magento\Framework\Locale\ResolverInterface
*/
protected $_localeResolver;

/**
* @var \Magento\Directory\Model\CurrencyFactory
*/
protected $currencyFactory;

/**
* @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
* @param ResolverInterface $localeResolver
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
*/
public function __construct(
\Magento\Framework\App\ScopeResolverInterface $scopeResolver,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
\Magento\Directory\Model\CurrencyFactory $currencyFactory
) {
$this->_scopeResolver = $scopeResolver;
$this->_localeResolver = $localeResolver;
$this->currencyFactory = $currencyFactory;
}

/**
* Returns the first found number from a string.
*
* Parsing depends on given locale (grouping and decimal)
*
* Examples for input:
* ' 2345.4356,1234' = 23455456.1234
* '+23,3452.123' = 233452.123
* ' 12343 ' = 12343
* '-9456km' = -9456
* '0' = 0
* '2 054,10' = 2054.1
* '2'054.52' = 2054.52
* '2,46 GB' = 2.46
*
* @param string|float|int $value
* @return float|null
*/
public function getNumber($value)
{
if ($value === null) {
return null;
}

if (!is_string($value)) {
return (float)$value;
}

/** Normalize for Arabic locale */
if (in_array($this->_localeResolver->getLocale(), self::ARABIC_LOCALE_CODES)) {
$value = $this->normalizeArabicLocale($value);
}

//trim spaces and apostrophes
$value = preg_replace('/[^0-9^\^.,-]/m', '', $value);

$separatorComa = strpos($value, ',');
$separatorDot = strpos($value, '.');

if ($separatorComa !== false && $separatorDot !== false) {
if ($separatorComa > $separatorDot) {
$value = str_replace(['.', ','], ['', '.'], $value);
} else {
$value = str_replace(',', '', $value);
}
} elseif ($separatorComa !== false) {
$locale = $this->_localeResolver->getLocale();
/**
* It's hard code for Japan locale.
* Comma separator uses as group separator: 4,000 saves as 4,000.00
*/
$value = str_replace(
',',
$locale === self::JAPAN_LOCALE_CODE ? '' : '.',
$value
);
}

return (float)$value;
}

/**
* Returns an array with price formatting info
*
* @param string $localeCode Locale code.
* @param string $currencyCode Currency code.
* @return array
*/
public function getPriceFormat($localeCode = null, $currencyCode = null)
{
$localeCode = $localeCode ?: $this->_localeResolver->getLocale();
if ($currencyCode) {
$currency = $this->currencyFactory->create()->load($currencyCode);
} else {
$currency = $this->_scopeResolver->getScope()->getCurrentCurrency();
}

$formatter = new \NumberFormatter(
$currency->getCode() ? $localeCode . '@currency=' . $currency->getCode() : $localeCode,
\NumberFormatter::CURRENCY
);
$format = $formatter->getPattern();
$decimalSymbol = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
$groupSymbol = $formatter->getSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL);

// custom code starts here
if($localeCode == "es_CR") {
$decimalSymbol = '.';
$groupSymbol = ',';
}
// custom code end here

$pos = strpos($format, ';');
if ($pos !== false) {
$format = substr($format, 0, $pos);
}
$format = preg_replace("/[^0\#\.,]/", '', $format);
$totalPrecision = 0;
$decimalPoint = strpos($format, '.');
if ($decimalPoint !== false) {
$totalPrecision = strlen($format) - (strrpos($format, '.') + 1);
} else {
$decimalPoint = strlen($format);
}
$requiredPrecision = $totalPrecision;
$t = substr($format, $decimalPoint);
$pos = strpos($t, '#');
if ($pos !== false) {
$requiredPrecision = strlen($t) - $pos - $totalPrecision;
}

if (strrpos($format, ',') !== false) {
$group = $decimalPoint - strrpos($format, ',') - 1;
} else {
$group = strrpos($format, '.');
}

$result = [
//TODO: change interface
'pattern' => $currency->getOutputFormat(),
'precision' => $totalPrecision,
'requiredPrecision' => $requiredPrecision,
'decimalSymbol' => $decimalSymbol,
'groupSymbol' => $groupSymbol,
'groupLength' => $group,
'integerRequired' => $totalPrecision == 0,
];

return $result;
}

/**
* Normalizes the number of Arabic locale.
*
* Substitutes Arabic thousands grouping and Arabic decimal separator symbols (U+066C, U+066B)
* with common grouping and decimal separator
*
* @param string $value
* @return string
*/
private function normalizeArabicLocale($value): string
{
$arabicGroupSymbol = '٬';
$arabicDecimalSymbol = '٫';
$value = str_replace([$arabicGroupSymbol, $arabicDecimalSymbol], [',', '.'], $value);

return $value;
}
}
32 changes: 32 additions & 0 deletions vendor/magento/zendframework1/library/Zend/Locale/Data/es_CR.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
<!-- Copyright © 1991-2013 Unicode, Inc.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
For terms of use, see http://www.unicode.org/copyright.html
-->
<ldml>
<identity>
<version number="$Revision: 9061 $"/>
<generation date="$Date: 2013-07-20 12:27:45 -0500 (Sat, 20 Jul 2013) $"/>
<language type="es"/>
<territory type="CR"/>
</identity>
<numbers>
<symbols numberSystem="latn">
<decimal>.</decimal>
<group>,</group>
</symbols>
<currencyFormats numberSystem="latn">
<currencyFormatLength>
<currencyFormat type="standard">
<pattern>¤#,##0.00;¤-#,##0.00</pattern>
</currencyFormat>
</currencyFormatLength>
</currencyFormats>
<currencies>
<currency type="CRC">
<symbol>₡</symbol>
</currency>
</currencies>
</numbers>
</ldml>

0 comments on commit 504ede0

Please sign in to comment.