Merge pull request #4 from graycampbell/bug-fixes

Update localized display name locale to improve accuracy
graycampbell · Oct 3, 2017 · 402dcfe · 402dcfe
2 parents 06e10aa + 79a9620
commit 402dcfe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/GCCountryPicker/GCCountry.swift b/GCCountryPicker/GCCountry.swift
@@ -34,7 +34,7 @@ public struct GCCountry {
 
     public init?(countryCode: String) {
 
-        if let localizedDisplayName = Locale.current.localizedString(forRegionCode: countryCode) {
+        if let localizedDisplayName = Locale(identifier: Locale.preferredLanguages.first!).localizedString(forRegionCode: countryCode) {
 
             self.countryCode = countryCode
             self.localizedDisplayName = localizedDisplayName

diff --git a/GCCountryPickerDemo/ViewController.swift b/GCCountryPickerDemo/ViewController.swift
@@ -35,7 +35,7 @@ extension ViewController {
 
     fileprivate func configureNavigationBar() {
 
-        self.navigationItem.title = Locale.current.localizedString(forRegionCode: "US")
+        self.navigationItem.title = GCCountry(countryCode: "US")?.localizedDisplayName
         self.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .edit, target: self, action: #selector(self.showCountryPicker(barButtonItem:)))
     }