From ff675330c6f453feb5c790b60fe1d72304fd06cb Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sat, 14 Oct 2023 15:57:01 +0900 Subject: [PATCH] =?UTF-8?q?[Update]=20Main=20Window:=20Textbox=20log?= =?UTF-8?q?=E5=86=85=E3=81=AE=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0=E3=83=A1?= =?UTF-8?q?=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=82=92=E8=8B=B1=E8=AA=9E?= =?UTF-8?q?=E3=81=A8=E6=97=A5=E6=9C=AC=E8=AA=9E=E3=81=AB=E5=AF=BE=E5=BF=9C?= =?UTF-8?q?=E3=80=82=E6=96=87=E8=A8=80=E8=AA=BF=E6=95=B4=E3=80=82=20[Refac?= =?UTF-8?q?tor]=20Commented=20out=20the=20code=20that=20is=20no=20longer?= =?UTF-8?q?=20in=20use=20in=20view.py=20(osc=20error=20message)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/en.yml | 22 ++++++++++++++++++++++ locales/ja.yml | 21 +++++++++++++++++++++ view.py | 42 ++++++++++++++++++++---------------------- 3 files changed, 63 insertions(+), 22 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index 3fef05fe..b1fc34da 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -14,15 +14,37 @@ main_window: textbox_tab_received: Received textbox_tab_system: System + textbox_system_message: + enabled_translation: Translation feature is turned on. + disabled_translation: Translation feature is turned off. + enabled_voice2chatbox: Transcription from the microphone has started. + disabled_voice2chatbox: Transcription from the microphone has been stopped. + enabled_speaker2log: Transcription from the speaker has started. + disabled_speaker2log: Transcription from the speaker has been stopped. + enabled_foreground: The screen is fixed in the foreground. + disabled_foreground: The foreground fixation has been released. + + auth_key_success: Auth key update completed. + auth_key_error: Auth Key is incorrect or Usage limit reached. + + detected_by_word_filter: The word %{detected_message} has not been sent due to detection by the word filter. + + selected_your_language: "\"Your Language\" has set to %{your_language}." + selected_target_language: "\"Target Language\" has set to %{target_language}." + switched_language_preset_tab: Switched to Language Preset Tab No.%{tab_no}." + latest_language_setting: "Currently, \"Your Language\" is set to %{your_language}, and \"Target Language\" is set to %{target_language}." + update_available: New version is here! cover_message: The functionality is temporarily disabled until the settings window is closed. + selectable_language_window: title_your_language: Select Your Language title_target_language: Select Target Language go_back_button: Go Back + config_window: config_title: Settings compact_mode: Compact Mode diff --git a/locales/ja.yml b/locales/ja.yml index f6bb107e..93758f5d 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -14,6 +14,26 @@ main_window: textbox_tab_received: 受信 textbox_tab_system: システム + textbox_system_message: + enabled_translation: 翻訳機能をONにしました。 + disabled_translation: 翻訳機能をOFFしました。 + enabled_voice2chatbox: マイクからの音声入力、文字起こしを開始します。 + disabled_voice2chatbox: マイクからの音声入力、文字起こしを終了しました。 + enabled_speaker2log: スピーカーからの音声聞き取り、文字起こしを開始します。 + disabled_speaker2log: スピーカーからの音声聞き取り、文字起こしを終了しました。 + enabled_foreground: 画面を常に最前面へ固定します。 + disabled_foreground: 最前面への固定を解除しました。 + + auth_key_success: 認証キーの更新が完了しました。 + auth_key_error: 認証キーが間違っているか、API使用制限が上限に達しています. + + detected_by_word_filter: ワードフィルターに登録されている単語 %{detected_message} が検出されたため送信しませんでした。 + + selected_your_language: 「あなたの言語」 を %{your_language} に設定しました。 + selected_target_language: 「相手の言語」 を %{target_language} に設定しました。 + switched_language_preset_tab: 言語プリセット番号 %{tab_no} に切り替わりました。 + latest_language_setting: 現在「あなたの言語」は %{your_language}、「相手の言語」は %{target_language} に設定されています。 + update_available: 新しいバージョンが出ました！ cover_message: 設定画面が閉じられるまで、一時的に機能を停止しています。 @@ -24,6 +44,7 @@ selectable_language_window: title_target_language: 相手の言語 go_back_button: 戻る + config_window: config_title: 設定 compact_mode: コンパクトモード diff --git a/view.py b/view.py index 6af00b34..83d82eda 100644 --- a/view.py +++ b/view.py @@ -597,56 +597,54 @@ class View(): def printToTextbox_enableTranslation(self): - self._printToTextbox_Info("翻訳機能をONにしました") + self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.enabled_translation")) def printToTextbox_disableTranslation(self): - self._printToTextbox_Info("翻訳機能をOFFにしました") + self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.disabled_translation")) def printToTextbox_enableTranscriptionSend(self): - self._printToTextbox_Info("Voice2chatbox機能をONにしました") + self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.enabled_voice2chatbox")) def printToTextbox_disableTranscriptionSend(self): - self._printToTextbox_Info("Voice2chatbox機能をOFFにしました") + self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.disabled_voice2chatbox")) def printToTextbox_enableTranscriptionReceive(self): - self._printToTextbox_Info("Speaker2chatbox機能をONにしました") + self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.enabled_speaker2log")) def printToTextbox_disableTranscriptionReceive(self): - self._printToTextbox_Info("Speaker2chatbox機能をOFFにしました") + self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.disabled_speaker2log")) def printToTextbox_enableForeground(self): - self._printToTextbox_Info("Start foreground") + self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.enabled_foreground")) def printToTextbox_disableForeground(self): - self._printToTextbox_Info("Stop foreground") + self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.disabled_foreground")) def printToTextbox_AuthenticationSuccess(self): - self._printToTextbox_Info("Auth key update completed") - + self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.auth_key_success")) def printToTextbox_AuthenticationError(self): - self._printToTextbox_Info("Auth Key is incorrect or Usage limit reached") + self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.auth_key_error")) - def printToTextbox_OSCError(self): - self._printToTextbox_Info("OSC is not enabled, please enable OSC and rejoin. or turn off the \"Send Message To VRChat\" setting") + # def printToTextbox_OSCError(self): [Deprecated] + # self._printToTextbox_Info("OSC is not enabled, please enable OSC and rejoin. or turn off the \"Send Message To VRChat\" setting") def printToTextbox_DetectedByWordFilter(self, detected_message): - self._printToTextbox_Info(f"Detect WordFilter :{detected_message}") + self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.detected_by_word_filter"), detected_message=detected_message) def printToTextbox_selectedYourLanguages(self, selected_your_language): your_language = selected_your_language.replace("\n", " ") - self._printToTextbox_Info(f"Your Language has changed : {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): target_language = selected_target_language.replace("\n", " ") - self._printToTextbox_Info(f"Target Language has changed : {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): + self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.switched_language_preset_tab", tab_no=tab_no)) + self.printToTextbox_latestSelectedLanguages() def printToTextbox_latestSelectedLanguages(self): your_language = self.view_variable.VAR_YOUR_LANGUAGE.get().replace("\n", " ") target_language = self.view_variable.VAR_TARGET_LANGUAGE.get().replace("\n", " ") - self._printToTextbox_Info(f"Your Language : {your_language} -- Target Language : {target_language}") - - def printToTextbox_changedLanguagePresetTab(self, tab_no:str): - your_language = config.SELECTED_TAB_YOUR_LANGUAGES[tab_no].replace("\n", " ") - target_language = config.SELECTED_TAB_TARGET_LANGUAGES[tab_no].replace("\n", " ") - self._printToTextbox_Info(f"Switched Language Preset. No.{tab_no}\nYour Language : {your_language} -- Target Language : {target_language}") + self._printToTextbox_Info(i18n.t("main_window.textbox_system_message.latest_language_setting", your_language=your_language, target_language=target_language)) @staticmethod