mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-17 23:20:13 +01:00
🎨 Improve cloud sync error report text https://github.com/siyuan-note/siyuan/issues/8675
This commit is contained in:
parent
4d9807c8bb
commit
943e155203
8 changed files with 22 additions and 8 deletions
|
|
@ -1186,6 +1186,8 @@
|
||||||
"208": "Uploading index list...",
|
"208": "Uploading index list...",
|
||||||
"209": "Uploading check index...",
|
"209": "Uploading check index...",
|
||||||
"210": "Verifying cloud data %v/%v",
|
"210": "Verifying cloud data %v/%v",
|
||||||
"211": "Cloud data verification complete"
|
"211": "Cloud data verification complete",
|
||||||
|
"212": "There are some defects in the current version of cloud data sync, please upgrade to the latest version. Sorry for the inconvenience",
|
||||||
|
"213": "Cloud verification failed, please try to upgrade to the latest version and log in again before syncing"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1186,6 +1186,8 @@
|
||||||
"208": "Cargando lista de índice...",
|
"208": "Cargando lista de índice...",
|
||||||
"209": "Cargando índice de verificación...",
|
"209": "Cargando índice de verificación...",
|
||||||
"210": "Verificando datos en la nube %v/%v",
|
"210": "Verificando datos en la nube %v/%v",
|
||||||
"211": "Verificaci\u00f3n de datos en la nube completada"
|
"211": "Verificaci\u00f3n de datos en la nube completada",
|
||||||
|
"212": "Hay algunos defectos en la versi\u00f3n actual de sincronizaci\u00f3n de datos en la nube, actualice a la versi\u00f3n m\u00e1s reciente. Disculpe las molestias",
|
||||||
|
"213": "La verificaci\u00f3n en la nube fall\u00f3, intente actualizar a la versi\u00f3n m\u00e1s reciente e inicie sesi\u00f3n de nuevo antes de sincronizar"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1186,6 +1186,8 @@
|
||||||
"208": "Téléchargement de la liste d'index...",
|
"208": "Téléchargement de la liste d'index...",
|
||||||
"209": "Téléchargement de l'index de vérification...",
|
"209": "Téléchargement de l'index de vérification...",
|
||||||
"210": "Vérification des données cloud %v/%v",
|
"210": "Vérification des données cloud %v/%v",
|
||||||
"211": "Vérification des données cloud terminée"
|
"211": "Vérification des données cloud terminée",
|
||||||
|
"212": "Il y a quelques défauts dans la version actuelle de la synchronisation des données cloud, veuillez mettre à niveau vers la dernière version. Désolé pour le désagrément",
|
||||||
|
"213": "Échec de la vérification cloud, veuillez essayer de mettre à niveau vers la dernière version et de vous reconnecter avant de synchroniser"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1186,6 +1186,8 @@
|
||||||
"208": "正在上傳索引列表...",
|
"208": "正在上傳索引列表...",
|
||||||
"209": "正在上傳校驗索引...",
|
"209": "正在上傳校驗索引...",
|
||||||
"210": "正在校驗雲端數據 %v/%v",
|
"210": "正在校驗雲端數據 %v/%v",
|
||||||
"211": "校驗雲端數據完畢"
|
"211": "校驗雲端數據完畢",
|
||||||
|
"212": "當前版本雲端數據同步存在一些缺陷,請升級到最新版,帶來不便,敬請諒解",
|
||||||
|
"213": "雲端校驗失敗,請嘗試升級到最新版並重新登錄後再進行同步"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1186,6 +1186,8 @@
|
||||||
"208": "正在上传索引列表...",
|
"208": "正在上传索引列表...",
|
||||||
"209": "正在上传校验索引...",
|
"209": "正在上传校验索引...",
|
||||||
"210": "正在校验云端数据 %v/%v",
|
"210": "正在校验云端数据 %v/%v",
|
||||||
"211": "校验云端数据完毕"
|
"211": "校验云端数据完毕",
|
||||||
|
"212": "当前版本云端数据同步存在一些缺陷,请升级到最新版,带来不便,敬请谅解",
|
||||||
|
"213": "云端校验失败,请尝试升级到最新版并重新登录后再进行同步"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ require (
|
||||||
github.com/radovskyb/watcher v1.0.7
|
github.com/radovskyb/watcher v1.0.7
|
||||||
github.com/sashabaranov/go-openai v1.12.0
|
github.com/sashabaranov/go-openai v1.12.0
|
||||||
github.com/shirou/gopsutil/v3 v3.23.5
|
github.com/shirou/gopsutil/v3 v3.23.5
|
||||||
github.com/siyuan-note/dejavu v0.0.0-20230703042337-1a642a48e663
|
github.com/siyuan-note/dejavu v0.0.0-20230704110643-d6a4b98d2d6c
|
||||||
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75
|
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75
|
||||||
github.com/siyuan-note/eventbus v0.0.0-20230702081350-6dde667e7112
|
github.com/siyuan-note/eventbus v0.0.0-20230702081350-6dde667e7112
|
||||||
github.com/siyuan-note/filelock v0.0.0-20230615140405-d05a21d49524
|
github.com/siyuan-note/filelock v0.0.0-20230615140405-d05a21d49524
|
||||||
|
|
|
||||||
|
|
@ -287,8 +287,8 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g
|
||||||
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
|
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
|
||||||
github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d h1:lvCTyBbr36+tqMccdGMwuEU+hjux/zL6xSmf5S9ITaA=
|
github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d h1:lvCTyBbr36+tqMccdGMwuEU+hjux/zL6xSmf5S9ITaA=
|
||||||
github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
|
github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
|
||||||
github.com/siyuan-note/dejavu v0.0.0-20230703042337-1a642a48e663 h1:dKz6pHllXsmKXRf06wznJDT0F602wDK7GIffiPCyRoc=
|
github.com/siyuan-note/dejavu v0.0.0-20230704110643-d6a4b98d2d6c h1:SuJTliwQGq2mlw+SNQJsunSrQBChlSjyvWv0ntK9PFQ=
|
||||||
github.com/siyuan-note/dejavu v0.0.0-20230703042337-1a642a48e663/go.mod h1:SRJIJt0yhMD2Yfs49bFEgcWUZ80okiA/oTFRT7/PL28=
|
github.com/siyuan-note/dejavu v0.0.0-20230704110643-d6a4b98d2d6c/go.mod h1:SRJIJt0yhMD2Yfs49bFEgcWUZ80okiA/oTFRT7/PL28=
|
||||||
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 h1:Bi7/7f29LW+Fm0cHc0J1NO1cZqyJwljSWVmfOqVZgaE=
|
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 h1:Bi7/7f29LW+Fm0cHc0J1NO1cZqyJwljSWVmfOqVZgaE=
|
||||||
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw=
|
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw=
|
||||||
github.com/siyuan-note/eventbus v0.0.0-20230702081350-6dde667e7112 h1:lb+8C+XEEEn/lcBtoXlrf5mZEoe0y0KlqiIGG93Gozc=
|
github.com/siyuan-note/eventbus v0.0.0-20230702081350-6dde667e7112 h1:lb+8C+XEEEn/lcBtoXlrf5mZEoe0y0KlqiIGG93Gozc=
|
||||||
|
|
|
||||||
|
|
@ -513,6 +513,10 @@ func formatRepoErrorMsg(err error) string {
|
||||||
msg = Conf.Language(23)
|
msg = Conf.Language(23)
|
||||||
} else if errors.Is(err, cloud.ErrSystemTimeIncorrect) {
|
} else if errors.Is(err, cloud.ErrSystemTimeIncorrect) {
|
||||||
msg = Conf.Language(195)
|
msg = Conf.Language(195)
|
||||||
|
} else if errors.Is(err, cloud.ErrDeprecatedVersion) {
|
||||||
|
msg = Conf.Language(212)
|
||||||
|
} else if errors.Is(err, cloud.ErrCloudCheckFailed) {
|
||||||
|
msg = Conf.Language(213)
|
||||||
} else {
|
} else {
|
||||||
msgLowerCase := strings.ToLower(msg)
|
msgLowerCase := strings.ToLower(msg)
|
||||||
if strings.Contains(msgLowerCase, "permission denied") || strings.Contains(msg, "access is denied") {
|
if strings.Contains(msgLowerCase, "permission denied") || strings.Contains(msg, "access is denied") {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue