Merge pull request #688 from OneBusAway/ios-16

Drop support for iOS 15
OneBusAway · Nov 11, 2023 · e4244e4 · e4244e4
2 parents 82e6043 + a77dcfb
commit e4244e4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Apps/Shared/app_shared.yml b/Apps/Shared/app_shared.yml
@@ -8,14 +8,14 @@ settings:
   base:
     CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED: true
     CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER: false
-    MARKETING_VERSION: 23.2.4
+    MARKETING_VERSION: 23.3.0
 
 options:
   minimumXcodeGenVersion: 2.17
   generateEmptyDirectories: true
   groupSortPosition: top
   deploymentTarget:
-    iOS: "15.0"
+    iOS: "16.0"
 
 ############
 # App

diff --git a/OBAKit/Settings/ContactUsHelper.swift b/OBAKit/Settings/ContactUsHelper.swift
@@ -153,7 +153,7 @@ class ContactUsHelper: NSObject {
         // App/Settings
         values.append(AppDebugValue(label: "App Version", value: Bundle.main.appVersion))
         values.append(AppDebugValue(label: "OS Version", value: UIDevice.current.systemVersion))
-        values.append(AppDebugValue(label: "Locale", value: Locale.current.languageCode ?? "None"))
+        values.append(AppDebugValue(label: "Locale", value: Locale.current.language.languageCode?.identifier ?? "None"))
         values.append(AppDebugValue(label: "VoiceOver Running", value: String(UIAccessibility.isVoiceOverRunning)))
         values.append(AppDebugValue(label: "Bookmark Count", value: String(application.userDataStore.bookmarks.count)))
 

diff --git a/OBAKitCore/Models/REST/AgencyAlert.swift b/OBAKitCore/Models/REST/AgencyAlert.swift
@@ -51,7 +51,7 @@ public class AgencyAlert: NSObject, Identifiable {
     }
 
     private func selectLanguageCode(locale: Locale) -> String {
-        locale.languageCode ?? defaultLanguageCode
+        locale.language.languageCode?.identifier ?? defaultLanguageCode
     }
 
     private let defaultLanguageCode = "en"