every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix_Chinese' into develop

Browse Source
This commit is contained in:
Sakamoto Shiina
2024-03-09 22:35:56 +09:00
parent dc36fb6c2b 8056e9d668
commit 6e6cf7183d
7 changed files with 266 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
config.py
View File

@@ -7,6 +7,7 @@ import tkinter as tk
from tkinter import font from tkinter import font
from models.translation.translation_languages import translation_lang from models.translation.translation_languages import translation_lang
from models.transcription.transcription_utils import getInputDevices, getDefaultInputDevice from models.transcription.transcription_utils import getInputDevices, getDefaultInputDevice
from models.transcription.transcription_languages import transcription_lang
from utils import generatePercentageStringsList, isUniqueStrings from utils import generatePercentageStringsList, isUniqueStrings
json_serializable_vars = {} json_serializable_vars = {}
@@ -288,9 +289,18 @@ class Config:
@SELECTED_TAB_YOUR_LANGUAGES.setter @SELECTED_TAB_YOUR_LANGUAGES.setter
def SELECTED_TAB_YOUR_LANGUAGES(self, value): def SELECTED_TAB_YOUR_LANGUAGES(self, value):
if isinstance(value, dict): try:
self._SELECTED_TAB_YOUR_LANGUAGES = value if isinstance(value, dict):
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) value_old = self.SELECTED_TAB_YOUR_LANGUAGES
for k, v in value.items():
language = v["language"]
country = v["country"]
if language not in list(transcription_lang.keys()) or country not in list(transcription_lang[language].keys()):
value[k] = value_old[k]
self._SELECTED_TAB_YOUR_LANGUAGES = value
except Exception:
pass
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property @property
@json_serializable('SELECTED_TAB_TARGET_LANGUAGES') @json_serializable('SELECTED_TAB_TARGET_LANGUAGES')
@@ -299,9 +309,18 @@ class Config:
@SELECTED_TAB_TARGET_LANGUAGES.setter @SELECTED_TAB_TARGET_LANGUAGES.setter
def SELECTED_TAB_TARGET_LANGUAGES(self, value): def SELECTED_TAB_TARGET_LANGUAGES(self, value):
if isinstance(value, dict): try:
self._SELECTED_TAB_TARGET_LANGUAGES = value if isinstance(value, dict):
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value) value_old = self.SELECTED_TAB_TARGET_LANGUAGES
for k, v in value.items():
language = v["language"]
country = v["country"]
if language not in list(transcription_lang.keys()) or country not in list(transcription_lang[language].keys()):
value[k] = value_old[k]
self._SELECTED_TAB_TARGET_LANGUAGES = value
except Exception:
pass
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property @property
@json_serializable('SELECTED_TRANSCRIPTION_ENGINE') @json_serializable('SELECTED_TRANSCRIPTION_ENGINE')
@@ -885,14 +904,32 @@ class Config:
"3":"CTranslate2", "3":"CTranslate2",
} }
self._SELECTED_TAB_YOUR_LANGUAGES = { self._SELECTED_TAB_YOUR_LANGUAGES = {
"1":"Japanese\n(Japan)", "1":{
"2":"Japanese\n(Japan)", "language":"Japanese",
"3":"Japanese\n(Japan)", "country":"Japan"
},
"2":{
"language":"Japanese",
"country":"Japan"
},
"3":{
"language":"Japanese",
"country":"Japan"
},
} }
self._SELECTED_TAB_TARGET_LANGUAGES = { self._SELECTED_TAB_TARGET_LANGUAGES = {
"1":"English\n(United States)", "1":{
"2":"English\n(United States)", "language":"English",
"3":"English\n(United States)", "country":"United States"
},
"2":{
"language":"English",
"country":"United States"
},
"3":{
"language":"English",
"country":"United States"
},
} }
self._SELECTED_TRANSCRIPTION_ENGINE = "Google" self._SELECTED_TRANSCRIPTION_ENGINE = "Google"
self._IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE = False self._IS_MAIN_WINDOW_SIDEBAR_COMPACT_MODE = False

30
controller.py
View File

@@ -292,13 +292,11 @@ def initSetTranslateEngine():
def initSetLanguageAndCountry(): def initSetLanguageAndCountry():
select = config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO] select = config.SELECTED_TAB_YOUR_LANGUAGES[config.SELECTED_TAB_NO]
language, country = model.getLanguageAndCountry(select) config.SOURCE_LANGUAGE = select["language"]
config.SOURCE_LANGUAGE = language config.SOURCE_COUNTRY = select["country"]
config.SOURCE_COUNTRY = country
select = config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO] select = config.SELECTED_TAB_TARGET_LANGUAGES[config.SELECTED_TAB_NO]
language, country = model.getLanguageAndCountry(select) config.TARGET_LANGUAGE = select["language"]
config.TARGET_LANGUAGE = language config.TARGET_COUNTRY = select["country"]
config.TARGET_COUNTRY = country
def setYourTranslateEngine(select): def setYourTranslateEngine(select):
engines = config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES engines = config.SELECTED_TAB_YOUR_TRANSLATOR_ENGINES
@@ -316,9 +314,8 @@ def setYourLanguageAndCountry(select):
languages = config.SELECTED_TAB_YOUR_LANGUAGES languages = config.SELECTED_TAB_YOUR_LANGUAGES
languages[config.SELECTED_TAB_NO] = select languages[config.SELECTED_TAB_NO] = select
config.SELECTED_TAB_YOUR_LANGUAGES = languages config.SELECTED_TAB_YOUR_LANGUAGES = languages
language, country = model.getLanguageAndCountry(select) config.SOURCE_LANGUAGE = select["language"]
config.SOURCE_LANGUAGE = language config.SOURCE_COUNTRY = select["country"]
config.SOURCE_COUNTRY = country
updateTranslationEngineAndEngineList() updateTranslationEngineAndEngineList()
view.printToTextbox_selectedYourLanguages(select) view.printToTextbox_selectedYourLanguages(select)
@@ -326,9 +323,8 @@ def setTargetLanguageAndCountry(select):
languages = config.SELECTED_TAB_TARGET_LANGUAGES languages = config.SELECTED_TAB_TARGET_LANGUAGES
languages[config.SELECTED_TAB_NO] = select languages[config.SELECTED_TAB_NO] = select
config.SELECTED_TAB_TARGET_LANGUAGES = languages config.SELECTED_TAB_TARGET_LANGUAGES = languages
language, country = model.getLanguageAndCountry(select) config.TARGET_LANGUAGE = select["language"]
config.TARGET_LANGUAGE = language config.TARGET_COUNTRY = select["country"]
config.TARGET_COUNTRY = country
updateTranslationEngineAndEngineList() updateTranslationEngineAndEngineList()
view.printToTextbox_selectedTargetLanguages(select) view.printToTextbox_selectedTargetLanguages(select)
@@ -355,15 +351,13 @@ def callbackSelectedLanguagePresetTab(selected_tab_no):
languages = config.SELECTED_TAB_YOUR_LANGUAGES languages = config.SELECTED_TAB_YOUR_LANGUAGES
select = languages[config.SELECTED_TAB_NO] select = languages[config.SELECTED_TAB_NO]
language, country = model.getLanguageAndCountry(select) config.SOURCE_LANGUAGE = select["language"]
config.SOURCE_LANGUAGE = language config.SOURCE_COUNTRY = select["country"]
config.SOURCE_COUNTRY = country
languages = config.SELECTED_TAB_TARGET_LANGUAGES languages = config.SELECTED_TAB_TARGET_LANGUAGES
select = languages[config.SELECTED_TAB_NO] select = languages[config.SELECTED_TAB_NO]
language, country = model.getLanguageAndCountry(select) config.TARGET_LANGUAGE = select["language"]
config.TARGET_LANGUAGE = language config.TARGET_COUNTRY = select["country"]
config.TARGET_COUNTRY = country
view.printToTextbox_changedLanguagePresetTab(config.SELECTED_TAB_NO) view.printToTextbox_changedLanguagePresetTab(config.SELECTED_TAB_NO)
updateTranslationEngineAndEngineList() updateTranslationEngineAndEngineList()

26
model.py
View File

@@ -106,26 +106,24 @@ class Model:
def getListLanguageAndCountry(self): def getListLanguageAndCountry(self):
transcription_langs = list(transcription_lang.keys()) transcription_langs = list(transcription_lang.keys())
tl_keys = translation_lang.keys()
translation_langs = [] translation_langs = []
for tl_key in tl_keys: for tl_key in translation_lang.keys():
for lang in translation_lang[tl_key]["source"]: for lang in translation_lang[tl_key]["source"]:
translation_langs.append(lang) translation_langs.append(lang)
translation_langs = list(set(translation_langs)) translation_langs = list(set(translation_langs))
supported_langs = list(filter(lambda x: x in transcription_langs, translation_langs)) supported_langs = list(filter(lambda x: x in transcription_langs, translation_langs))
langs = [] languages = []
for lang in supported_langs: for language in supported_langs:
for country in transcription_lang[lang]: for country in transcription_lang[language]:
langs.append(f"{lang}\n({country})") languages.append(
return sorted(langs) {
"language" : language,
@staticmethod "country" : country,
def getLanguageAndCountry(select): }
parts = select.split("\n") )
language = parts[0] languages = sorted(languages, key=lambda x: x['language'])
country = parts[1][1:-1] return languages
return language, country
def findTranslationEngines(self, source_lang, target_lang): def findTranslationEngines(self, source_lang, target_lang):
compatible_engines = [] compatible_engines = []

12
models/transcription/transcription_languages.py
View File

@@ -85,20 +85,22 @@ transcription_lang = {
"Whisper": "ca", "Whisper": "ca",
}, },
}, },
"Chinese":{ "Chinese Simplified":{
"Mandarin (Simplified, China)":{ "China":{
"Google": "cmn-Hans-CN", "Google": "cmn-Hans-CN",
"Whisper": "zh", "Whisper": "zh",
}, },
"Mandarin (Simplified, Hong Kong)":{ "Hong Kong":{
"Google": "cmn-Hans-HK", "Google": "cmn-Hans-HK",
"Whisper": "zh", "Whisper": "zh",
}, },
"Mandarin (Traditional, Taiwan)":{ },
"Chinese Traditional":{
"Taiwan":{
"Google": "cmn-Hant-TW", "Google": "cmn-Hant-TW",
"Whisper": "zh", "Whisper": "zh",
}, },
"Cantonese (Traditional Hong Kong)":{ "Hong Kong":{
"Google": "yue-Hant-HK", "Google": "yue-Hant-HK",
"Whisper": "yue", "Whisper": "yue",
}, },

311
models/translation/translation_languages.py
View File

@@ -1,40 +1,41 @@
translation_lang = {} translation_lang = {}
dict_deepl_languages = { dict_deepl_languages = {
'Arabic':'ar', "Arabic":"ar",
'Bulgarian':'bg', "Bulgarian":"bg",
'Czech':'cs', "Czech":"cs",
'Danish':'da', "Danish":"da",
'German':'de', "German":"de",
'Greek':'el', "Greek":"el",
'English':'en', "English":"en",
'Spanish':'es', "Spanish":"es",
'Estonian':'et', "Estonian":"et",
'Finnish':'fi', "Finnish":"fi",
'French':'fr', "French":"fr",
'Irish':'ga', "Irish":"ga",
'Croatian':'hr', "Croatian":"hr",
'Hungarian':'hu', "Hungarian":"hu",
'Indonesian':'id', "Indonesian":"id",
'Icelandic':'is', "Icelandic":"is",
'Italian':'it', "Italian":"it",
'Japanese':'ja', "Japanese":"ja",
'Korean':'ko', "Korean":"ko",
'Lithuanian':'lt', "Lithuanian":"lt",
'Latvian':'lv', "Latvian":"lv",
'Maltese':'mt', "Maltese":"mt",
'Bokmal':'nb', "Bokmal":"nb",
'Dutch':'nl', "Dutch":"nl",
'Norwegian':'no', "Norwegian":"no",
'Polish':'pl', "Polish":"pl",
'Portuguese':'pt', "Portuguese":"pt",
'Romanian':'ro', "Romanian":"ro",
'Russian':'ru', "Russian":"ru",
'Slovak':'sk', "Slovak":"sk",
'Slovenian':'sl', "Slovenian":"sl",
'Swedish':'sv', "Swedish":"sv",
'Turkish':'tr', "Turkish":"tr",
'Ukrainian':'uk', "Ukrainian":"uk",
'Chinese':'zh', "Chinese Simplified":"zh",
"Chinese Traditional":"zh"
} }
translation_lang["DeepL"] = { translation_lang["DeepL"] = {
"source":dict_deepl_languages, "source":dict_deepl_languages,
@@ -70,7 +71,8 @@ dict_deepl_api_source_languages = {
"Swedish":"sv", "Swedish":"sv",
"Turkish":"tr", "Turkish":"tr",
"Ukrainian":"uk", "Ukrainian":"uk",
"Chinese":"zh" "Chinese Simplified":"zh",
"Chinese Traditional":"zh"
} }
dict_deepl_api_target_languages = { dict_deepl_api_target_languages = {
"Japanese":"ja", "Japanese":"ja",
@@ -104,7 +106,8 @@ dict_deepl_api_target_languages = {
"Swedish":"sv", "Swedish":"sv",
"Turkish":"tr", "Turkish":"tr",
"Ukrainian":"uk", "Ukrainian":"uk",
"Chinese":"zh" "Chinese Simplified":"zh",
"Chinese Traditional":"zh"
} }
translation_lang["DeepL_API"] = { translation_lang["DeepL_API"] = {
"source": dict_deepl_api_source_languages, "source": dict_deepl_api_source_languages,
@@ -114,7 +117,8 @@ translation_lang["DeepL_API"] = {
dict_google_languages = { dict_google_languages = {
"Japanese":"ja", "Japanese":"ja",
"English":"en", "English":"en",
"Chinese":"zh", "Chinese Simplified":"zh",
"Chinese Traditional":"zh-TW",
"Arabic":"ar", "Arabic":"ar",
"Russian":"ru", "Russian":"ru",
"French":"fr", "French":"fr",
@@ -183,7 +187,8 @@ translation_lang["Google"] = {
dict_bing_languages = { dict_bing_languages = {
"Japanese":"ja", "Japanese":"ja",
"English":"en", "English":"en",
"Chinese":"zh", "Chinese Simplified":"zh",
"Chinese Traditional":"zh-Hant",
"Arabic":"ar", "Arabic":"ar",
"Russian":"ru", "Russian":"ru",
"French":"fr", "French":"fr",
@@ -248,20 +253,21 @@ translation_lang["Bing"] = {
} }
dict_papago_languages = { dict_papago_languages = {
'German': 'de', "German": "de",
'English': 'en', "English": "en",
'Spanish':'es', "Spanish":"es",
'French': 'fr', "French": "fr",
'Hindi': 'hi', "Hindi": "hi",
'Indonesian': 'id', "Indonesian": "id",
'Italian': 'it', "Italian": "it",
'Japanese': 'ja', "Japanese": "ja",
'Korean': 'ko', "Korean": "ko",
'Portuguese': 'pt', "Portuguese": "pt",
'Russian': 'ru', "Russian": "ru",
'Thai': 'th', "Thai": "th",
'Vietnamese': 'vi', "Vietnamese": "vi",
'Chinese':'zh-CN', "Chinese Simplified":"zh-CN",
"Chinese Traditional":"zh-TW",
} }
translation_lang["Papago"] = { translation_lang["Papago"] = {
@@ -270,105 +276,106 @@ translation_lang["Papago"] = {
} }
dict_ctranslate2_languages = { dict_ctranslate2_languages = {
'English': 'en', "English": "en",
'Chinese': 'zh', "Chinese Simplified": "zh",
'German': 'de', "Chinese Traditional":"zh",
'Spanish': 'es', "German": "de",
'Russian': 'ru', "Spanish": "es",
'Korean': 'ko', "Russian": "ru",
'French': 'fr', "Korean": "ko",
'Japanese': 'ja', "French": "fr",
'Portuguese': 'pt', "Japanese": "ja",
'Turkish': 'tr', "Portuguese": "pt",
'Polish': 'pl', "Turkish": "tr",
'Catalan': 'ca', "Polish": "pl",
'Dutch': 'nl', "Catalan": "ca",
'Arabic': 'ar', "Dutch": "nl",
'Swedish': 'sv', "Arabic": "ar",
'Italian': 'it', "Swedish": "sv",
'Indonesian': 'id', "Italian": "it",
'Hindi': 'hi', "Indonesian": "id",
'Finnish': 'fi', "Hindi": "hi",
'Vietnamese': 'vi', "Finnish": "fi",
'Hebrew': 'he', "Vietnamese": "vi",
'Ukrainian': 'uk', "Hebrew": "he",
'Greek': 'el', "Ukrainian": "uk",
'Malay': 'ms', "Greek": "el",
'Czech': 'cs', "Malay": "ms",
'Romanian': 'ro', "Czech": "cs",
'Danish': 'da', "Romanian": "ro",
'Hungarian': 'hu', "Danish": "da",
'Tamil': 'ta', "Hungarian": "hu",
'Norwegian': 'no', "Tamil": "ta",
'Thai': 'th', "Norwegian": "no",
'Urdu': 'ur', "Thai": "th",
'Croatian': 'hr', "Urdu": "ur",
'Bulgarian': 'bg', "Croatian": "hr",
'Lithuanian': 'lt', "Bulgarian": "bg",
'Latin': 'la', "Lithuanian": "lt",
'Maori': 'mi', "Latin": "la",
'Malayalam': 'ml', "Maori": "mi",
'Welsh': 'cy', "Malayalam": "ml",
'Slovak': 'sk', "Welsh": "cy",
'Telugu': 'te', "Slovak": "sk",
'Persian': 'fa', "Telugu": "te",
'Latvian': 'lv', "Persian": "fa",
'Bengali': 'bn', "Latvian": "lv",
'Serbian': 'sr', "Bengali": "bn",
'Azerbaijani': 'az', "Serbian": "sr",
'Slovenian': 'sl', "Azerbaijani": "az",
'Kannada': 'kn', "Slovenian": "sl",
'Estonian': 'et', "Kannada": "kn",
'Macedonian': 'mk', "Estonian": "et",
'Breton': 'br', "Macedonian": "mk",
'Basque': 'eu', "Breton": "br",
'Icelandic': 'is', "Basque": "eu",
'Armenian': 'hy', "Icelandic": "is",
'Nepali': 'ne', "Armenian": "hy",
'Mongolian': 'mn', "Nepali": "ne",
'Bosnian': 'bs', "Mongolian": "mn",
'Kazakh': 'kk', "Bosnian": "bs",
'Albanian': 'sq', "Kazakh": "kk",
'Swahili': 'sw', "Albanian": "sq",
'Galician': 'gl', "Swahili": "sw",
'Marathi': 'mr', "Galician": "gl",
'Punjabi': 'pa', "Marathi": "mr",
'Sinhala': 'si', "Punjabi": "pa",
'Khmer': 'km', "Sinhala": "si",
'Shona': 'sn', "Khmer": "km",
'Yoruba': 'yo', "Shona": "sn",
'Somali': 'so', "Yoruba": "yo",
'Afrikaans': 'af', "Somali": "so",
'Occitan': 'oc', "Afrikaans": "af",
'Georgian': 'ka', "Occitan": "oc",
'Belarusian': 'be', "Georgian": "ka",
'Tajik': 'tg', "Belarusian": "be",
'Sindhi': 'sd', "Tajik": "tg",
'Gujarati': 'gu', "Sindhi": "sd",
'Amharic': 'am', "Gujarati": "gu",
'Yiddish': 'yi', "Amharic": "am",
'Lao': 'lo', "Yiddish": "yi",
'Uzbek': 'uz', "Lao": "lo",
'Faroese': 'fo', "Uzbek": "uz",
'Haitian creole': 'ht', "Faroese": "fo",
'Pashto': 'ps', "Haitian creole": "ht",
'Turkmen': 'tk', "Pashto": "ps",
'Nynorsk': 'nn', "Turkmen": "tk",
'Maltese': 'mt', "Nynorsk": "nn",
'Sanskrit': 'sa', "Maltese": "mt",
'Luxembourgish': 'lb', "Sanskrit": "sa",
'Myanmar': 'my', "Luxembourgish": "lb",
'Tibetan': 'bo', "Myanmar": "my",
'Filipino': 'tl', "Tibetan": "bo",
'Malagasy': 'mg', "Filipino": "tl",
'Assamese': 'as', "Malagasy": "mg",
'Tatar': 'tt', "Assamese": "as",
'Hawaiian': 'haw', "Tatar": "tt",
'Lingala': 'ln', "Hawaiian": "haw",
'Hausa': 'ha', "Lingala": "ln",
'Bashkir': 'ba', "Hausa": "ha",
'Javanese': 'jw', "Bashkir": "ba",
'Sundanese': 'su' "Javanese": "jw",
"Sundanese": "su"
} }
translation_lang["CTranslate2"] = { translation_lang["CTranslate2"] = {

18
view.py
View File

@@ -1508,8 +1508,14 @@ class View():
# Update GuiVariable (view_variable) # Update GuiVariable (view_variable)
def updateGuiVariableByPresetTabNo(self, tab_no:str): def updateGuiVariableByPresetTabNo(self, tab_no:str):
self.view_variable.VAR_YOUR_LANGUAGE.set(config.SELECTED_TAB_YOUR_LANGUAGES[tab_no]) select = config.SELECTED_TAB_YOUR_LANGUAGES[tab_no]
self.view_variable.VAR_TARGET_LANGUAGE.set(config.SELECTED_TAB_TARGET_LANGUAGES[tab_no]) your_language = select["language"]
your_country = select["country"]
self.view_variable.VAR_YOUR_LANGUAGE.set(f"{your_language}\n({your_country})")
select = config.SELECTED_TAB_TARGET_LANGUAGES[tab_no]
target_language = select["language"]
target_country = select["country"]
self.view_variable.VAR_TARGET_LANGUAGE.set(f"{target_language}\n({target_country})")
def updateList_selectableLanguages(self, new_selectable_language_list:list): def updateList_selectableLanguages(self, new_selectable_language_list:list):
@@ -1651,11 +1657,15 @@ class View():
def printToTextbox_selectedYourLanguages(self, selected_your_language): def printToTextbox_selectedYourLanguages(self, selected_your_language):
your_language = selected_your_language.replace("\n", " ") language = selected_your_language["language"]
country = selected_your_language["country"]
your_language = f"{language} ({country})"
self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.selected_your_language", your_language=your_language)) self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.selected_your_language", your_language=your_language))
def printToTextbox_selectedTargetLanguages(self, selected_target_language): def printToTextbox_selectedTargetLanguages(self, selected_target_language):
target_language = selected_target_language.replace("\n", " ") language = selected_target_language["language"]
country = selected_target_language["country"]
target_language = f"{language} ({country})"
self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.selected_target_language", target_language=target_language)) self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.selected_target_language", target_language=target_language))
def printToTextbox_changedLanguagePresetTab(self, tab_no:str): def printToTextbox_changedLanguagePresetTab(self, tab_no:str):

19
vrct_gui/_CreateSelectableLanguagesWindow.py
View File

@@ -49,6 +49,14 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
def callbackSelectableLanguages(self, value, _e): def callbackSelectableLanguages(self, value, _e):
language = value["language"]
country = value["country"]
callback_value = {
"language" : language,
"country" : country,
}
set_value = f"{language}\n({country})"
if self.selectable_language_window_type == "your_language": if self.selectable_language_window_type == "your_language":
callback = self._view_variable.CALLBACK_SELECTED_YOUR_LANGUAGE callback = self._view_variable.CALLBACK_SELECTED_YOUR_LANGUAGE
target_variable = self._view_variable.VAR_YOUR_LANGUAGE target_variable = self._view_variable.VAR_YOUR_LANGUAGE
@@ -56,8 +64,8 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
callback = self._view_variable.CALLBACK_SELECTED_TARGET_LANGUAGE callback = self._view_variable.CALLBACK_SELECTED_TARGET_LANGUAGE
target_variable = self._view_variable.VAR_TARGET_LANGUAGE target_variable = self._view_variable.VAR_TARGET_LANGUAGE
target_variable.set(value) target_variable.set(set_value)
callFunctionIfCallable(callback, value) callFunctionIfCallable(callback, callback_value)
self.vrct_gui._closeSelectableLanguagesWindow() self.vrct_gui._closeSelectableLanguagesWindow()
@@ -135,7 +143,7 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
max_row+=1 max_row+=1
row=0 row=0
column=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 = 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") self.wrapper.grid(row=row, column=column, sticky="nsew")
@@ -144,10 +152,9 @@ class _CreateSelectableLanguagesWindow(CTkToplevel):
self.wrapper.grid_rowconfigure((0,2), weight=1) self.wrapper.grid_rowconfigure((0,2), weight=1)
selectable_language_name_for_text = selectable_language_name.replace("\n", " ")
label_widget = CTkLabel( label_widget = CTkLabel(
self.wrapper, self.wrapper,
text=selectable_language_name_for_text, text=f"{selectable_language_dict['language']} ({selectable_language_dict['country']})",
height=0, height=0,
corner_radius=0, corner_radius=0,
font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.VALUES_TEXT_FONT_SIZE, weight="normal"), font=CTkFont(family=self.settings.FONT_FAMILY, size=self.settings.uism.VALUES_TEXT_FONT_SIZE, weight="normal"),
@@ -164,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) bindButtonReleaseFunction([self.wrapper, label_widget], callback)
if row == max_row: if row == max_row: