From 3693788e3e5cd1bd92d46c0f5e6e034df56fb342 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 5 Mar 2025 00:02:14 +0800 Subject: [PATCH 1/2] :art: Improve reconnection prompt after switching apps on iOS https://github.com/siyuan-note/siyuan/issues/14279 --- app/appearance/langs/ar_SA.json | 2 ++ app/appearance/langs/de_DE.json | 2 ++ app/appearance/langs/en_US.json | 2 ++ app/appearance/langs/es_ES.json | 2 ++ app/appearance/langs/fr_FR.json | 2 ++ app/appearance/langs/he_IL.json | 2 ++ app/appearance/langs/it_IT.json | 2 ++ app/appearance/langs/ja_JP.json | 2 ++ app/appearance/langs/pl_PL.json | 2 ++ app/appearance/langs/ru_RU.json | 2 ++ app/appearance/langs/zh_CHT.json | 2 ++ app/appearance/langs/zh_CN.json | 2 ++ app/src/dialog/processSystem.ts | 13 ++++++------- 13 files changed, 30 insertions(+), 7 deletions(-) diff --git a/app/appearance/langs/ar_SA.json b/app/appearance/langs/ar_SA.json index e6bc87694..369b50643 100644 --- a/app/appearance/langs/ar_SA.json +++ b/app/appearance/langs/ar_SA.json @@ -1,4 +1,6 @@ { + "pleaseWait": "يرجى الانتظار...", + "reconnectPrompt": "بعد تبديل التطبيقات، سيستغرق الأمر بعض الوقت لاستعادة تشغيل نواة SiYuan. يرجى الانتظار بضع ثوانٍ أو النقر فوق الزر \"إعادة المحاولة\"", "relativeFontSize": "نسبة إلى حجم خط المحرر", "localFileSystem": "نظام الملفات المحلي", "deviceNotSupport": "الجهاز الحالي غير مدعوم", diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json index 7a51382ad..f386f76d7 100644 --- a/app/appearance/langs/de_DE.json +++ b/app/appearance/langs/de_DE.json @@ -1,4 +1,6 @@ { + "pleaseWait": "Bitte warten...", + "reconnectPrompt": "Nach dem Wechseln der Anwendungen dauert es einige Zeit, bis der Betrieb des SiYuan-Kernels wiederhergestellt ist. Bitte warten Sie einige Sekunden oder klicken Sie auf die Schaltfläche „Erneut versuchen“", "relativeFontSize": "relativ zur Schriftgröße des Editors", "localFileSystem": "Lokales Dateisystem", "deviceNotSupport": "Das aktuelle Gerät wird nicht unterstützt", diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 1b6bb1ee8..ebbf7e9fa 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,6 @@ { + "pleaseWait": "Please wait...", + "reconnectPrompt": "After switching applications, it will take some time to restore the SiYuan kernel operation. Please wait a few seconds or click the \"Retry\" button", "relativeFontSize": "relative to the editor font size", "localFileSystem": "Local file system", "deviceNotSupport": "The current device is not supported", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index c54924536..7beef9bc0 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,6 @@ { + "pleaseWait": "Por favor, espere...", + "reconnectPrompt": "Después de cambiar de aplicación, tomará algún tiempo restaurar el funcionamiento del núcleo de SiYuan. Espere unos segundos o haga clic en el botón \"Reintentar\"", "relativeFontSize": "en relación con el tamaño de fuente del editor", "localFileSystem": "Sistema de archivos local", "deviceNotSupport": "El dispositivo actual no es compatible", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index cf41af87c..4f080b4f2 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,6 @@ { + "pleaseWait": "Veuillez patienter...", + "reconnectPrompt": "Après avoir changé d'application, il faudra un certain temps pour rétablir le fonctionnement du noyau SiYuan. Veuillez patienter quelques secondes ou cliquer sur le bouton « Réessayer »", "relativeFontSize": "par rapport à la taille de la police de l'éditeur", "localFileSystem": "Système de fichiers local", "deviceNotSupport": "L'appareil actuel n'est pas pris en charge", diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json index e9e26088a..7f9601030 100644 --- a/app/appearance/langs/he_IL.json +++ b/app/appearance/langs/he_IL.json @@ -1,4 +1,6 @@ { + "pleaseWait": "אנא המתן...", + "reconnectPrompt": "לאחר מעבר בין יישומים, יידרש זמן מה כדי לשחזר את פעולת ליבת SiYuan. אנא המתן מספר שניות או לחץ על כפתור \"נסה שוב\"", "relativeFontSize": "יחסית לגודל הגופן של העורך", "localFileSystem": "מערכת קבצים מקומית", "deviceNotSupport": "המכשיר הנוכחי אינו נתמך", diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json index 335e479e6..01984f4be 100644 --- a/app/appearance/langs/it_IT.json +++ b/app/appearance/langs/it_IT.json @@ -1,4 +1,6 @@ { + "pleaseWait": "Attendere prego...", + "reconnectPrompt": "Dopo aver cambiato applicazione, ci vorrà un po' di tempo per ripristinare il funzionamento del kernel SiYuan. Attendere qualche secondo o fare clic sul pulsante \"Riprova\"", "relativeFontSize": "rispetto alla dimensione del carattere dell'editor", "localFileSystem": "File system locale", "deviceNotSupport": "Il dispositivo corrente non è supportato", diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json index 6ca317880..34fc2a32d 100644 --- a/app/appearance/langs/ja_JP.json +++ b/app/appearance/langs/ja_JP.json @@ -1,4 +1,6 @@ { + "pleaseWait": "しばらくお待ちください...", + "reconnectPrompt": "アプリを切り替えた後、思源カーネルの実行を再開するには少し時間がかかります。数秒待つか、「再試行」ボタンをクリックしてください", "relativeFontSize": "エディターのフォントサイズに対して", "localFileSystem": "ローカルファイルシステム", "deviceNotSupport": "現在のデバイスはサポートされていません", diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json index ede2cc960..2de62d3da 100644 --- a/app/appearance/langs/pl_PL.json +++ b/app/appearance/langs/pl_PL.json @@ -1,4 +1,6 @@ { + "pleaseWait": "Proszę czekać...", + "reconnectPrompt": "Po przełączeniu aplikacji ponowne uruchomienie jądra SiYuan może zająć trochę czasu. Proszę poczekać kilka sekund lub kliknąć przycisk „Ponów próbę”", "relativeFontSize": "względem rozmiaru czcionki edytora", "localFileSystem": "Lokalny system plików", "deviceNotSupport": "Bieżące urządzenie nie jest obsługiwane", diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json index 0442ca3e7..15d8a27c2 100644 --- a/app/appearance/langs/ru_RU.json +++ b/app/appearance/langs/ru_RU.json @@ -1,4 +1,6 @@ { + "pleaseWait": "Пожалуйста, подождите...", + "reconnectPrompt": "После переключения приложений потребуется некоторое время, чтобы восстановить работу ядра SiYuan. Пожалуйста, подождите несколько секунд или нажмите кнопку «Повторить»", "relativeFontSize": "относительно размера шрифта редактора", "localFileSystem": "Локальная файловая система", "deviceNotSupport": "Текущее устройство не поддерживается", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index ad985c40f..4a515df94 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,6 @@ { + "pleaseWait": "請稍等片刻...", + "reconnectPrompt": "切換應用後再次進入需要一些時間恢復思源內核運行，請稍等幾秒或者點擊“重試”按鈕", "relativeFontSize": "相對於編輯器字號", "localFileSystem": "本地檔案系統", "deviceNotSupport": "當前設備不支援", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 06f22ea3a..da211ac22 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,6 @@ { + "pleaseWait": "请稍等片刻...", + "reconnectPrompt": "切换应用后再次进入需要一些时间恢复思源内核运行，请稍等几秒或者点击“重试”按钮", "relativeFontSize": "相对于编辑器字号", "localFileSystem": "本地文件系统", "deviceNotSupport": "当前设备不支持", diff --git a/app/src/dialog/processSystem.ts b/app/src/dialog/processSystem.ts index 51c396490..e7e63e056 100644 --- a/app/src/dialog/processSystem.ts +++ b/app/src/dialog/processSystem.ts @@ -253,20 +253,19 @@ export const kernelError = () => { if (document.querySelector("#errorLog")) { return; } - let iosReStart = ""; + let title = `💔 ${window.siyuan.languages.kernelFault0} v${Constants.SIYUAN_VERSION}`; + let body = `
${window.siyuan.languages.kernelFault1}
${window.siyuan.languages.kernelFault2}
`; if (isInIOS()) { - iosReStart = `
`; + title = `🍵 ${window.siyuan.languages.pleaseWait} v${Constants.SIYUAN_VERSION}`; + body = `
${window.siyuan.languages.reconnectPrompt}
`; } const dialog = new Dialog({ disableClose: true, - title: `💔 ${window.siyuan.languages.kernelFault0} v${Constants.SIYUAN_VERSION}`, + title: title, width: isMobile() ? "92vw" : "520px", content: `
-
${window.siyuan.languages.kernelFault1}
-
-
${window.siyuan.languages.kernelFault2}
- ${iosReStart} + ${body}
` }); From 803b3609d4ace711af09fa325d532f8ffed8e777 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 5 Mar 2025 00:35:59 +0800 Subject: [PATCH 2/2] :art: The `Export` in the asset menu on the mobile is changed to calling the browser to download https://github.com/siyuan-note/siyuan/issues/14280 --- app/src/types/index.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index 6491c39f1..382a83bd5 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -186,6 +186,7 @@ interface Window { JSAndroid: { returnDesktop(): void openExternal(url: string): void + exportByDefault(url: string): void changeStatusBarColor(color: string, mode: number): void writeClipboard(text: string): void writeHTMLClipboard(text: string, html: string): void @@ -196,6 +197,7 @@ interface Window { } JSHarmony: { openExternal(url: string): void + exportByDefault(url: string): void changeStatusBarColor(color: string, mode: number): void writeClipboard(text: string): void writeHTMLClipboard(text: string, html: string): void