🎉 v2.0.3: 修复按钮显示和国际化问题

✅ 修复PyInstaller配置，添加语言文件包含
✅ 修复所有硬编码中文文本的国际化问题
✅ 修复补丁状态'已补丁'的国际化显示
✅ 完善工作线程和补丁操作的多语言支持
✅ 更新版本号到v2.0.3

修复问题：
- 按钮显示键名而不是实际文本
- 语言文件在打包后缺失
- 工作线程日志硬编码中文
- 补丁状态显示硬编码中文

Author: BasicProtein

augment_tools_core/patch_manager.py

@@ -14,6 +14,15 @@
 
 from .common_utils import print_info, print_success, print_error, print_warning, IDEType
 
+# 导入语言管理器，但要处理可能的导入错误
+try:
+    from language_manager import get_text
+    LANGUAGE_SUPPORT = True
+except ImportError:
+    LANGUAGE_SUPPORT = False
+    def get_text(key, **kwargs):
+        return key
+
 
 class PatchMode(Enum):
     """补丁模式枚举"""
@@ -184,15 +193,15 @@ def get_patch_status(self, file_path: str) -> str:
         """获取文件的补丁状态"""
         try:
             if not os.path.exists(file_path):
-                return "文件不存在"
-            
+                return get_text("patch.status.file_not_found") if LANGUAGE_SUPPORT else "文件不存在"
+
             with open(file_path, 'r', encoding='utf-8') as f:
                 content = f.read()
-            
+
             if self._is_already_patched(content):
-                return "已补丁"
+                return get_text("patch.status.patched") if LANGUAGE_SUPPORT else "已补丁"
             else:
-                return "未补丁"
-                
+                return get_text("patch.status.not_patched") if LANGUAGE_SUPPORT else "未补丁"
+
         except Exception:
-            return "状态未知"
+            return get_text("patch.status.status_unknown") if LANGUAGE_SUPPORT else "状态未知"

config/settings.json

@@ -1,5 +1,5 @@
 {
-  "language": "zh_CN",
+  "language": "en_US",
   "first_run": false,
   "window_geometry": "680x780",
   "last_selected_ide": "Cursor",

gui_qt6/components.py

@@ -5,12 +5,13 @@
 """
 
 from PyQt6.QtWidgets import (
-    QPushButton, QLabel, QFrame, QVBoxLayout, 
+    QPushButton, QLabel, QFrame, QVBoxLayout,
     QHBoxLayout, QWidget, QScrollArea
 )
 from PyQt6.QtCore import Qt, pyqtSignal
 from PyQt6.QtGui import QFont, QCursor
 from .font_manager import get_button_font, get_default_font, get_title_font
+from language_manager import get_text
 
 
 class ModernButton(QPushButton):
@@ -198,7 +199,7 @@ def _setup_ui(self):
         layout.setContentsMargins(0, 0, 0, 0)
 
         # 语言标签
-        self.label = SecondaryLabel("语言:")
+        self.label = SecondaryLabel(get_text("app.language"))
         layout.addWidget(self.label)
 
         # 语言下拉框 - 将在主窗口中实现

gui_qt6/main_page.py

@@ -763,20 +763,21 @@ def _on_scan_completed(self, results: dict):
         ide_results = results.get(ide_type.value, [])
 
         if not ide_results:
-            self.patch_status_label.setText("状态: 未找到扩展文件")
+            self.patch_status_label.setText(get_text("status.not_scanned"))
             self.patch_status_label.setStyleSheet("color: #6b7280; font-style: italic;")
         else:
-            patched_count = sum(1 for r in ide_results if r['status'] == '已补丁')
+            patched_status = get_text("patch.status.patched")
+            patched_count = sum(1 for r in ide_results if r['status'] == patched_status)
             total_count = len(ide_results)
 
             if patched_count == 0:
-                self.patch_status_label.setText(f"状态: 未补丁 ({total_count} 个文件)")
+                self.patch_status_label.setText(f"{get_text('status.not_scanned')}: {get_text('patch.status.not_patched')} ({total_count} 个文件)")
                 self.patch_status_label.setStyleSheet("color: #dc2626; font-weight: bold;")
             elif patched_count == total_count:
-                self.patch_status_label.setText(f"状态: 已补丁 ({patched_count}/{total_count})")
+                self.patch_status_label.setText(f"{get_text('status.ready')}: {get_text('patch.status.patched')} ({patched_count}/{total_count})")
                 self.patch_status_label.setStyleSheet("color: #059669; font-weight: bold;")
             else:
-                self.patch_status_label.setText(f"状态: 部分补丁 ({patched_count}/{total_count})")
+                self.patch_status_label.setText(f"{get_text('status.warning')}: 部分补丁 ({patched_count}/{total_count})")
                 self.patch_status_label.setStyleSheet("color: #d97706; font-weight: bold;")
 
     def _on_patch_file_found(self, file_path: str, status: str):

gui_qt6/patch_worker.py

@@ -9,6 +9,7 @@
 from augment_tools_core.common_utils import IDEType, print_info, print_success, print_error, print_warning
 from augment_tools_core.patch_manager import PatchManager, PatchMode, PatchResult
 from augment_tools_core.extension_finder import ExtensionFinder
+from language_manager import get_text
 
 
 class PatchWorker(QThread):
@@ -30,55 +31,56 @@ def __init__(self, ide_type: IDEType, patch_mode: PatchMode, portable_root: Opti
     def run(self):
         """执行补丁操作"""
         try:
-            self.progress_updated.emit("🔍 正在查找扩展文件...")
-            
+            self.progress_updated.emit(get_text("patch.searching"))
+
             # 查找扩展文件
             extension_files = self.extension_finder.find_extension_files(
                 self.ide_type, self.portable_root
             )
-            
+
             if not extension_files:
-                self.patch_completed.emit(False, f"未找到 {self.ide_type.value} 的扩展文件")
+                self.patch_completed.emit(False, get_text("patch.not_found", ide_type=self.ide_type.value))
                 return
-            
-            self.progress_updated.emit(f"📁 找到 {len(extension_files)} 个扩展文件")
-            
+
+            self.progress_updated.emit(get_text("patch.found_files", count=len(extension_files)))
+
             # 对每个文件应用补丁
             success_count = 0
             total_files = len(extension_files)
-            
+
             for i, file_path in enumerate(extension_files, 1):
-                self.progress_updated.emit(f"🔧 正在处理文件 {i}/{total_files}: {file_path}")
-                
+                self.progress_updated.emit(get_text("patch.processing",
+                                                  current=i, total=total_files, file=file_path))
+
                 # 检查文件状态
                 status = self.patch_manager.get_patch_status(file_path)
                 self.file_found.emit(file_path, status)
-                
-                if status == "已补丁":
-                    self.progress_updated.emit(f"⏭️ 文件已补丁，跳过: {file_path}")
+
+                if status == get_text("patch.status.patched"):
+                    self.progress_updated.emit(get_text("patch.already_patched", file=file_path))
                     continue
-                
+
                 # 应用补丁
                 result = self.patch_manager.apply_patch(file_path, self.patch_mode)
-                
+
                 if result.success:
                     success_count += 1
-                    self.progress_updated.emit(f"✅ 补丁成功: {file_path}")
+                    self.progress_updated.emit(get_text("patch.patch_success", file=file_path))
                 else:
-                    self.progress_updated.emit(f"❌ 补丁失败: {result.message}")
-            
+                    self.progress_updated.emit(get_text("patch.patch_failed", message=result.message))
+
             # 完成总结
             if success_count > 0:
-                message = f"补丁操作完成！成功处理 {success_count}/{total_files} 个文件"
+                message = get_text("patch.completed", success=success_count, total=total_files)
                 self.progress_updated.emit(f"🎉 {message}")
                 self.patch_completed.emit(True, message)
             else:
-                message = "没有文件被成功补丁"
+                message = get_text("patch.no_success")
                 self.progress_updated.emit(f"⚠️ {message}")
                 self.patch_completed.emit(False, message)
-                
+
         except Exception as e:
-            error_msg = f"补丁操作失败: {str(e)}"
+            error_msg = get_text("patch.error", error=str(e))
             self.progress_updated.emit(f"❌ {error_msg}")
             self.patch_completed.emit(False, error_msg)
 
@@ -100,46 +102,47 @@ def __init__(self, ide_type: IDEType, portable_root: Optional[str] = None):
     def run(self):
         """执行恢复操作"""
         try:
-            self.progress_updated.emit("🔍 正在查找扩展文件...")
-            
+            self.progress_updated.emit(get_text("patch.searching"))
+
             # 查找扩展文件
             extension_files = self.extension_finder.find_extension_files(
                 self.ide_type, self.portable_root
             )
-            
+
             if not extension_files:
-                self.restore_completed.emit(False, f"未找到 {self.ide_type.value} 的扩展文件")
+                self.restore_completed.emit(False, get_text("patch.not_found", ide_type=self.ide_type.value))
                 return
-            
-            self.progress_updated.emit(f"📁 找到 {len(extension_files)} 个扩展文件")
-            
+
+            self.progress_updated.emit(get_text("patch.found_files", count=len(extension_files)))
+
             # 对每个文件尝试恢复
             success_count = 0
             total_files = len(extension_files)
-            
+
             for i, file_path in enumerate(extension_files, 1):
-                self.progress_updated.emit(f"🔄 正在恢复文件 {i}/{total_files}: {file_path}")
-                
+                self.progress_updated.emit(get_text("patch.restoring",
+                                                  current=i, total=total_files, file=file_path))
+
                 result = self.patch_manager.restore_from_backup(file_path)
-                
+
                 if result.success:
                     success_count += 1
-                    self.progress_updated.emit(f"✅ 恢复成功: {file_path}")
+                    self.progress_updated.emit(get_text("patch.restore_success", file=file_path))
                 else:
-                    self.progress_updated.emit(f"⚠️ 恢复跳过: {result.message}")
-            
+                    self.progress_updated.emit(get_text("patch.restore_skipped", message=result.message))
+
             # 完成总结
             if success_count > 0:
-                message = f"恢复操作完成！成功恢复 {success_count}/{total_files} 个文件"
+                message = get_text("patch.restore_completed", success=success_count, total=total_files)
                 self.progress_updated.emit(f"🎉 {message}")
                 self.restore_completed.emit(True, message)
             else:
-                message = "没有文件需要恢复或恢复失败"
+                message = get_text("patch.restore_no_success")
                 self.progress_updated.emit(f"⚠️ {message}")
                 self.restore_completed.emit(False, message)
-                
+
         except Exception as e:
-            error_msg = f"恢复操作失败: {str(e)}"
+            error_msg = get_text("patch.restore_error", error=str(e))
             self.progress_updated.emit(f"❌ {error_msg}")
             self.restore_completed.emit(False, error_msg)
 
@@ -162,16 +165,16 @@ def __init__(self, ide_types: List[IDEType], portable_roots: Optional[Dict[IDETy
     def run(self):
         """执行扫描操作"""
         try:
-            self.progress_updated.emit("🔍 开始扫描所有IDE的扩展文件...")
-            
+            self.progress_updated.emit(get_text("patch.scanning"))
+
             results = {}
-            
+
             for ide_type in self.ide_types:
-                self.progress_updated.emit(f"📂 正在扫描 {ide_type.value}...")
-                
+                self.progress_updated.emit(get_text("patch.scanning_ide", ide_type=ide_type.value))
+
                 portable_root = self.portable_roots.get(ide_type)
                 extension_files = self.extension_finder.find_extension_files(ide_type, portable_root)
-                
+
                 ide_results = []
                 for file_path in extension_files:
                     status = self.patch_manager.get_patch_status(file_path)
@@ -180,15 +183,16 @@ def run(self):
                         'status': status
                     })
                     self.file_found.emit(ide_type.value, file_path, status)
-                
+
                 results[ide_type.value] = ide_results
-                self.progress_updated.emit(f"✅ {ide_type.value} 扫描完成，找到 {len(extension_files)} 个文件")
-            
-            self.progress_updated.emit("🎉 扫描完成！")
+                self.progress_updated.emit(get_text("patch.scan_completed",
+                                                  ide_type=ide_type.value, count=len(extension_files)))
+
+            self.progress_updated.emit(get_text("patch.scan_finished"))
             self.scan_completed.emit(results)
-            
+
         except Exception as e:
-            error_msg = f"扫描失败: {str(e)}"
+            error_msg = get_text("patch.scan_error", error=str(e))
             self.progress_updated.emit(f"❌ {error_msg}")
             self.scan_completed.emit({})
 
@@ -219,32 +223,33 @@ def __init__(self, ide_configs: Dict[IDEType, Dict]):
     def run(self):
         """执行批量补丁操作"""
         try:
-            self.progress_updated.emit("🚀 开始批量补丁操作...")
-            
+            self.progress_updated.emit(get_text("patch.batch_starting"))
+
             total_ides = len(self.ide_configs)
             results = {}
             overall_success = True
-            
+
             for i, (ide_type, config) in enumerate(self.ide_configs.items(), 1):
-                self.progress_updated.emit(f"🔧 正在处理 {ide_type.value} ({i}/{total_ides})...")
-                
+                self.progress_updated.emit(get_text("patch.batch_processing",
+                                                  ide_type=ide_type.value, current=i, total=total_ides))
+
                 patch_mode = config.get('patch_mode', PatchMode.RANDOM)
                 portable_root = config.get('portable_root')
-                
+
                 # 查找扩展文件
                 extension_files = self.extension_finder.find_extension_files(ide_type, portable_root)
-                
+
                 if not extension_files:
-                    message = f"未找到扩展文件"
+                    message = get_text("patch.batch_no_files")
                     results[ide_type.value] = {'success': False, 'message': message, 'files': []}
                     self.ide_completed.emit(ide_type.value, False, message)
                     overall_success = False
                     continue
-                
+
                 # 应用补丁
                 success_count = 0
                 file_results = []
-                
+
                 for file_path in extension_files:
                     result = self.patch_manager.apply_patch(file_path, patch_mode)
                     file_results.append({
@@ -254,30 +259,30 @@ def run(self):
                     })
                     if result.success:
                         success_count += 1
-                
+
                 # 记录结果
                 ide_success = success_count > 0
-                message = f"成功补丁 {success_count}/{len(extension_files)} 个文件"
+                message = get_text("patch.batch_success", success=success_count, total=len(extension_files))
                 results[ide_type.value] = {
                     'success': ide_success,
                     'message': message,
                     'files': file_results
                 }
-                
+
                 self.ide_completed.emit(ide_type.value, ide_success, message)
                 if not ide_success:
                     overall_success = False
-            
+
             # 完成总结
             if overall_success:
-                final_message = f"批量补丁完成！成功处理 {total_ides} 个IDE"
+                final_message = get_text("patch.batch_completed", count=total_ides)
             else:
-                final_message = f"批量补丁部分成功，请查看详细结果"
-            
+                final_message = get_text("patch.batch_partial")
+
             self.progress_updated.emit(f"🎉 {final_message}")
             self.batch_completed.emit(overall_success, final_message, results)
-            
+
         except Exception as e:
-            error_msg = f"批量补丁失败: {str(e)}"
+            error_msg = get_text("patch.batch_error", error=str(e))
             self.progress_updated.emit(f"❌ {error_msg}")
             self.batch_completed.emit(False, error_msg, {})