From 4a85823439e128574193f61f5794d4b8e4fc2e43 Mon Sep 17 00:00:00 2001
From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com>
Date: Sat, 9 Mar 2024 17:15:06 +0900
Subject: [PATCH] =?UTF-8?q?[Refactor]=20View:=20=E8=A8=80=E8=AA=9E?=
 =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E3=81=AF=20view=E4=BB=A5=E4=B8=8B?=
 =?UTF-8?q?=E3=81=A7=E8=A1=A8=E7=A4=BA=E7=94=A8=E3=81=AF=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E7=94=A8=E3=81=A8=E3=81=97=E3=81=A6=E5=87=A6=E7=90=86=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=80=82=20=E2=80=BBcontro?=
 =?UTF-8?q?ller.py=E3=81=8B=E3=82=89view.py=E3=81=B8=E8=A8=80=E8=AA=9E?=
 =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E3=82=92=E6=B8=A1=E3=81=99=E6=99=82?=
 =?UTF-8?q?=E3=80=81=E3=81=9D=E3=81=AE=E5=A0=B4=E3=81=A7=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E7=94=A8=E3=81=AE=E6=96=87=E5=AD=97=E5=88=97=E3=82=92=E4=BD=9C?=
 =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92view.py?=
 =?UTF-8?q?=E5=86=85=E3=81=A7=E5=87=A6=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller.py                                |  2 +-
 view.py                                      |  4 ++--
 vrct_gui/_CreateSelectableLanguagesWindow.py | 11 +++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/controller.py b/controller.py
index 9af68368..fe0ccb6a 100644
--- a/controller.py
+++ b/controller.py
@@ -993,7 +993,7 @@ def createMainWindow(splash):
 
             "callback_your_language": setYourLanguageAndCountry,
             "callback_target_language": setTargetLanguageAndCountry,
-            "values": [f"{v['language']} ({v['country']})" for v in model.getListLanguageAndCountry()],
+            "values": model.getListLanguageAndCountry(),
             "callback_swap_languages": swapYourLanguageAndTargetLanguage,
 
             "callback_selected_language_preset_tab": callbackSelectedLanguagePresetTab,
diff --git a/view.py b/view.py
index 37897dd9..39ac795f 100644
--- a/view.py
+++ b/view.py
@@ -1659,13 +1659,13 @@ class View():
     def printToTextbox_selectedYourLanguages(self, selected_your_language):
         language = selected_your_language["language"]
         country = selected_your_language["country"]
-        your_language = f"{language} {country}"
+        your_language = f"{language} ({country})"
         self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.selected_your_language", your_language=your_language))
 
     def printToTextbox_selectedTargetLanguages(self, selected_target_language):
         language = selected_target_language["language"]
         country = selected_target_language["country"]
-        target_language = f"{language} {country}"
+        target_language = f"{language} ({country})"
         self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.selected_target_language", target_language=target_language))
 
     def printToTextbox_changedLanguagePresetTab(self, tab_no:str):
diff --git a/vrct_gui/_CreateSelectableLanguagesWindow.py b/vrct_gui/_CreateSelectableLanguagesWindow.py
index b3cab8fe..4c5482cd 100644
--- a/vrct_gui/_CreateSelectableLanguagesWindow.py
+++ b/vrct_gui/_CreateSelectableLanguagesWindow.py
@@ -49,8 +49,8 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
 
 
     def callbackSelectableLanguages(self, value, _e):
-        language, country = value.split(" (")
-        country = country[:-1]
+        language = value["language"]
+        country = value["country"]
         callback_value = {
             "language" : language,
             "country" : country,
@@ -143,7 +143,7 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
         max_row+=1
         row=0
         column=0
-        for selectable_language_name in self._view_variable.LIST_SELECTABLE_LANGUAGES:
+        for selectable_language_dict in self._view_variable.LIST_SELECTABLE_LANGUAGES:
 
             self.wrapper = CTkFrame(self.container, corner_radius=0, fg_color=self.settings.ctm.LANGUAGE_BUTTON_BG_COLOR, width=0, height=0, cursor="hand2")
             self.wrapper.grid(row=row, column=column, sticky="nsew")
@@ -152,10 +152,9 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
 
 
             self.wrapper.grid_rowconfigure((0,2), weight=1)
-            selectable_language_name_for_text = selectable_language_name.replace("\n", " ")
             label_widget = CTkLabel(
                 self.wrapper,
-                text=selectable_language_name_for_text,
+                text=f"{selectable_language_dict['language']} ({selectable_language_dict['country']})",
                 height=0,
                 corner_radius=0,
                 font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.VALUES_TEXT_FONT_SIZE, weight="normal"),
@@ -172,7 +171,7 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
 
 
 
-            callback = partial(self.callbackSelectableLanguages, selectable_language_name)
+            callback = partial(self.callbackSelectableLanguages, selectable_language_dict)
             bindButtonReleaseFunction([self.wrapper, label_widget], callback)
 
             if row == max_row: