FIX decimal separator should be used from Locale (trustwallet#927)

* FIX decimal separator should be used from Locale * Update EtherNumberFormatter.swift
Quanhua-Guan · Nov 16, 2018 · 262b8a1 · 262b8a1
1 parent 6a911e7
commit 262b8a1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Trust/Foundation/EtherNumberFormatter.swift b/Trust/Foundation/EtherNumberFormatter.swift
@@ -25,9 +25,12 @@ final class EtherNumberFormatter {
 
     /// Thousands separator.
     var groupingSeparator = ","
+
+    let locale: Locale
 
     /// Initializes a `EtherNumberFormatter` with a `Locale`.
     init(locale: Locale = .current) {
+        self.locale = locale
         decimalSeparator = locale.decimalSeparator ?? "."
         groupingSeparator = locale.groupingSeparator ?? ","
     }
@@ -103,7 +106,7 @@ final class EtherNumberFormatter {
         if fractionalString.isEmpty {
             return integerString
         }
-        return "\(integerString).\(fractionalString)"
+        return "\(integerString)\(self.decimalSeparator)\(fractionalString)"
     }
     /// Formats a `BigInt` to a Decimal.
     ///
@@ -121,7 +124,7 @@ final class EtherNumberFormatter {
         if fractionalString.isEmpty {
             return Decimal(string: integerString)
         }
-        return Decimal(string: "\(integerString).\(fractionalString)")
+        return Decimal(string: "\(integerString)\(self.decimalSeparator)\(fractionalString)", locale: locale)
     }
     private func integerString(from: BigInt) -> String {
         var string = from.description