Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 16:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve cloud sync

Browse source
This commit is contained in:
Liang Ding 2022-07-06 19:24:24 +08:00
parent 072a97af90
commit 0d466ea96a
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
6 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/appearance/langs/en_US.json
View file

@ -924,6 +924,7 @@
"151": "Do not include symbols \\ / : * ? " ' < > |",
"152": "Uploaded files %d, chunks %d, sent bytes %s",
"153": "Downloaded files %d, chunks %d, received bytes %s",
"154": "The cloud can only support backup up to 12 snapshots"
"154": "The cloud can only support backup up to 12 snapshots",
"155": "Cloud sync directory has been reset to [main]"
}
}

3
app/appearance/langs/es_ES.json
View file

@ -924,6 +924,7 @@
"151": "No incluir símbolos \\ / : * ? " ' < > |",
"152": "Archivos cargados %d, fragmentos %d, bytes enviados %s",
"153": "Archivos descargados %d, fragmentos %d, bytes recibidos %s",
"154": "La nube solo admite copias de seguridad de hasta 12 instantáneas"
"154": "La nube solo admite copias de seguridad de hasta 12 instantáneas",
"155": "El directorio de sincronización de la nube se ha restablecido a [main]"
}
}

3
app/appearance/langs/fr_FR.json
View file

@ -924,6 +924,7 @@
"151": "Ne pas inclure les symboles \\ / : * ? " ' < > |",
"152": "Fichiers téléchargés %d, morceaux %d, octets envoyés %s",
"153": "Fichiers chargés %d, morceaux %d, octets reçus %s",
"154": "Le cloud ne peut prendre en charge que la sauvegarde jusqu'à 12 instantanés"
"154": "Le cloud ne peut prendre en charge que la sauvegarde jusqu'à 12 instantanés",
"155": "Le répertoire de synchronisation du cloud a été réinitialisé sur [main]"
}
}

3
app/appearance/langs/zh_CHT.json
View file

@ -923,6 +923,7 @@
"151": "請勿包含符號 \\ / : * ? " ' < > |",
"152": "上傳文件數 %d 上傳分塊數 %d 發送字節數 %s",
"153": "下載文件數 %d 下載分塊數 %d 接收字節數 %s",
"154": "雲端最多只能支持備份 12 個快照"
"154": "雲端最多只能支持備份 12 個快照",
"155": "雲端同步目錄已經重置為 [main]"
}
}

3
app/appearance/langs/zh_CN.json
View file

@ -925,6 +925,7 @@
"151": "请勿包含符号 \\ / : * ? " ' < > |",
"152": "上传文件数 %d 上传分块数 %d 发送字节数 %s",
"153": "下载文件数 %d 下载分块数 %d 接收字节数 %s",
"154": "云端最多只能支持备份 12 个快照"
"154": "云端最多只能支持备份 12 个快照",
"155": "云端同步目录已经重置为 [main]"
}
}

5
kernel/model/sync.go
View file

@ -72,7 +72,7 @@ func SyncData(boot, exit, byHand bool) {
}
if util.IsMutexLocked(&syncLock) {
util.LogWarnf("sync has been locked")
util.LogWarnf("a cloud sync operation still processing")
planSyncAfter(30 * time.Second)
return
}
@ -1190,8 +1190,9 @@ func RemoveCloudSyncDir(name string) (err error) {
}
if Conf.Sync.CloudName == name {
Conf.Sync.CloudName = ""
Conf.Sync.CloudName = "main"
Conf.Save()
util.PushMsg(Conf.Language(155), 5000)
}
return
}