Translate the git panel, and drop a worker nothing used

Reviewing the new code again turned up two things.

GitWorker was never instantiated anywhere: the panel has a worker of its own and
the service layer is called directly. It is gone rather than left as a class
that looks available but is not.

The panel''s buttons and prompts were hard-coded English, while the language
files have carried translations for exactly those strings all along -- the new
stash and conflict buttons had followed the same pattern. They read from the
dictionary now, which puts eighteen unused keys back to work and adds the ones
the new buttons and dialogs need.

Author: JE-Chen

je_editor/git_client/git_action.py

@@ -1,8 +1,6 @@
 import os
 from datetime import datetime
-from typing import Any, Callable
 
-from PySide6.QtCore import QThread, Signal
 from git import Repo, GitCommandError, InvalidGitRepositoryError, NoSuchPathError
 
 from je_editor.utils.logging.loggin_instance import jeditor_logger
@@ -269,29 +267,3 @@ def _ensure_repo(self) -> None:
 
 # Null tree constant for initial commit diff
 NULL_TREE = "4b825dc642cb6eb9a060e54bf8d69288fbee4904"
-
-
-# Worker thread wrapper
-class GitWorker(QThread):
-    """
-    Runs a function in a separate thread to avoid blocking the UI.
-    Emits (result, error) when done.
-    """
-    done = Signal(object, object)
-
-    def __init__(self, fn: Callable, *args: Any, **kwargs: Any) -> None:
-        super().__init__()
-        # 具名執行緒：萬一它在執行中被銷毀，Qt 的中止訊息才說得出是哪一條
-        # A named thread, so Qt's abort message says which one if it is ever
-        # destroyed while still running
-        self.setObjectName("GitWorker")
-        self.fn = fn
-        self.args = args
-        self.kwargs = kwargs
-
-    def run(self) -> None:
-        try:
-            res = self.fn(*self.args, **self.kwargs)
-            self.done.emit(res, None)
-        except Exception as e:
-            self.done.emit(None, e)

je_editor/pyside_ui/git_ui/git_client/git_client_gui.py

@@ -12,12 +12,38 @@
 
 from je_editor.git_client.git_action import GitService
 from je_editor.utils.logging.loggin_instance import jeditor_logger
+from je_editor.utils.multi_language.multi_language_wrapper import language_wrapper
 
 # UI 常數 / UI constants
 _CLONE_REPO_LABEL = "Clone Repo"
 _REPO_STATUS_DEFAULT = "Status: -"
 
 
+def _text(key: str) -> str:
+    """
+    取得翻譯後的文字
+    The translated text for a key.
+
+    這個面板的字串原本是寫死的英文，但語言檔裡一直有對應的翻譯沒被用到。
+    This panel's strings used to be hard-coded English while the translations for
+    them sat unused in the language files.
+
+    :param key: 語言鍵 / the language key
+    :return: 翻譯後的文字 / the translated text
+    """
+    return language_wrapper.language_word_dict.get(key, key)
+
+
+def _word(key: str) -> QPushButton:
+    """建立一個帶翻譯文字的按鈕 / A button labelled with a translated key."""
+    return QPushButton(_text(key))
+
+
+def _label(key: str) -> QLabel:
+    """建立一個帶翻譯文字的標籤 / A label showing a translated key."""
+    return QLabel(_text(key))
+
+
 class _GitWorker(QObject):
     """背景執行 Git 操作的 Worker / Background worker for Git operations"""
     finished = Signal(object)  # result
@@ -88,16 +114,16 @@ def _run_git_in_background(self, func: Callable, on_done: Callable | None = None
     def _init_ui(self) -> None:
         # === Top controls / 上方控制區 ===
         self.repo_path_label = QLabel("Repository: (none)")
-        self.open_repo_button = QPushButton("Open Repo")
+        self.open_repo_button = _word("btn_open_repo")
         self.branch_selector = QComboBox()
-        self.checkout_button = QPushButton("Checkout")
+        self.checkout_button = _word("btn_checkout")
         self.clone_repo_button = QPushButton(_CLONE_REPO_LABEL)
         self.repo_status_label = QLabel(_REPO_STATUS_DEFAULT)
         self.commit_status_label = QLabel("Unpushed commits: ...")
 
         top = QHBoxLayout()
         top.addWidget(self.repo_path_label, 1)
-        top.addWidget(QLabel("Branch:"))
+        top.addWidget(_label("label_branch"))
         top.addWidget(self.branch_selector, 1)
         top.addWidget(self.checkout_button)
         top.addWidget(self.open_repo_button)
@@ -134,21 +160,21 @@ def _init_ui(self) -> None:
 
         # === Bottom: staging and commit controls / 下方：stage 與 commit 控制 ===
         self.commit_message_input = QLineEdit()
-        self.commit_message_input.setPlaceholderText("Commit message...")
-        self.stage_selected_button = QPushButton("Stage Selected")
-        self.unstage_selected_button = QPushButton("Unstage Selected")
-        self.stage_all_button = QPushButton("Stage All")
-        self.commit_button = QPushButton("Commit")
-        self.unstage_all_button = QPushButton("Unstage All")
-        self.track_all_untracked_button = QPushButton("Track All Untracked")
-        self.git_push_button = QPushButton("Push")
+        self.commit_message_input.setPlaceholderText(_text("placeholder_commit_message"))
+        self.stage_selected_button = _word("btn_stage_selected")
+        self.unstage_selected_button = _word("btn_unstage_selected")
+        self.stage_all_button = _word("btn_stage_all")
+        self.commit_button = _word("btn_commit")
+        self.unstage_all_button = _word("btn_unstage_all")
+        self.track_all_untracked_button = _word("btn_track_all_untracked")
+        self.git_push_button = _word("btn_push")
         # 收起手邊的修改與解決合併衝突 / Putting work down, and settling a merge
-        self.stash_button = QPushButton("Stash")
-        self.stash_pop_button = QPushButton("Pop Stash")
-        self.resolve_button = QPushButton("Resolve Conflict")
+        self.stash_button = _word("btn_stash")
+        self.stash_pop_button = _word("btn_stash_pop")
+        self.resolve_button = _word("btn_resolve_conflict")
 
         bottom = QHBoxLayout()
-        bottom.addWidget(QLabel("Message:"))
+        bottom.addWidget(_label("label_message"))
         bottom.addWidget(self.commit_message_input, 1)
         bottom.addWidget(self.stage_selected_button)
         bottom.addWidget(self.unstage_selected_button)
@@ -738,7 +764,7 @@ def on_stash_changes(self) -> None:
         try:
             service.stash_save(message)
         except GitCommandError as error:
-            QMessageBox.critical(self, "Error", f"Could not stash:\n{error}")
+            QMessageBox.critical(self, "Error", f"{_text('err_stash')}:\n{error}")
             return
         self.commit_message_input.clear()
         self._refresh_change_list()
@@ -757,16 +783,18 @@ def on_pop_stash(self) -> None:
             return
         stashes = service.stash_list()
         if not stashes:
-            QMessageBox.information(self, "Stash", "There is nothing stashed.")
+            QMessageBox.information(
+                self, _text("btn_stash"), _text("info_no_stash"))
             return
         chosen, confirmed = QInputDialog.getItem(
-            self, "Pop Stash", "Take back:", stashes, 0, False)
+            self, _text("dialog_stash_pop_title"), _text("dialog_stash_pop_prompt"),
+            stashes, 0, False)
         if not confirmed or not chosen:
             return
         try:
             service.stash_pop(stashes.index(chosen))
         except GitCommandError as error:
-            QMessageBox.critical(self, "Error", f"Could not pop the stash:\n{error}")
+            QMessageBox.critical(self, "Error", f"{_text('err_stash_pop')}:\n{error}")
             return
         self._refresh_change_list()
 
@@ -784,19 +812,23 @@ def on_resolve_conflict(self) -> None:
             return
         conflicts = service.conflicted_files()
         if not conflicts:
-            QMessageBox.information(self, "Conflicts", "Nothing is in conflict.")
+            QMessageBox.information(
+                self, _text("dialog_resolve_title"), _text("info_no_conflicts"))
             return
         chosen, confirmed = QInputDialog.getItem(
-            self, "Resolve Conflict", "File:", conflicts, 0, False)
+            self, _text("dialog_resolve_title"), _text("dialog_resolve_file_prompt"),
+            conflicts, 0, False)
         if not confirmed or not chosen:
             return
         keep, confirmed = QInputDialog.getItem(
-            self, "Resolve Conflict", f"Keep which side of {chosen}?",
+            self, _text("dialog_resolve_title"),
+            _text("dialog_resolve_side_prompt").format(file=chosen),
             ["ours", "theirs"], 0, False)
         if not confirmed or not keep:
             return
         if not service.resolve_conflict(chosen, keep):
-            QMessageBox.critical(self, "Error", f"Could not resolve {chosen}.")
+            QMessageBox.critical(
+                self, "Error", _text("err_resolve").format(file=chosen))
             return
         self._refresh_change_list()
 

je_editor/utils/multi_language/english.py

@@ -204,6 +204,24 @@
     "placeholder_commit_message": "Commit message...",
     "btn_stage_all": "Stage All",
     "btn_commit": "Commit",
+    "btn_checkout": "Checkout",
+    "btn_stage_selected": "Stage Selected",
+    "btn_unstage_selected": "Unstage Selected",
+    "btn_unstage_all": "Unstage All",
+    "btn_track_all_untracked": "Track All Untracked",
+    "btn_stash": "Stash",
+    "btn_stash_pop": "Pop Stash",
+    "btn_resolve_conflict": "Resolve Conflict",
+    "dialog_stash_pop_title": "Pop Stash",
+    "dialog_stash_pop_prompt": "Take back:",
+    "info_no_stash": "There is nothing stashed.",
+    "err_stash": "Could not stash",
+    "err_stash_pop": "Could not pop the stash",
+    "dialog_resolve_title": "Resolve Conflict",
+    "dialog_resolve_file_prompt": "File:",
+    "dialog_resolve_side_prompt": "Keep which side of {file}?",
+    "info_no_conflicts": "Nothing is in conflict.",
+    "err_resolve": "Could not resolve {file}",
     "label_message": "Message:",
     "dialog_choose_repo": "Choose Git Repo",
     "err_open_repo": "Failed to open repository",

je_editor/utils/multi_language/traditional_chinese.py

@@ -195,6 +195,24 @@
     "placeholder_commit_message": "提交訊息...",
     "btn_stage_all": "暫存全部",
     "btn_commit": "提交",
+    "btn_checkout": "切換",
+    "btn_stage_selected": "暫存選取",
+    "btn_unstage_selected": "取消暫存選取",
+    "btn_unstage_all": "全部取消暫存",
+    "btn_track_all_untracked": "追蹤所有未追蹤檔案",
+    "btn_stash": "收起修改",
+    "btn_stash_pop": "取回修改",
+    "btn_resolve_conflict": "解決衝突",
+    "dialog_stash_pop_title": "取回修改",
+    "dialog_stash_pop_prompt": "要取回哪一筆：",
+    "info_no_stash": "目前沒有收起任何修改。",
+    "err_stash": "無法收起修改",
+    "err_stash_pop": "無法取回修改",
+    "dialog_resolve_title": "解決衝突",
+    "dialog_resolve_file_prompt": "檔案：",
+    "dialog_resolve_side_prompt": "{file} 要保留哪一邊？",
+    "info_no_conflicts": "目前沒有衝突。",
+    "err_resolve": "無法解決 {file}",
     "label_message": "訊息：",
     "dialog_choose_repo": "選擇 Git 儲存庫",
     "err_open_repo": "開啟儲存庫失敗",

test/test_git_panel_stash.py

@@ -35,6 +35,29 @@ def panel(qapp, qtbot, repo):
     widget.close()
 
 
+class TestTheLabelsAreTranslated:
+    """
+    The panel's strings were hard-coded English while the translations for them
+    sat unused in the language files.
+    """
+
+    def test_a_button_shows_the_translated_text(self, panel):
+        from je_editor.utils.multi_language.multi_language_wrapper import language_wrapper
+        widget, _repo = panel
+        assert widget.commit_button.text() == \
+            language_wrapper.language_word_dict.get("btn_commit")
+
+    def test_the_new_buttons_are_translated_too(self, panel):
+        from je_editor.utils.multi_language.multi_language_wrapper import language_wrapper
+        widget, _repo = panel
+        assert widget.stash_button.text() == \
+            language_wrapper.language_word_dict.get("btn_stash")
+
+    def test_a_missing_key_falls_back_to_itself(self):
+        from je_editor.pyside_ui.git_ui.git_client.git_client_gui import _text
+        assert _text("no_such_key") == "no_such_key"
+
+
 class TestTheButtonsExist:
     """
     The operations had tests but no way to reach them: GitService had no UI