Merge pull request #21 from transifex/fix-default-locale-provider

Preferred locale provider returns correct language code

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Transifex iOS SDK 0.1.0
 
-*Febrary 4, 2021*
+*February 4, 2021*
 
 - Public release
+
+## Transifex iOS SDK 0.1.1
+
+*February 24, 2021*
+
+- Fixed preferred locale provider

Sources/Transifex/Core.swift

@@ -300,7 +300,7 @@ Error rendering source string '\(sourceString)' with string to render '\(stringT
 /// A static class that is the main point of entry for all the functionality of Transifex Native throughout the SDK.
 public final class TXNative : NSObject {
     /// The SDK version
-    internal static let version = "0.1.0"
+    internal static let version = "0.1.1"
 
     /// The filename of the file that holds the translated strings and it's bundled inside the app.
     public static let STRINGS_FILENAME = "txstrings.json"

Sources/Transifex/Locales.swift

@@ -41,8 +41,15 @@ public final class TXPreferredLocaleProvider : NSObject {
         _currentLocale = TXPreferredLocaleProvider.getCurrentLocale()
     }
 
+    private static func getPreferredLocale() -> Locale {
+        guard let preferredIdentifier = Locale.preferredLanguages.first else {
+            return Locale.autoupdatingCurrent
+        }
+        return Locale(identifier: preferredIdentifier)
+    }
+
     private static func getCurrentLocale() -> String {
-        return NSLocale.autoupdatingCurrent.languageCode ?? "en"
+        return getPreferredLocale().languageCode ?? "en"
     }
 }
 

Tests/TransifexTests/TransifexTests.swift

@@ -450,6 +450,22 @@ final class TransifexTests: XCTestCase {
         XCTAssertEqual(result, "ERROR")
     }
 
+    func testCurrentLocale() {
+        let appleLanguagesKey = "AppleLanguages"
+        let storedLanguages = UserDefaults.standard.value(forKey: appleLanguagesKey)
+
+        UserDefaults.standard.set([ "el" ],
+                                  forKey: appleLanguagesKey)
+
+        let locale = TXLocaleState(appLocales: [])
+
+        XCTAssertEqual(locale.currentLocale,
+                       "el")
+
+        UserDefaults.standard.set(storedLanguages,
+                                  forKey: appleLanguagesKey)
+    }
+
     static var allTests = [
         ("testDuplicateLocaleFiltering", testDuplicateLocaleFiltering),
         ("testCurrentLocaleProvider", testCurrentLocaleProvider),
@@ -463,5 +479,8 @@ final class TransifexTests: XCTestCase {
         ("testOverrideFilterCacheAll", testOverrideFilterCacheAll),
         ("testOverrideFilterCacheUntranslated", testOverrideFilterCacheUntranslated),
         ("testOverrideFilterCacheTranslated", testOverrideFilterCacheTranslated),
+        ("testPlatformStrategyWithInvalidSourceString", testPlatformStrategyWithInvalidSourceString),
+        ("testErrorPolicy", testErrorPolicy),
+        ("testCurrentLocale", testCurrentLocale),
     ]
 }