From c9dd35256567926dd682fb90fdc00d544cb27ec4 Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Wed, 17 Sep 2025 17:05:59 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=81=AE=E5=A4=89=E6=8F=9B=E5=87=A6=E7=90=86=E3=82=92=E6=94=B9?= =?UTF-8?q?=E5=96=84=E3=81=97=E3=80=81=E6=97=A5=E6=9C=AC=E8=AA=9E=E3=81=AE?= =?UTF-8?q?=E3=83=88=E3=83=A9=E3=83=B3=E3=82=B9=E3=83=AA=E3=83=86=E3=83=AC?= =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E3=82=92=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/controller.py | 99 ++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 44 deletions(-) diff --git a/src-python/controller.py b/src-python/controller.py index dff9b2e4..bbaf0a70 100644 --- a/src-python/controller.py +++ b/src-python/controller.py @@ -299,25 +299,28 @@ class Controller: # その他のエラーは通常通り処理 raise - if config.CONVERT_MESSAGE_TO_HIRAGANA is True or config.CONVERT_MESSAGE_TO_ROMAJI is True: - if config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] == "Japanese": - transliteration_message = model.convertMessageToTransliteration( - message, - hiragana=config.CONVERT_MESSAGE_TO_HIRAGANA, - romaji=config.CONVERT_MESSAGE_TO_ROMAJI - ) + if config.CONVERT_MESSAGE_TO_HIRAGANA is True or config.CONVERT_MESSAGE_TO_ROMAJI is True: + if config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] == "Japanese": + transliteration_message = model.convertMessageToTransliteration( + message, + hiragana=config.CONVERT_MESSAGE_TO_HIRAGANA, + romaji=config.CONVERT_MESSAGE_TO_ROMAJI + ) - for i, no in enumerate(config.SELECTED_TAB_TARGET_LANGUAGES_NO_LIST): - if config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO][no]["language"] == "Japanese": - transliteration_translation.append( - model.convertMessageToTransliteration( - translation[i], - hiragana=config.CONVERT_MESSAGE_TO_HIRAGANA, - romaji=config.CONVERT_MESSAGE_TO_ROMAJI - ) + for i, no in enumerate(config.SELECTED_TAB_TARGET_LANGUAGES_NO_LIST): + if (config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO][no]["language"] == "Japanese" and + config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO][no]["enable"] is True): + transliteration_translation.append( + model.convertMessageToTransliteration( + translation[i], + hiragana=config.CONVERT_MESSAGE_TO_HIRAGANA, + romaji=config.CONVERT_MESSAGE_TO_ROMAJI ) - else: - transliteration_translation.append([]) + ) + else: + transliteration_translation.append([]) + else: + transliteration_translation = [[] for _ in config.SELECTED_TAB_TARGET_LANGUAGES_NO_LIST] if config.ENABLE_TRANSCRIPTION_SEND is True: if config.SEND_MESSAGE_TO_VRC is True: @@ -450,21 +453,26 @@ class Controller: # その他のエラーは通常通り処理 raise - if config.CONVERT_MESSAGE_TO_HIRAGANA is True or config.CONVERT_MESSAGE_TO_ROMAJI is True: - if language == "Japanese": - transliteration_message = model.convertMessageToTransliteration( - message, - hiragana=config.CONVERT_MESSAGE_TO_HIRAGANA, - romaji=config.CONVERT_MESSAGE_TO_ROMAJI - ) - - if config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] == "Japanese": - transliteration_translation = model.convertMessageToTransliteration( - translation[0], - hiragana=config.CONVERT_MESSAGE_TO_HIRAGANA, - romaji=config.CONVERT_MESSAGE_TO_ROMAJI + if config.CONVERT_MESSAGE_TO_HIRAGANA is True or config.CONVERT_MESSAGE_TO_ROMAJI is True: + if language == "Japanese": + transliteration_message = model.convertMessageToTransliteration( + message, + hiragana=config.CONVERT_MESSAGE_TO_HIRAGANA, + romaji=config.CONVERT_MESSAGE_TO_ROMAJI ) + if (config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] == "Japanese" and + config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["enable"] is True): + transliteration_translation = model.convertMessageToTransliteration( + translation[0], + hiragana=config.CONVERT_MESSAGE_TO_HIRAGANA, + romaji=config.CONVERT_MESSAGE_TO_ROMAJI + ) + else: + transliteration_translation.append([]) + else: + transliteration_translation = [[] for _ in config.SELECTED_TAB_TARGET_LANGUAGES_NO_LIST] + if config.ENABLE_TRANSCRIPTION_RECEIVE is True: if config.OVERLAY_SMALL_LOG is True and model.overlay.initialized is True: if config.OVERLAY_SHOW_ONLY_TRANSLATED_MESSAGES is True: @@ -622,23 +630,26 @@ class Controller: # その他のエラーは通常通り処理 raise - if config.CONVERT_MESSAGE_TO_HIRAGANA is True or config.CONVERT_MESSAGE_TO_ROMAJI is True: - if config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] == "Japanese": - transliteration_message = model.convertMessageToTransliteration( - message, + if config.CONVERT_MESSAGE_TO_HIRAGANA is True or config.CONVERT_MESSAGE_TO_ROMAJI is True: + if config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] == "Japanese": + transliteration_message = model.convertMessageToTransliteration( + message, + hiragana=config.CONVERT_MESSAGE_TO_HIRAGANA, + romaji=config.CONVERT_MESSAGE_TO_ROMAJI + ) + for i, no in enumerate(config.SELECTED_TAB_TARGET_LANGUAGES_NO_LIST): + if (config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO][no]["language"] == "Japanese" and + config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO][no]["enable"] is True): + transliteration = model.convertMessageToTransliteration( + translation[i], hiragana=config.CONVERT_MESSAGE_TO_HIRAGANA, romaji=config.CONVERT_MESSAGE_TO_ROMAJI ) - for i, no in enumerate(config.SELECTED_TAB_TARGET_LANGUAGES_NO_LIST): - if config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO][no]["language"] == "Japanese": - transliteration = model.convertMessageToTransliteration( - translation[i], - hiragana=config.CONVERT_MESSAGE_TO_HIRAGANA, - romaji=config.CONVERT_MESSAGE_TO_ROMAJI - ) - transliteration_translation.append(transliteration) - else: - transliteration_translation.append([]) + transliteration_translation.append(transliteration) + else: + transliteration_translation.append([]) + else: + transliteration_translation = [[] for _ in config.SELECTED_TAB_TARGET_LANGUAGES_NO_LIST] # send OSC message if config.SEND_MESSAGE_TO_VRC is True: