Skip to content

Commit 11e1d5e

Browse files
committed
Use Locale.isoLanguageCodes for language list instead
1 parent 483e162 commit 11e1d5e

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

Copilot for Xcode/OpenAIView.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import Preferences
55
import SwiftUI
66

77
final class OpenAIViewSettings: ObservableObject {
8+
static let availableLocalizedLocales = Locale.availableLocalizedLocales
89
@AppStorage(\.openAIAPIKey) var openAIAPIKey: String
910
@AppStorage(\.chatGPTModel) var chatGPTModel: String
1011
@AppStorage(\.chatGPTEndpoint) var chatGPTEndpoint: String
@@ -74,11 +75,12 @@ struct OpenAIView: View {
7475

7576
Picker(selection: $settings.chatGPTLanguage) {
7677
if !settings.chatGPTLanguage.isEmpty,
77-
!Locale.availableLocalizedLocales.contains(settings.chatGPTLanguage)
78+
!OpenAIViewSettings.availableLocalizedLocales.contains(settings.chatGPTLanguage)
7879
{
7980
Text(settings.chatGPTLanguage).tag(settings.chatGPTLanguage)
8081
}
81-
ForEach(Locale.availableLocalizedLocales, id: \.self) { localizedLocales in
82+
Text("Auto-detected by ChatGPT").tag("")
83+
ForEach(OpenAIViewSettings.availableLocalizedLocales, id: \.self) { localizedLocales in
8284
Text(localizedLocales).tag(localizedLocales)
8385
}
8486
} label: {

Core/Sources/Preferences/Locale.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ import Foundation
22

33
public extension Locale {
44
static var availableLocalizedLocales: [String] {
5-
var localizedLocales = Locale.availableIdentifiers.compactMap {
6-
Locale(identifier: $0).localizedString(forIdentifier: $0)
5+
let localizedLocales = Locale.isoLanguageCodes.compactMap {
6+
Locale(identifier: "en-US").localizedString(forLanguageCode: $0)
77
}
88
.sorted()
9-
localizedLocales.insert("Auto-detected by ChatGPT", at: 0)
109
return localizedLocales
1110
}
1211

0 commit comments

Comments
 (0)