@designcrowd/fe-shared-lib 1.2.17-ml-currency-2 → 1.2.17-ml-currency-3

package/Dockerfile

@@ -29,7 +29,7 @@ COPY .npmignore ./
 RUN npm run bundle-translation
 
 RUN mkdir artifacts
-RUN npm publish --otp=752654 || (touch artifacts/npm_publish_failed && exit 1)
+RUN npm publish --otp=810416 || (touch artifacts/npm_publish_failed && exit 1)
 RUN cp package.json artifacts/
 
 ENTRYPOINT ["/bin/echo", "Nothing to do."]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@designcrowd/fe-shared-lib",
-  "version": "1.2.17-ml-currency-2",
+  "version": "1.2.17-ml-currency-3",
   "scripts": {
     "start": "run-p storybook watch:translation",
     "build": "npm run build:css --production",

package/src/atoms/components/Price/Price.fixtures.js

@@ -82,4 +82,4 @@ export const currencies = [
   zarCurrency,
 ];
 
-export const locales = [ 'en_US', 'fr_FR', 'es_ES', 'pt_PT', 'de-DE']
+export const locales = [ 'en-US', 'fr-FR', 'es-ES', 'pt-PT', 'de-DE']

package/src/atoms/components/Price/Price.vue

@@ -102,7 +102,7 @@ export default {
       return parsedAmount.toFixed(this.fraction);
     },
     currencyAbbreviation() {
-      return this.showAbbreviation && this.amount && !this.locale > 0 ? this.currency?.abbreviation?.trim() : '';
+      return this.showAbbreviation && this.amount && !this.locale ? this.currency?.abbreviation?.trim() : '';
     },
     currencySymbol() {
       if (!this.amount || this.amount === 0 || this.locale) {

package/src/useSharedLibTranslate.js

@@ -78,7 +78,7 @@ const formatCurrency = (amount, locale, currency, fraction = 0, showAbbreviation
   });
 
   // i18next always uses iso code for ZAR, prefer symbol over iso code
-  if (localeAmount.includes(currency.iso4127Code)) {
+  if (localeAmount.includes(currency.iso4127Code) && currency.iso4127Code === 'ZAR') {
     return localeAmount.replace(currency.iso4127Code, currency.symbol);
   }
 
@@ -88,16 +88,23 @@ const formatCurrency = (amount, locale, currency, fraction = 0, showAbbreviation
     return localeAmount;
   }
 
-  // AUD edge case for en_US
+  const abbreviationTrimmed = currency.abbreviation.trim();
+  const symbolTrimmed = currency.symbol.trim();
+
+  // AUD edge case for en-US
   if (currency.iso4127Code === 'AUD') {
-    localeAmount = localeAmount.replace('A$', currency.symbol);
+    localeAmount = localeAmount.replace('A$', symbolTrimmed);
+  }
+
+  // edge case for pt-PT
+  if (localeAmount.includes(currency.iso4127Code)) {
+    localeAmount = localeAmount.replace(currency.iso4127Code,`${abbreviationTrimmed}${symbolTrimmed}`);
   }
 
-  if (showAbbreviation && !localeAmount.includes(currency.abbreviation)) {
-    return `${currency?.abbreviation}${localeAmount}`;
-  
-  } else if (!showAbbreviation && localeAmount.includes(currency.abbreviation)) {
-    return localeAmount.replace(currency.abbreviation, '');
+  if (showAbbreviation && !localeAmount.includes(abbreviationTrimmed)) {
+    return localeAmount.replace(symbolTrimmed,`${abbreviationTrimmed}${symbolTrimmed}`);
+  } else if (!showAbbreviation && localeAmount.includes(abbreviationTrimmed)) {
+    return localeAmount.replace(abbreviationTrimmed, '');
   }
 
   return localeAmount;