add more translations

Author: pyquick

oclp_r/support/translate_language.py

@@ -710,7 +710,40 @@ def utilities(self):
                 "Less than a minute ":"Less than a minute ", 
                 "Disabling Idle Sleep":"Disabling Idle Sleep",
                 "Re-enabling Idle Sleep":"Re-enabling Idle Sleep",
-                "Killing Process: {0} - {1}":"Killing Process: {0} - {1}"
+                "Killing Process: {0} - {1}":"Killing Process: {0} - {1}",
+                # dmg_mount.py
+                "- PatcherSupportPkg resources missing, Patcher likely corrupted!!!":"- PatcherSupportPkg resources missing, Patcher likely corrupted!!!",
+                "- Failed to mount Universal-Binaries.dmg":"- Failed to mount Universal-Binaries.dmg",
+                "- Mounted Universal-Binaries.dmg":"- Mounted Universal-Binaries.dmg",
+                "- Found HackdocInternal resources, mounting...":"- Found HackdocInternal resources, mounting...",
+                "- Failed to mount HackdocInternal resources":"- Failed to mount HackdocInternal resources",
+                "- Mounted HackdocInternal resources":"- Mounted HackdocInternal resources",
+                "- Failed to merge HackdocInternal resources":"- Failed to merge HackdocInternal resources",
+                "- Local PatcherSupportPkg resources available, continuing...":"- Local PatcherSupportPkg resources available, continuing...",
+                
+                # files.py
+                "  - Skipping {file_name}, cannot locate {source_folder}":"  - Skipping {file_name}, cannot locate {source_folder}",
+                "  - Installing: {file_name}":"  - Installing: {file_name}",
+                "  - Found existing {file_name}, overwriting...":"  - Found existing {file_name}, overwriting...",
+                "  - Removing: {file_name}":"  - Removing: {file_name}",
+                
+                # kdk_merge.py
+                "- Matching KDK determined to already be merged, skipping":"- Matching KDK determined to already be merged, skipping",
+                "- Backing up IOHIDEventDriver CodeSignature":"- Backing up IOHIDEventDriver CodeSignature",
+                "- Restoring IOHIDEventDriver CodeSignature":"- Restoring IOHIDEventDriver CodeSignature",
+                "  - CodeSignature folder missing, creating":"  - CodeSignature folder missing, creating",
+                "- Merging KDK with Root Volume: {kdk_name}":"- Merging KDK with Root Volume: {kdk_name}",
+                "- Failed to merge KDK with Root Volume":"- Failed to merge KDK with Root Volume",
+                "- Successfully merged KDK with Root Volume":"- Successfully merged KDK with Root Volume",
+                "Failed to install KDK":"Failed to install KDK",
+                "Unable to get KDK info: {error_msg}":"Unable to get KDK info: {error_msg}",
+                "Could not retrieve KDK: {error_msg}":"Could not retrieve KDK: {error_msg}",
+                "Could not download KDK: {error_msg}":"Could not download KDK: {error_msg}",
+                "KDK checksum validation failed: {error_msg}":"KDK checksum validation failed: {error_msg}",
+                "KDK was not installed, but should have been: {error_msg}":"KDK was not installed, but should have been: {error_msg}",
+                "Unable to find Kernel Debug Kit":"Unable to find Kernel Debug Kit",
+                "- Unable to find Kernel Debug Kit":"- Unable to find Kernel Debug Kit",
+                "- Found KDK at: {kdk_path}":"- Found KDK at: {kdk_path}"
             }
         elif self.language_point=="简体中文":
             trans={
@@ -721,7 +754,40 @@ def utilities(self):
                 "Less than a minute ":"不到一分钟 ", 
                 "Disabling Idle Sleep":"正在禁用休眠",
                 "Re-enabling Idle Sleep":"正在重新启用休眠",
-                "Killing Process: {0} - {1}":"正在终止进程: {0} - {1}"
+                "Killing Process: {0} - {1}":"正在终止进程: {0} - {1}",
+                # dmg_mount.py
+                "- PatcherSupportPkg resources missing, Patcher likely corrupted!!!":"- PatcherSupportPkg 资源缺失，修补程序可能已损坏！！！",
+                "- Failed to mount Universal-Binaries.dmg":"- 挂载 Universal-Binaries.dmg 失败",
+                "- Mounted Universal-Binaries.dmg":"- 已挂载 Universal-Binaries.dmg",
+                "- Found HackdocInternal resources, mounting...":"- 找到 HackdocInternal 资源，正在挂载...",
+                "- Failed to mount HackdocInternal resources":"- 挂载 HackdocInternal 资源失败",
+                "- Mounted HackdocInternal resources":"- 已挂载 HackdocInternal 资源",
+                "- Failed to merge HackdocInternal resources":"- 合并 HackdocInternal 资源失败",
+                "- Local PatcherSupportPkg resources available, continuing...":"- 本地 PatcherSupportPkg 资源可用，继续...",
+                
+                # files.py
+                "  - Skipping {file_name}, cannot locate {source_folder}":"  - 跳过 {file_name}，无法定位 {source_folder}",
+                "  - Installing: {file_name}":"  - 正在安装: {file_name}",
+                "  - Found existing {file_name}, overwriting...":"  - 找到现有 {file_name}，正在覆盖...",
+                "  - Removing: {file_name}":"  - 正在删除: {file_name}",
+                
+                # kdk_merge.py
+                "- Matching KDK determined to already be merged, skipping":"- 匹配的 KDK 已确定已合并，跳过",
+                "- Backing up IOHIDEventDriver CodeSignature":"- 正在备份 IOHIDEventDriver 代码签名",
+                "- Restoring IOHIDEventDriver CodeSignature":"- 正在恢复 IOHIDEventDriver 代码签名",
+                "  - CodeSignature folder missing, creating":"  - 代码签名文件夹缺失，正在创建",
+                "- Merging KDK with Root Volume: {kdk_name}":"- 正在将 KDK 与根卷合并: {kdk_name}",
+                "- Failed to merge KDK with Root Volume":"- 将 KDK 与根卷合并失败",
+                "- Successfully merged KDK with Root Volume":"- 成功将 KDK 与根卷合并",
+                "Failed to install KDK":"安装 KDK 失败",
+                "Unable to get KDK info: {error_msg}":"无法获取 KDK 信息: {error_msg}",
+                "Could not retrieve KDK: {error_msg}":"无法检索 KDK: {error_msg}",
+                "Could not download KDK: {error_msg}":"无法下载 KDK: {error_msg}",
+                "KDK checksum validation failed: {error_msg}":"KDK 校验和验证失败: {error_msg}",
+                "KDK was not installed, but should have been: {error_msg}":"KDK 未安装，但应该已安装: {error_msg}",
+                "Unable to find Kernel Debug Kit":"无法找到内核调试工具包",
+                "- Unable to find Kernel Debug Kit":"- 无法找到内核调试工具包",
+                "- Found KDK at: {kdk_path}":"- 在 {kdk_path} 找到 KDK"
             }
         return trans
 
@@ -2956,6 +3022,79 @@ def sys_patch_helpers(self):
             }
         return trans
 
+    def utilities(self):
+        if self.language_point=="English":
+            trans={
+                # dmg_mount.py
+                "- PatcherSupportPkg resources missing, Patcher likely corrupted!!!":"- PatcherSupportPkg resources missing, Patcher likely corrupted!!!",
+                "- Failed to mount Universal-Binaries.dmg":"- Failed to mount Universal-Binaries.dmg",
+                "- Mounted Universal-Binaries.dmg":"- Mounted Universal-Binaries.dmg",
+                "- Found HackdocInternal resources, mounting...":"- Found HackdocInternal resources, mounting...",
+                "- Failed to mount HackdocInternal resources":"- Failed to mount HackdocInternal resources",
+                "- Mounted HackdocInternal resources":"- Mounted HackdocInternal resources",
+                "- Failed to merge HackdocInternal resources":"- Failed to merge HackdocInternal resources",
+                "- Local PatcherSupportPkg resources available, continuing...":"- Local PatcherSupportPkg resources available, continuing...",
+                
+                # files.py
+                "  - Skipping {file_name}, cannot locate {source_folder}":"  - Skipping {file_name}, cannot locate {source_folder}",
+                "  - Installing: {file_name}":"  - Installing: {file_name}",
+                "  - Found existing {file_name}, overwriting...":"  - Found existing {file_name}, overwriting...",
+                "  - Removing: {file_name}":"  - Removing: {file_name}",
+                
+                # kdk_merge.py
+                "- Matching KDK determined to already be merged, skipping":"- Matching KDK determined to already be merged, skipping",
+                "- Backing up IOHIDEventDriver CodeSignature":"- Backing up IOHIDEventDriver CodeSignature",
+                "- Restoring IOHIDEventDriver CodeSignature":"- Restoring IOHIDEventDriver CodeSignature",
+                "  - CodeSignature folder missing, creating":"  - CodeSignature folder missing, creating",
+                "- Merging KDK with Root Volume: {kdk_name}":"- Merging KDK with Root Volume: {kdk_name}",
+                "- Failed to merge KDK with Root Volume":"- Failed to merge KDK with Root Volume",
+                "- Successfully merged KDK with Root Volume":"- Successfully merged KDK with Root Volume",
+                "Failed to install KDK":"Failed to install KDK",
+                "Unable to get KDK info: {error_msg}":"Unable to get KDK info: {error_msg}",
+                "Could not retrieve KDK: {error_msg}":"Could not retrieve KDK: {error_msg}",
+                "Could not download KDK: {error_msg}":"Could not download KDK: {error_msg}",
+                "KDK checksum validation failed: {error_msg}":"KDK checksum validation failed: {error_msg}",
+                "KDK was not installed, but should have been: {error_msg}":"KDK was not installed, but should have been: {error_msg}",
+                "- Unable to find Kernel Debug Kit":"- Unable to find Kernel Debug Kit",
+                "- Found KDK at: {kdk_path}":"- Found KDK at: {kdk_path}"
+            }
+        elif self.language_point=="简体中文":
+            trans={
+                # dmg_mount.py
+                "- PatcherSupportPkg resources missing, Patcher likely corrupted!!!":"- PatcherSupportPkg 资源缺失，修补程序可能已损坏！！！",
+                "- Failed to mount Universal-Binaries.dmg":"- 挂载 Universal-Binaries.dmg 失败",
+                "- Mounted Universal-Binaries.dmg":"- 已挂载 Universal-Binaries.dmg",
+                "- Found HackdocInternal resources, mounting...":"- 找到 HackdocInternal 资源，正在挂载...",
+                "- Failed to mount HackdocInternal resources":"- 挂载 HackdocInternal 资源失败",
+                "- Mounted HackdocInternal resources":"- 已挂载 HackdocInternal 资源",
+                "- Failed to merge HackdocInternal resources":"- 合并 HackdocInternal 资源失败",
+                "- Local PatcherSupportPkg resources available, continuing...":"- 本地 PatcherSupportPkg 资源可用，继续...",
+                
+                # files.py
+                "  - Skipping {file_name}, cannot locate {source_folder}":"  - 跳过 {file_name}，无法定位 {source_folder}",
+                "  - Installing: {file_name}":"  - 正在安装: {file_name}",
+                "  - Found existing {file_name}, overwriting...":"  - 找到现有 {file_name}，正在覆盖...",
+                "  - Removing: {file_name}":"  - 正在删除: {file_name}",
+                
+                # kdk_merge.py
+                "- Matching KDK determined to already be merged, skipping":"- 匹配的 KDK 已确定已合并，跳过",
+                "- Backing up IOHIDEventDriver CodeSignature":"- 正在备份 IOHIDEventDriver 代码签名",
+                "- Restoring IOHIDEventDriver CodeSignature":"- 正在恢复 IOHIDEventDriver 代码签名",
+                "  - CodeSignature folder missing, creating":"  - 代码签名文件夹缺失，正在创建",
+                "- Merging KDK with Root Volume: {kdk_name}":"- 正在将 KDK 与根卷合并: {kdk_name}",
+                "- Failed to merge KDK with Root Volume":"- 将 KDK 与根卷合并失败",
+                "- Successfully merged KDK with Root Volume":"- 成功将 KDK 与根卷合并",
+                "Failed to install KDK":"安装 KDK 失败",
+                "Unable to get KDK info: {error_msg}":"无法获取 KDK 信息: {error_msg}",
+                "Could not retrieve KDK: {error_msg}":"无法检索 KDK: {error_msg}",
+                "Could not download KDK: {error_msg}":"无法下载 KDK: {error_msg}",
+                "KDK checksum validation failed: {error_msg}":"KDK 校验和验证失败: {error_msg}",
+                "KDK was not installed, but should have been: {error_msg}":"KDK 未安装，但应该已安装: {error_msg}",
+                "- Unable to find Kernel Debug Kit":"- 无法找到内核调试工具包",
+                "- Found KDK at: {kdk_path}":"- 在 {kdk_path} 找到 KDK"
+            }
+        return trans
+
 class TranslateLanguage_efi_builder:
     def __init__(self, global_constants: Constants) -> None:
         self.file_name:              str = ".com.hackdoc.oclp-r.plist"

oclp_r/support/validation.py

@@ -233,7 +233,7 @@ def _validate_sys_patch(self) -> None:
 
         atexit.register(self._unmount_dmg)
 
-        for supported_os in [os_data.os_data.big_sur, os_data.os_data.monterey, os_data.os_data.ventura, os_data.os_data.sonoma, os_data.os_data.sequoia]:
+        for supported_os in [os_data.os_data.big_sur, os_data.os_data.monterey, os_data.os_data.ventura, os_data.os_data.sonoma, os_data.os_data.sequoia, os_data.os_data.tahoe]:
             for i in range(0, 10):
                 self._validate_root_patch_files(supported_os, i)
 

oclp_r/sys_patch/sys_patch.py

@@ -391,7 +391,7 @@ def _execute_patchset(self, required_patches: dict):
                                 destination_folder_path = str(self.mount_location) + remove_patch_directory
                             else:
                                 destination_folder_path = str(self.mount_location_data) + remove_patch_directory
-                            remove_file(destination_folder_path, remove_patch_file)
+                            remove_file(destination_folder_path, remove_patch_file,self.trans)
 
 
             for method_install in [PatchType.OVERWRITE_SYSTEM_VOLUME, PatchType.OVERWRITE_DATA_VOLUME, PatchType.MERGE_SYSTEM_VOLUME, PatchType.MERGE_DATA_VOLUME]:
@@ -430,7 +430,7 @@ def _execute_patchset(self, required_patches: dict):
 
                             destination_folder_path = updated_destination_folder_path
 
-                        install_new_file(source_folder_path, destination_folder_path, install_file, method_install)
+                        install_new_file(source_folder_path, destination_folder_path, install_file, method_install,self.trans)
 
             if PatchType.EXECUTE in required_patches[patch]:
                 for process in required_patches[patch][PatchType.EXECUTE]:

oclp_r/sys_patch/utilities/dmg_mount.py

@@ -10,22 +10,25 @@
 
 from ... import constants
 
-from ...support import subprocess_wrapper
+from ...support import subprocess_wrapper, translate_language
 
 
 class PatcherSupportPkgMount:
 
     def __init__(self, global_constants: constants.Constants) -> None:
         self.constants: constants.Constants = global_constants
         self.icon_path = str(self.constants.app_icon_path).replace("/", ":")[1:]
+        
+        # Initialize translation
+        self.trans = translate_language.TranslateLanguage_sys_patch(global_constants).utilities()
 
 
     def _mount_universal_binaries_dmg(self) -> bool:
         """
         Mount PatcherSupportPkg's Universal-Binaries.dmg
         """
         if not Path(self.constants.payload_local_binaries_root_path_dmg).exists():
-            logging.info("- PatcherSupportPkg resources missing, Patcher likely corrupted!!!")
+            logging.info(self.trans["- PatcherSupportPkg resources missing, Patcher likely corrupted!!!"])
             return False
 
         output = subprocess.run(
@@ -39,11 +42,11 @@ def _mount_universal_binaries_dmg(self) -> bool:
             stdout=subprocess.PIPE, stderr=subprocess.STDOUT
         )
         if output.returncode != 0:
-            logging.info("- Failed to mount Universal-Binaries.dmg")
+            logging.info(self.trans["- Failed to mount Universal-Binaries.dmg"])
             subprocess_wrapper.log(output)
             return False
 
-        logging.info("- Mounted Universal-Binaries.dmg")
+        logging.info(self.trans["- Mounted Universal-Binaries.dmg"])
         return True
 
 
@@ -58,7 +61,7 @@ def _mount_hackdoc_internal_resources_dmg(self) -> bool:
         if self.constants.cli_mode is True:
             return True
 
-        logging.info("- Found HackdocInternal resources, mounting...")
+        logging.info(self.trans["- Found HackdocInternal resources, mounting..."])
 
         for i in range(3):
             key = self._request_decryption_key(i)
@@ -72,7 +75,7 @@ def _mount_hackdoc_internal_resources_dmg(self) -> bool:
                 stdout=subprocess.PIPE, stderr=subprocess.STDOUT
             )
             if output.returncode != 0:
-                logging.info("- Failed to mount HackdocInternal resources")
+                logging.info(self.trans["- Failed to mount HackdocInternal resources"])
                 subprocess_wrapper.log(output)
 
                 if "Authentication error" not in output.stdout.decode():
@@ -84,7 +87,7 @@ def _mount_hackdoc_internal_resources_dmg(self) -> bool:
                 continue
             break
 
-        logging.info("- Mounted HackdocInternal resources")
+        logging.info(self.trans["- Mounted HackdocInternal resources"])
         return self._merge_hackdoc_internal_resources()
 
 
@@ -99,7 +102,7 @@ def _merge_hackdoc_internal_resources(self) -> bool:
             stdout=subprocess.PIPE, stderr=subprocess.STDOUT
         )
         if result.returncode != 0:
-            logging.info("- Failed to merge HackdocInternal resources")
+            logging.info(self.trans["- Failed to merge HackdocInternal resources"])
             subprocess_wrapper.log(result)
             return False
 
@@ -171,7 +174,7 @@ def mount(self) -> bool:
         """
         # If already mounted, skip
         if Path(self.constants.payload_local_binaries_root_path).exists():
-            logging.info("- Local PatcherSupportPkg resources available, continuing...")
+            logging.info(self.trans["- Local PatcherSupportPkg resources available, continuing..."])
             return True
 
         if self._mount_universal_binaries_dmg() is False: