Skip to content

Commit 2a25921

Browse files
committed
update guide link
1 parent 324aeda commit 2a25921

File tree

8 files changed

+23
-5
lines changed

8 files changed

+23
-5
lines changed

oclp_r/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def __init__(self) -> None:
2929
self.github_proxy_link: str = "Default"
3030
self.url_patcher_support_pkg: str = "https://github.com/hackdoc/PatcherSupportPkg/releases/download/"
3131
self.discord_link: str = "https://discord.gg/rqdPgH8xSN"
32-
self.guide_link: str = "https://hackdoc.github.io/oclpr/"
32+
self.guide_link: str = "https://dortania.github.io/OpenCore-Legacy-Patcher/"
3333
self.repo_link: str = "https://github.com/hackdoc/OCLP-R/releases/"
3434
self.installer_pkg_url: str = f"{self.repo_link}/releases/download/{self.patcher_version}/AutoPkg-Assets.pkg"
3535
self.installer_pkg_url_nightly: str = "http://nightly.link/hackdoc/OCLP-R/workflows/build-app-wxpython/main/AutoPkg-Assets.pkg.zip"

oclp_r/support/kdk_handler.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ def _get_latest_kdk(self, host_build: str = None, host_version: str = None) -> N
226226
count_kdks.sort(key=lambda x: x["build"], reverse=True)
227227
closest = None
228228
for kdk in count_kdks:
229+
if kdk["build"][-1]>="a" and kdk["build"][-1]<="z":
230+
logging.info(self.trans["This is macOS beta's KDK"])
229231
if kdk["build"][2] <= host_build[2]:
230232
closest = kdk
231233
break

oclp_r/support/reroute_payloads.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def _unmount_active_dmgs(self, unmount_all_active: bool = True) -> None:
8585
# Check that only our personal payloads.dmg is unmounted
8686
if "shadow-path" in image:
8787
if self.temp_dir.name in image["shadow-path"]:
88-
logging.info(f"Unmounting personal {variant}")
88+
logging.info(self.trans["Unmounting personal {0}"].format(variant))
8989
subprocess.run(
9090
["/usr/bin/hdiutil", "detach", image["system-entities"][0]["dev-entry"], "-force"],
9191
stdout=subprocess.PIPE, stderr=subprocess.STDOUT

oclp_r/support/translate_language.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ def arguements(self):
308308
def kdk_handler(self):
309309
if self.language_point=="English":
310310
trans={
311+
"This is macOS beta's KDK":"This is macOS beta's KDK",
311312
"Could not contact KDK API":"Could not contact KDK API",
312313
"Could not fetch KDK list":"Could not fetch KDK list",
313314
"Pulling KDK list from KdkSupportPkg API":"Pulling KDK list from KdkSupportPkg API",
@@ -361,6 +362,7 @@ def kdk_handler(self):
361362
}
362363
elif self.language_point=="简体中文":
363364
trans={
365+
"This is macOS beta's KDK":"这是macOS beta的KDK",
364366
"Could not contact KDK API":"无法联系 KDK API",
365367
"Pulling KDK list from KdkSupportPkg API":"从 KdkSupportPkg API 获取 KDK 列表",
366368
"Could not fetch KDK list":"无法获取 KDK 列表",
@@ -657,7 +659,7 @@ def reroute_payloads(self):
657659
"Creating payloads directory":"正在创建 payloads 目录",
658660
"Mounted payloads.dmg":"已挂载 payloads.dmg",
659661
"Failed to mount payloads.dmg":"无法挂载 payloads.dmg",
660-
"Unmounting personal {0}":"正在卸载个人 {0}",
662+
"Unmounting personal {0}":"正在卸载 {0}",
661663
"Unmounting {0} at: {1}":"正在卸载 {0} 于: {1}"
662664
}
663665
return trans
@@ -2462,6 +2464,7 @@ def gui_support(self):
24622464
def gui_sys_patch_display(self):
24632465
if self.language_point=="English":
24642466
trans={
2467+
"Built from source, running from socure":"Built from source, running from socure",
24652468
"Checking if new patches are needed":"Checking if new patches are needed",
24662469
"No root patch updates needed!\n\nWould you like to reboot to apply the new OpenCore build?":"No root patch updates needed!\n\nWould you like to reboot to apply the new OpenCore build?",
24672470
"Post-Install Menu":"Post-Install Menu",
@@ -2488,6 +2491,7 @@ def gui_sys_patch_display(self):
24882491
}
24892492
elif self.language_point=="简体中文":
24902493
trans={
2494+
"Built from source, running from socure":"以源代码运行",
24912495
"Checking if new patches are needed":"检查是否需要新的补丁",
24922496
"Initializing Root Patch Display Frame":"初始化根卷补丁显示框架",
24932497
"No root patch updates needed!\n\nWould you like to reboot to apply the new OpenCore build?":"没有需要根卷补丁的更新!\n\n是否重启以应用新的 OpenCore 构建?",
@@ -2548,6 +2552,7 @@ def gui_sys_patch_start(self):
25482552
"Open System Preferences":"Open System Preferences",
25492553
"Ignore":"Ignore",
25502554
"Error":"Error",
2555+
"Reverting root patches":"Reverting root patches",
25512556
"KDK download complete, validating with hdiutil":"KDK download complete, validating with hdiutil",
25522557
"KDK download complete":"KDK download complete",
25532558
"Metallib Build ":"Metallib Build ",
@@ -2557,9 +2562,11 @@ def gui_sys_patch_start(self):
25572562
"Checking if new patches are needed":"Checking if new patches are needed",
25582563
"No new patches detected for system":"No new patches detected for system",
25592564
"- Patch {patch} not installed":"- Patch {patch} not installed",
2565+
"Built from source, running from socure":"Built from source, running from socure",
25602566
}
25612567
elif self.language_point=="简体中文":
25622568
trans={
2569+
"Built from source, running from socure":"以源代码运行",
25632570
"- Patch {patch} not installed":"- 补丁 {patch} 未安装",
25642571
"No new patches detected for system":"没有新的系统补丁",
25652572
"Checking if new patches are needed":"检查是否有新的补丁需要应用",
@@ -2589,6 +2596,7 @@ def gui_sys_patch_start(self):
25892596
"Installing MetallibSupportPkg PKG...":"正在安装 MetallibSupportPkg 包...",
25902597
"Metallib installation failed: ":"Metallib 安装失败: ",
25912598
"Root Patching":"根卷补丁",
2599+
"Reverting root patches":"还原根补丁",
25922600
"Revert Root Patches":"还原根卷补丁",
25932601
"Root Patching will patch the following:":"根卷补丁将修补以下内容: ",
25942602
"No patches to apply":"没有补丁可应用",

oclp_r/wx_gui/gui_macos_installer_download.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ def _display_available_installers(self, event: wx.Event = None, show_full: bool
410410
bundles = [wx.BitmapBundle.FromBitmaps(icon) for icon in self.icons]
411411

412412
self.frame_modal.Destroy()
413-
self.frame_modal = wx.Dialog(self, title=self.trans["Select macOS Installer"], size=(505, 500))
413+
self.frame_modal = wx.Dialog(self, title=self.trans["Select macOS Installer"], size=(505, 600))
414414

415415
# Title: Select macOS Installer
416416
title_label = wx.StaticText(self.frame_modal, label=self.trans["Select macOS Installer"], pos=(-1,-1))
@@ -430,7 +430,7 @@ def _display_available_installers(self, event: wx.Event = None, show_full: bool
430430

431431
installers = self.available_installers_latest if show_full is False else self.available_installers
432432
if show_full is False:
433-
self.frame_modal.SetSize((490, 370))
433+
self.frame_modal.SetSize((490, 390))
434434

435435
if installers:
436436
locale.setlocale(locale.LC_TIME, '')

oclp_r/wx_gui/gui_sys_patch_display.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,8 @@ def _check_if_new_patches_needed(self, patches: dict) -> bool:
302302

303303
logging.info(self.trans["Checking if new patches are needed"])
304304
if self.constants.commit_info[0] in ["Running from source", "Built from source"] or self.constants.commit_info[2] is None or self.constants.commit_info[2] == "":
305+
print(self.trans["Built from source, running from socure"])
306+
logging.info(self.trans["Built from source, running from socure"])
305307
return True
306308

307309
if self.constants.computer.oclp_sys_url != self.constants.commit_info[2]:

oclp_r/wx_gui/gui_sys_patch_start.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,10 +446,16 @@ def _check_if_new_patches_needed(self, patches: dict) -> bool:
446446
logging.info(self.trans["Checking if new patches are needed"])
447447

448448
if self.constants.commit_info[0] in ["Running from source", "Built from source"]:
449+
print(self.trans["Built from source, running from socure"])
450+
logging.info(self.trans["Built from source, running from socure"])
449451
return True
450452

451453
if self.constants.computer.oclp_sys_url != self.constants.commit_info[2]:
452454
# If commits are different, assume patches are as well
455+
print(self.trans["- Commit URLs differ"])
456+
print(f"{self.trans['- Commit URLs:']} {self.constants.commit_info[2]}")
457+
logging.info(self.trans["- Commit URLs differ"])
458+
logging.info(f"{self.trans['- Commit URLs:']} {self.constants.commit_info[2]}")
453459
return True
454460

455461
oclp_plist = "/System/Library/CoreServices/OCLP-R.plist"
-20.8 MB
Binary file not shown.

0 commit comments

Comments
 (0)