mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-20 08:30:12 +01:00
🐛 The authentication page after startup Alt+M fails https://github.com/siyuan-note/siyuan/issues/9575
This commit is contained in:
parent
fcdc2f8718
commit
1e7a45c66d
4 changed files with 4 additions and 1 deletions
|
|
@ -533,7 +533,7 @@
|
||||||
// 用于授权页保持连接,避免非常驻内存内核自动退出 https://github.com/siyuan-note/insider/issues/1099
|
// 用于授权页保持连接,避免非常驻内存内核自动退出 https://github.com/siyuan-note/insider/issues/1099
|
||||||
new WebSocket((window.location.protocol === 'https:' ? 'wss' : 'ws') + '://' + window.location.host + '/ws?app=siyuan&id=auth')
|
new WebSocket((window.location.protocol === 'https:' ? 'wss' : 'ws') + '://' + window.location.host + '/ws?app=siyuan&id=auth')
|
||||||
ipcRenderer.send("siyuan-hotkey", {
|
ipcRenderer.send("siyuan-hotkey", {
|
||||||
languages: {},
|
languages: {{.trayMenuLangs}},
|
||||||
hotkeys: ['{{.keymapGeneralToggleWin}}']
|
hotkeys: ['{{.keymapGeneralToggleWin}}']
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -454,6 +454,7 @@ func initLang() {
|
||||||
|
|
||||||
util.TimeLangs[name] = langMap["_time"].(map[string]interface{})
|
util.TimeLangs[name] = langMap["_time"].(map[string]interface{})
|
||||||
util.TaskActionLangs[name] = langMap["_taskAction"].(map[string]interface{})
|
util.TaskActionLangs[name] = langMap["_taskAction"].(map[string]interface{})
|
||||||
|
util.TrayMenuLangs[name] = langMap["_trayMenu"].(map[string]interface{})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -350,6 +350,7 @@ func serveCheckAuth(c *gin.Context) {
|
||||||
"workspace": filepath.Base(util.WorkspaceDir),
|
"workspace": filepath.Base(util.WorkspaceDir),
|
||||||
"workspacePath": util.WorkspaceDir,
|
"workspacePath": util.WorkspaceDir,
|
||||||
"keymapGeneralToggleWin": keymapHideWindow,
|
"keymapGeneralToggleWin": keymapHideWindow,
|
||||||
|
"trayMenuLangs": util.TrayMenuLangs[util.Lang],
|
||||||
}
|
}
|
||||||
buf := &bytes.Buffer{}
|
buf := &bytes.Buffer{}
|
||||||
if err = tpl.Execute(buf, model); nil != err {
|
if err = tpl.Execute(buf, model); nil != err {
|
||||||
|
|
|
||||||
|
|
@ -143,6 +143,7 @@ var (
|
||||||
Langs = map[string]map[int]string{}
|
Langs = map[string]map[int]string{}
|
||||||
TimeLangs = map[string]map[string]interface{}{}
|
TimeLangs = map[string]map[string]interface{}{}
|
||||||
TaskActionLangs = map[string]map[string]interface{}{}
|
TaskActionLangs = map[string]map[string]interface{}{}
|
||||||
|
TrayMenuLangs = map[string]map[string]interface{}{}
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue