Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

feat(cpu_dialog): fix icon alignment & add message for windows

Browse Source
This commit is contained in:
Elian Doran
2025-06-12 22:43:30 +03:00
parent 2c032d54c1
commit 0a81e26e7e
2 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/client/src/translations/en/translation.json
View File

@@ -1920,9 +1920,10 @@
"color-scheme": "Color scheme" "color-scheme": "Color scheme"
}, },
"cpu_arch_warning": { "cpu_arch_warning": {
"title": "Performance warning", "title": "Please download the ARM64 version",
"message": "TriliumNext is currently running under Rosetta 2 translation, which means you're using the Intel (x64) version on an Apple Silicon Mac. This will significantly impact performance and battery life.", "message_macos": "TriliumNext is currently running under Rosetta 2 translation, which means you're using the Intel (x64) version on Apple Silicon Mac. This will significantly impact performance and battery life.",
"recommendation": "For the best experience, please download the native Apple Silicon (ARM64) version of TriliumNext from our releases page.", "message_windows": "TriliumNext is currently running emulation, which means you're using the Intel (x64) version on a Windows on ARM device. This will significantly impact performance and battery life.",
"recommendation": "For the best experience, please download the native ARM64 version of TriliumNext from our releases page.",
"download_link": "Download Native Version", "download_link": "Download Native Version",
"continue_anyway": "Continue Anyway", "continue_anyway": "Continue Anyway",
"dont_show_again": "Don't show this warning again" "dont_show_again": "Don't show this warning again"

29
apps/client/src/widgets/dialogs/incorrect_cpu_arch.ts
View File

@@ -7,33 +7,22 @@ const TPL = /*html*/`
<div class="rosetta-warning-dialog modal mx-auto" tabindex="-1" role="dialog" style="z-index: 2000;"> <div class="rosetta-warning-dialog modal mx-auto" tabindex="-1" role="dialog" style="z-index: 2000;">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header text-white"> <div class="modal-header">
<h4 class="modal-title"> <h5 class="modal-title">${t("cpu_arch_warning.title")}</h5>
<i class="bx bx-error-circle"></i> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<span>${t("cpu_arch_warning.title")}</span>
</h4>
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>${t("cpu_arch_warning.message")}</p> <p>${utils.isMac() ? t("cpu_arch_warning.message_macos") : t("cpu_arch_warning.message_windows")}</p>
<p>${t("cpu_arch_warning.recommendation")}</p> <p>${t("cpu_arch_warning.recommendation")}</p>
</div> </div>
<div class="modal-footer d-flex justify-content-between align-items-center"> <div class="modal-footer d-flex justify-content-between align-items-center">
<div> <button class="download-correct-version-button btn btn-primary btn-lg me-2">
<button class="download-correct-version-button btn btn-primary btn-lg me-2"> <span class="bx bx-download"></span>
<i class="bx bx-download"></i> ${t("cpu_arch_warning.download_link")}
<span>${t("cpu_arch_warning.download_link")}</span> </button>
</button>
&nbsp; <button class="btn btn-secondary" data-bs-dismiss="modal">${t("cpu_arch_warning.continue_anyway")}</button>
<button class="continue-anyway-button btn btn-secondary" data-bs-dismiss="modal">${t("cpu_arch_warning.continue_anyway")}</button>
</div>
<div class="form-check">
<input class="form-check-input" type="checkbox" id="dontShowAgain">
<label class="form-check-label" for="dontShowAgain">${t("cpu_arch_warning.dont_show_again")}</label>
</div>
</div> </div>
</div> </div>
</div> </div>