diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index e306222b1..74348212c 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -2,7 +2,7 @@ "localSnapshot": "Local Snapshot", "localTagSnapshot": "Local Tag Snapshot", "cloudTagSnapshot": "Cloud Tag Snapshot", - "cloudBackupTip": "Move to Data History => Data Snapshot", + "cloudBackupTip": "Please go to [Data History - Data Snapshot] to operate", "snapshotMemo": "Snapshot Memo", "snapshotMemoTip": "Please enter the snapshot memo", "tagSnapshot": "Tag Snapshot", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 2dcfc8f6c..027a6d0c2 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -2,7 +2,7 @@ "localSnapshot": "Instantánea local", "localTagSnapshot": "Instantánea de etiqueta local", "cloudTagSnapshot": "Instantánea de etiquetas en la nube", - "cloudBackupTip": "Mover a Historial de datos => Instantánea de datos", + "cloudBackupTip": "Vaya a [Historial de datos - Instantánea de datos] para operar", "snapshotMemo": "Memo de Instantánea", "snapshotMemoTip": "Ingrese la nota instantánea", "tagSnapshot": "Instantánea de la etiqueta", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 6e0526c30..cc784f530 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -2,7 +2,7 @@ "localSnapshot": "Instantané local", "localTagSnapshot": "Instantané de balise locale", "cloudTagSnapshot": "Instantané de balise cloud", - "cloudBackupTip": "Déplacer vers l'historique des données => Instantané des données", + "cloudBackupTip": "Veuillez accéder à [Historique des données - Instantané des données] pour opérer", "snapshotMemo": "Mémo d'instantané", "snapshotMemoTip": "Veuillez entrer le mémo instantané", "tagSnapshot": "Instantané de balise", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 1d8719969..bf01a19b6 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -2,7 +2,7 @@ "localSnapshot": "本地快照", "localTagSnapshot": "本地標記的快照", "cloudTagSnapshot": "雲端標記的快照", - "cloudBackupTip": "遷移至數據歷史 => 數據快照", + "cloudBackupTip": "請到 [數據歷史 - 數據快照] 中進行操作", "snapshotMemo": "快照備註", "snapshotMemoTip": "請輸入快照備註", "tagSnapshot": "標記快照", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 33d718cda..91c9ed985 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -2,7 +2,7 @@ "localSnapshot": "本地快照", "localTagSnapshot": "本地标记的快照", "cloudTagSnapshot": "云端标记的快照", - "cloudBackupTip": "迁移至数据历史 => 数据快照", + "cloudBackupTip": "请到 [数据历史 - 数据快照] 中进行操作", "snapshotMemo": "快照备注", "snapshotMemoTip": "请输入快照备注", "tagSnapshot": "标记快照", diff --git a/kernel/go.mod b/kernel/go.mod index 42f5f3d65..222892c6d 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -40,7 +40,7 @@ require ( github.com/qiniu/go-sdk/v7 v7.13.0 github.com/radovskyb/watcher v1.0.7 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 - github.com/siyuan-note/dejavu v0.0.0-20220705153739-b39f50053167 + github.com/siyuan-note/dejavu v0.0.0-20220705162638-58c67df5a0ca github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676 github.com/siyuan-note/eventbus v0.0.0-20220624162334-ca7c06dc771f github.com/siyuan-note/filelock v0.0.0-20220704090116-54dfb035283f diff --git a/kernel/go.sum b/kernel/go.sum index 2e8ccd210..f9d4c6347 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -421,8 +421,8 @@ github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/siyuan-note/dejavu v0.0.0-20220705153739-b39f50053167 h1:RNtnxXdcQTFXSlLTZ+m2GiiHclU3uSyF6ADAQihCp5Q= -github.com/siyuan-note/dejavu v0.0.0-20220705153739-b39f50053167/go.mod h1:ral+X0pNW6nSQVvIcxllUXSczCaY4UOCT2iGlO4YNg0= +github.com/siyuan-note/dejavu v0.0.0-20220705162638-58c67df5a0ca h1:2CxMRaQjDv101Ez/Iwt972rEvLZqNc+BZ6W9EGFTNgg= +github.com/siyuan-note/dejavu v0.0.0-20220705162638-58c67df5a0ca/go.mod h1:ral+X0pNW6nSQVvIcxllUXSczCaY4UOCT2iGlO4YNg0= github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676 h1:QB9TjJQFhXhZ6dAtPpY02DlzHAQm1C+WqZq6OadG8mI= github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw= github.com/siyuan-note/eventbus v0.0.0-20220624162334-ca7c06dc771f h1:JMobMNZ7AqaKKyEK+WeWFhix/2TDQXgPZDajU00IybU= diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 9cd1a6ce2..9c19d3da9 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -207,11 +207,11 @@ func DownloadCloudSnapshot(tag, id string) (err error) { return } + defer util.PushClearProgress() downloadFileCount, downloadChunkCount, downloadBytes, err := repo.DownloadTagIndex(tag, id, cloudInfo, map[string]interface{}{CtxPushMsg: CtxPushMsgToStatusBarAndProgress}) if nil != err { return } - util.PushClearProgress() msg := fmt.Sprintf(Conf.Language(153), downloadFileCount, downloadChunkCount, byteCountSI(downloadBytes)) util.PushMsg(msg, 5000) util.PushStatusBar(msg) @@ -234,11 +234,11 @@ func UploadCloudSnapshot(tag, id string) (err error) { return } + defer util.PushClearProgress() uploadFileCount, uploadChunkCount, uploadBytes, err := repo.UploadTagIndex(tag, id, cloudInfo, map[string]interface{}{CtxPushMsg: CtxPushMsgToStatusBarAndProgress}) if nil != err { return } - util.PushClearProgress() msg := fmt.Sprintf(Conf.Language(152), uploadFileCount, uploadChunkCount, byteCountSI(uploadBytes)) util.PushMsg(msg, 5000) util.PushStatusBar(msg)