slightly improve search of appropriate locale for currency formatting

Sega-Zero · Nov 24, 2019 · 6d23cfb · 6d23cfb
1 parent d48acef
commit 6d23cfb
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/iso4217/Classes/CurrencyCode+Extensions.swift b/iso4217/Classes/CurrencyCode+Extensions.swift
@@ -24,14 +24,12 @@ private extension CurrencyCode {
     }
 
     var locale: Locale {
-        for localeId in Locale.availableIdentifiers {
-            let locale = Locale(identifier: localeId)
-            if let code = locale.currencyCode, code == self.rawValue {
-                return locale
-            }
+        let appropriateLocales: [Locale] = Locale.availableIdentifiers.compactMap {
+            let locale = Locale(identifier: $0)
+            guard let code = locale.currencyCode, code == self.rawValue else { return nil }
+            return locale
         }
-
-        return self.canonicalLocale
+        return appropriateLocales.first(where: { $0.currencySymbol != $0.currencyCode }) ?? appropriateLocales.first ?? self.canonicalLocale
     }
 
     var priceLocale: Locale {