diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 4a9ee7474..545e498f3 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -35,7 +35,7 @@ "apiBaseURL": "API Base URL", "apiBaseURLTip": "The base address of the request, such as https://api.openai.com/v1", "skip": "Skip", - "reboot": "Reboot", + "nextRound": "Next round", "save": "Save", "ai": "Artificial Intelligence", "aiContinueWrite": "Continue writing", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 94d887c93..06ad8471f 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -35,7 +35,7 @@ "apiBaseURL": "URL base de la API", "apiBaseURLTip": "La dirección base de la solicitud, como https://api.openai.com/v1", "skip": "barco", - "reboot": "Reiniciar", + "nextRound": "Siguiente ronda", "save": "Ahorrar", "ai": "Inteligencia Artificial", "aiContinueWrite": "Continuar escribiendo", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 49324f45a..1cb40587a 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -35,7 +35,7 @@ "apiBaseURL": "URL de base de l'API", "apiBaseURLTip": "L'adresse de base de la requête, telle que https://api.openai.com/v1", "skip": "Navire", - "reboot": "Redémarrer", + "nextRound": "Prochain tour", "save": "Sauvegarder", "ai": "Intelligence Artificielle", "aiContinueWrite": "Continuer à écrire", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 3d5660157..9bf91c01f 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -35,7 +35,7 @@ "apiBaseURL": "API 基礎地址", "apiBaseURLTip": "發起請求的基礎地址,如 https://api.openai.com/v1", "skip": "跳過", - "reboot": "重啟", + "nextRound": "下一輪", "save": "保存", "ai": "人工智能", "aiContinueWrite": "續寫", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 11605ecdd..7861b49ad 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -35,7 +35,7 @@ "apiBaseURL": "API 基础地址", "apiBaseURLTip": "发起请求的基础地址,如 https://api.openai.com/v1", "skip": "跳过", - "reboot": "重启", + "nextRound": "下一轮", "save": "保存", "ai": "人工智能", "aiContinueWrite": "续写", diff --git a/app/electron/init.html b/app/electron/init.html index e8a02a70a..baa3196f1 100644 --- a/app/electron/init.html +++ b/app/electron/init.html @@ -358,10 +358,19 @@ const {ipcRenderer} = require('electron') const fs = require('fs') const initPath = result.filePaths[0] - if (isCloudDrivePath(initPath)) { - let msg = '⚠️ This folder may be a cloud sync disk folder, please change to another path' + if (isICloudPath(initPath)) { + let msg = '⚠️ This folder is under the iCloud sync path, please change another path' if ('zh_CN' === currentLang) { - msg = '⚠️ 该文件夹可能是云同步盘文件夹,请更换其他路径' + msg = '⚠️ 该文件夹位于 iCloud 同步路径下,请更换其他路径' + } + alert(msg) + return + } + + if (isCloudDrivePath(initPath)) { + let msg = '⚠️ The folder path can not contain onedrive, dropbox, google drive, pcloud and 坚果云, please change another path' + if ('zh_CN' === currentLang) { + msg = '⚠️ 文件夹路径不能包含 onedrive、dropbox、google drive、pcloud 和 坚果云,请更换其他路径' } alert(msg) return @@ -388,10 +397,6 @@ const isCloudDrivePath = (absPath) => { const absPathLower = absPath.toLowerCase() - if (isICloudPath(absPathLower)) { - return true - } - return -1 < absPathLower.indexOf("onedrive") || -1 < absPathLower.indexOf("dropbox") || -1 < absPathLower.indexOf("google drive") || -1 < absPathLower.indexOf("pcloud") || -1 < absPathLower.indexOf("坚果云") diff --git a/app/electron/main.js b/app/electron/main.js index d3a18e42a..5383f35bd 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -713,7 +713,7 @@ app.whenReady().then(() => { } }); if (!foundWorkspace) { - initKernel(data.workspace, "", data.lang).then((isSucc) => { + initKernel(data.workspace, "", "").then((isSucc) => { if (isSucc) { boot(); } diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts index 074032309..1b15f2667 100644 --- a/app/src/card/openCard.ts +++ b/app/src/card/openCard.ts @@ -66,7 +66,7 @@ export const openCardByData = (cardsData: { cards: ICard[], unreviewedCount: num
- ${window.siyuan.languages.reboot} + ${window.siyuan.languages.nextRound}