From f29e78138015c7df39ce730edc14410382ac98da Mon Sep 17 00:00:00 2001
From: ensan-hcl <ensan.hcl.dev@gmail.com>
Date: Sun, 14 Jan 2024 19:21:43 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=A9=E3=83=99=E3=83=AB=E3=81=8C=E6=B6=88?=
 =?UTF-8?q?=E5=A4=B1=E3=81=99=E3=82=8B=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KeyView/QwertyLanguageSwitchKeyModel.swift     | 14 +++++++-------
 .../View/QwertyKeyboard/QwertyDataProvider.swift   |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/AzooKeyCore/Sources/KeyboardViews/View/QwertyKeyboard/KeyView/QwertyLanguageSwitchKeyModel.swift b/AzooKeyCore/Sources/KeyboardViews/View/QwertyKeyboard/KeyView/QwertyLanguageSwitchKeyModel.swift
index 913c89da..38318bdb 100644
--- a/AzooKeyCore/Sources/KeyboardViews/View/QwertyKeyboard/KeyView/QwertyLanguageSwitchKeyModel.swift
+++ b/AzooKeyCore/Sources/KeyboardViews/View/QwertyKeyboard/KeyView/QwertyLanguageSwitchKeyModel.swift
@@ -24,7 +24,7 @@ struct QwertySwitchLanguageKeyModel<Extension: ApplicationSpecificKeyboardViewEx
             target = languages.1
         } else if languages.1 == current {
             target = languages.0
-        } else if SemiStaticStates.shared.needsInputModeSwitchKey {
+        } else if SemiStaticStates.shared.needsInputModeSwitchKey && [.ja_JP, .en_US, .el_GR].contains(variableStates.keyboardLanguage) {
             target = variableStates.keyboardLanguage
         } else {
             target = Extension.SettingProvider.preferredLanguage.first
@@ -57,14 +57,14 @@ struct QwertySwitchLanguageKeyModel<Extension: ApplicationSpecificKeyboardViewEx
 
     func label(width: CGFloat, states: VariableStates, color: Color?) -> KeyLabel<Extension> {
         let current = currentTabLanguage(variableStates: states)
-        if languages.0 == current {
-            return KeyLabel(.selectable(languages.0.symbol, languages.1.symbol), width: width, textColor: color)
+        return if languages.0 == current {
+            KeyLabel(.selectable(languages.0.symbol, languages.1.symbol), width: width, textColor: color)
         } else if languages.1 == current {
-            return KeyLabel(.selectable(languages.1.symbol, languages.0.symbol), width: width, textColor: color)
-        } else if SemiStaticStates.shared.needsInputModeSwitchKey {
-            return KeyLabel(.text(states.keyboardLanguage.symbol), width: width, textColor: color)
+            KeyLabel(.selectable(languages.1.symbol, languages.0.symbol), width: width, textColor: color)
+        } else if SemiStaticStates.shared.needsInputModeSwitchKey && [.ja_JP, .en_US, .el_GR].contains(states.keyboardLanguage) {
+            KeyLabel(.text(states.keyboardLanguage.symbol), width: width, textColor: color)
         } else {
-            return KeyLabel(.text(Extension.SettingProvider.preferredLanguage.first.symbol), width: width, textColor: color)
+            KeyLabel(.text(Extension.SettingProvider.preferredLanguage.first.symbol), width: width, textColor: color)
         }
     }
 
diff --git a/AzooKeyCore/Sources/KeyboardViews/View/QwertyKeyboard/QwertyDataProvider.swift b/AzooKeyCore/Sources/KeyboardViews/View/QwertyKeyboard/QwertyDataProvider.swift
index e9d26c0c..b9f02328 100644
--- a/AzooKeyCore/Sources/KeyboardViews/View/QwertyKeyboard/QwertyDataProvider.swift
+++ b/AzooKeyCore/Sources/KeyboardViews/View/QwertyKeyboard/QwertyDataProvider.swift
@@ -20,11 +20,11 @@ struct QwertyDataProvider<Extension: ApplicationSpecificKeyboardViewExtension> {
             let targetTab: TabData = {
                 switch first {
                 case .en_US:
-                    return .system(.user_english)
+                    .system(.user_english)
                 case .ja_JP:
-                    return .system(.user_japanese)
+                    .system(.user_japanese)
                 case .none, .el_GR:
-                    return .system(.user_japanese)
+                    .system(.user_japanese)
                 }
             }()
             languageKey = QwertyFunctionalKeyModel(labelType: .text(first.symbol), rowInfo: rowInfo, pressActions: [.moveTab(targetTab)], longPressActions: .none, needSuggestView: false)