Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into Branch_developer

lib/internal/Magento/Framework/Locale/Format.php

@@ -171,8 +171,10 @@ class Format implements \Magento\Framework\Locale\FormatInterface
             'pattern' => $currency->getOutputFormat(),
             'pattern' => $currency->getOutputFormat(),
             'precision' => $totalPrecision,
             'precision' => $totalPrecision,
             'requiredPrecision' => $requiredPrecision,
             'requiredPrecision' => $requiredPrecision,
-            'decimalSymbol' => $decimalSymbol,
-            'groupSymbol' => $groupSymbol,
+           /* 'decimalSymbol' => $decimalSymbol,   框架旧代码,这里有bug
+            'groupSymbol' => $groupSymbol,*/
+            'decimalSymbol' => '.',
+            'groupSymbol' => ',',
             'groupLength' => $group,
             'groupLength' => $group,
             'integerRequired' => $totalPrecision == 0,
             'integerRequired' => $totalPrecision == 0,
         ];
         ];

vendor/magento/zendframework1/library/Zend/Locale/Data/es.xml

@@ -3629,10 +3629,10 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<currencyFormats numberSystem="latn">
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 				<currencyFormat type="standard">
-					<pattern>#,##0.00 ¤</pattern>
+					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 				<currencyFormat type="accounting">
-					<pattern>#,##0.00 ¤</pattern>
+					<pattern>¤#,##0.00</pattern>
 				</currencyFormat>
 				</currencyFormat>
 			</currencyFormatLength>
 			</currencyFormatLength>
 			<unitPattern count="one">{0} {1}</unitPattern>
 			<unitPattern count="one">{0} {1}</unitPattern>