0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-01-24 17:40:36 +08:00
commit 7310278dfb
8 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1395,7 +1395,7 @@
"224": "Listing cloud storage data objects...",
"225": "Listing cloud storage snapshots...",
"226": "Listing cloud storage snapshot references...",
"227": "Downloading cloud storage snapshot [%s]...",
"227": "Downloading cloud storage snapshot...",
"228": "Downloading cloud storage data files...",
"229": "Deleting cloud storage unreferenced snapshots...",
"230": "Deleting cloud storage unreferenced verification snapshots...",

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

@ -1395,7 +1395,7 @@
"224": "Lista de objetos de datos de almacenamiento en la nube...",
"225": "Listado de instantáneas de almacenamiento en la nube...",
"226": "Listado de referencias de instantáneas de almacenamiento en la nube...",
"227": "Descargando instantánea de almacenamiento en la nube [%s]...",
"227": "Descargando instantánea de almacenamiento en la nube...",
"228": "Descargando archivos de datos de almacenamiento en la nube...",
"229": "Eliminando instantáneas sin referencia del almacenamiento en la nube...",
"230": "Eliminando instantáneas de verificación sin referencia del almacenamiento en la nube...",

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

@ -1395,7 +1395,7 @@
"224": "Liste des objets de données de stockage cloud...",
"225": "Liste des instantanés de stockage cloud...",
"226": "Liste des références d'instantanés de stockage cloud...",
"227": "Téléchargement de l'instantané de stockage cloud [%s]...",
"227": "Téléchargement de l'instantané de stockage cloud...",
"228": "Téléchargement des fichiers de données de stockage cloud...",
"229": "Suppression des instantanés non référencés du stockage cloud...",
"230": "Suppression des instantanés de vérification non référencés du stockage cloud...",

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

@ -1395,7 +1395,7 @@
"224": "正在列出雲端儲存資料物件...",
"225": "正在列出雲端儲存快照...",
"226": "正在列出雲端儲存快照引用...",
"227": "正在下載雲端儲存快照 [%s]...",
"227": "正在下載雲端儲存快照...",
"228": "正在下載雲端儲存資料檔...",
"229": "正在刪除雲端儲存未引用快照...",
"230": "正在刪除雲端儲存未引用校驗快照...",

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

@ -1395,7 +1395,7 @@
"224": "正在列出云端存储数据对象...",
"225": "正在列出云端存储快照...",
"226": "正在列出云端存储快照引用...",
"227": "正在下载云端存储快照 [%s]...",
"227": "正在下载云端存储快照...",
"228": "正在下载云端存储数据文件...",
"229": "正在删除云端存储未引用快照...",
"230": "正在删除云端存储未引用校验快照...",

4
kernel/go.mod
View file

@ -51,9 +51,9 @@ require (
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
github.com/sashabaranov/go-openai v1.18.3
github.com/shirou/gopsutil/v3 v3.23.12
github.com/siyuan-note/dejavu v0.0.0-20240124050424-be48ff329ebf
github.com/siyuan-note/dejavu v0.0.0-20240124091649-941e2960dc74
github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4
github.com/siyuan-note/eventbus v0.0.0-20240124035703-9092bf8e8f48
github.com/siyuan-note/eventbus v0.0.0-20240124091459-8e1b37a55255
github.com/siyuan-note/filelock v0.0.0-20240121150730-38e4487651d1
github.com/siyuan-note/httpclient v0.0.0-20240105083729-70d0557bc690
github.com/siyuan-note/logging v0.0.0-20231208035918-61f884c854f0

8
kernel/go.sum
View file

@ -352,12 +352,12 @@ github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR
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/simplereach/timeutils v1.2.0/go.mod h1:VVbQDfN/FHRZa1LSqcwo4kNZ62OOyqLLGQKYB3pB0Q8=
github.com/siyuan-note/dejavu v0.0.0-20240124050424-be48ff329ebf h1:C8QfMrXu+/ETqVcgkSASkjXNwJDYeZQXd+pBymAQqYY=
github.com/siyuan-note/dejavu v0.0.0-20240124050424-be48ff329ebf/go.mod h1:yFeL7vYskRZBKwtaSRb4t6Ys3ir66P+X4fe55/Rdv7E=
github.com/siyuan-note/dejavu v0.0.0-20240124091649-941e2960dc74 h1:APLNpAChNbUNnXriEu7f+EGU3Ql+YaClpBJsf9gfSs8=
github.com/siyuan-note/dejavu v0.0.0-20240124091649-941e2960dc74/go.mod h1:HyWE225b1A3D4/O/kxw7Bh4yRNX5RUFcm7+HOwC2Xnw=
github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4 h1:kJaw5L/evyW6LcB9IQT8PR4ppx8JVqOFP9Ix3rfwSrc=
github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4/go.mod h1:UYcCCY+0wh+GmUoDOaO63j1sV5lgy7laLAk1XhEiUis=
github.com/siyuan-note/eventbus v0.0.0-20240124035703-9092bf8e8f48 h1:qEeZUvXFIfONrl7Eaf8fSP/NswHkKM2XMbb9yrMNqbY=
github.com/siyuan-note/eventbus v0.0.0-20240124035703-9092bf8e8f48/go.mod h1:1/nGgthl89FPA7GzAcEWKl6zRRnfgyTjzLZj9bW7kuw=
github.com/siyuan-note/eventbus v0.0.0-20240124091459-8e1b37a55255 h1:WTAUBlU2v7ISet9ankbjqZrRKo6MLGK1LBmDyNlehPY=
github.com/siyuan-note/eventbus v0.0.0-20240124091459-8e1b37a55255/go.mod h1:1/nGgthl89FPA7GzAcEWKl6zRRnfgyTjzLZj9bW7kuw=
github.com/siyuan-note/filelock v0.0.0-20240121150730-38e4487651d1 h1:eNHKiqE5yPnj1PYk0PJhxP+oqWdKi+0ZI28lBQmz5qg=
github.com/siyuan-note/filelock v0.0.0-20240121150730-38e4487651d1/go.mod h1:CYJQjSyKYLhEJJC+5I+R4uNcpyW0X2CaUYwMVbkelDk=
github.com/siyuan-note/httpclient v0.0.0-20240105083729-70d0557bc690 h1:r7qWSaYQhomCAdQl/dZe4NdAn1zadytb4jcOeopdHw4=

8
kernel/model/repository.go
View file

@ -1841,13 +1841,11 @@ func subscribeRepoEvents() {
eventbus.Subscribe(eventbus.EvtCloudPurgeListRefs, func(context map[string]interface{}) {
util.ContextPushMsg(context, Conf.language(226))
})
eventbus.Subscribe(eventbus.EvtCloudPurgeDownloadIndex, func(context map[string]interface{}, id string) {
msg := fmt.Sprintf(Conf.language(227), id)
util.ContextPushMsg(context, msg)
eventbus.Subscribe(eventbus.EvtCloudPurgeDownloadIndexes, func(context map[string]interface{}) {
util.ContextPushMsg(context, fmt.Sprintf(Conf.language(227)))
})
eventbus.Subscribe(eventbus.EvtCloudPurgeDownloadFiles, func(context map[string]interface{}) {
msg := Conf.language(228)
util.ContextPushMsg(context, msg)
util.ContextPushMsg(context, Conf.language(228))
})
eventbus.Subscribe(eventbus.EvtCloudPurgeRemoveIndexes, func(context map[string]interface{}) {
util.ContextPushMsg(context, Conf.language(229))