DIG-27962 viser valuta før sum for engelsk locale

SpareBank1 · Oct 26, 2017 · be3b470 · be3b470
1 parent ed7f411
commit be3b470
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/util/format.js b/src/util/format.js
@@ -1,5 +1,5 @@
 import amountFormatter from 'nfe-amount-formatter';
-import {currencyPostfix} from './types';
+import { currencyAffixNOK } from './types';
 
 const getWeightedSumOfDigits = (accountNumber) => {
   const weights = [5, 4, 3, 2, 7, 6, 5, 4, 3, 2, 1];
@@ -27,10 +27,8 @@ export function accountFormatter(accountNumber) {
 }
 
 export function balanceWithCurrency(balance = '', locale, currencyCode) {
-  if (currencyCode && currencyCode !== "NOK") {
-    return `${amountFormatter(balance, locale)} ${currencyCode}`;
-  }
-
-  return `${amountFormatter(balance, locale)} ${currencyPostfix[locale]}`;
+  const amount = amountFormatter(balance, locale);
+  const currencyAffix = (currencyCode && currencyCode !== "NOK")? currencyCode : currencyAffixNOK[locale];
+  return (locale === 'en')? `${currencyAffix} ${amount}` : `${amount} ${currencyAffix}`;
 }
 
diff --git a/src/util/types.js b/src/util/types.js
@@ -4,7 +4,7 @@ export const nb = 'nb';
 export const en = 'en';
 export const nn = 'nn';
 
-export const currencyPostfix = {
+export const currencyAffixNOK = {
   [nb]: 'kr',
   [nn]: 'kr',
   [en]: 'NOK'