mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-01-06 16:58:49 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
de2d42d7ed
6 changed files with 6 additions and 1 deletions
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
"removeWorkspacePhysically": "Do you want to physically delete the workspace data? (Physical deletion cannot be recovered)",
|
||||
"mainMenu": "Main Menu",
|
||||
"searchRemoveName": "Do you want to delete ${x} and assign its query condition to ${y}?",
|
||||
"searchUpdateName": "Update name ${x} to ${y}?",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
"removeWorkspacePhysically": "¿Desea eliminar físicamente los datos del espacio de trabajo? (La eliminación física no se puede recuperar)",
|
||||
"mainMenu": "Menú principal",
|
||||
"searchRemoveName": "¿Desea eliminar ${x} y asignar su condición de consulta a ${y}?",
|
||||
"searchUpdateName": "¿Actualizar nombre ${x} a ${y}?",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
"removeWorkspacePhysically": "Voulez-vous supprimer physiquement les données de l'espace de travail ? (La suppression physique ne peut pas être récupérée)",
|
||||
"mainMenu": "Menu principal",
|
||||
"searchRemoveName": "Voulez-vous supprimer ${x} et affecter sa condition de requête à ${y} ?",
|
||||
"searchUpdateName": "Mettre à jour le nom ${x} en ${y} ?",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
"removeWorkspacePhysically": "是否物理刪除工作空間數據?(物理刪除無法恢復)",
|
||||
"mainMenu": "主菜單",
|
||||
"searchRemoveName": "是否刪 ${x} 並將其查詢條件賦值給 ${y}?",
|
||||
"searchUpdateName": "是否將查詢名稱 ${x} 更新為 ${y}?",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
"removeWorkspacePhysically": "是否物理删除工作空间数据?(物理删除无法恢复)",
|
||||
"mainMenu": "主菜单",
|
||||
"searchRemoveName": "是否删 ${x} 并将其查询条件赋值给 ${y}?",
|
||||
"searchUpdateName": "是否将查询名称 ${x} 更新为 ${y}?",
|
||||
|
|
|
|||
|
|
@ -173,7 +173,6 @@ func removeWorkspaceDirPhysically(c *gin.Context) {
|
|||
}
|
||||
|
||||
path := arg["path"].(string)
|
||||
|
||||
if gulu.File.IsDir(path) {
|
||||
err := os.RemoveAll(path)
|
||||
if nil != err {
|
||||
|
|
@ -183,6 +182,7 @@ func removeWorkspaceDirPhysically(c *gin.Context) {
|
|||
}
|
||||
}
|
||||
|
||||
logging.LogInfof("removed workspace [%s] physically", path)
|
||||
if util.WorkspaceDir == path {
|
||||
os.Exit(logging.ExitCodeOk)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue