From 85f3bfa51f04a93e771d7f043d55bc4ede6c1a02 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 12 Jun 2023 12:23:14 +0800 Subject: [PATCH] :art: Improve the mouse hove data sync button information on the desktop and browser https://github.com/siyuan-note/siyuan/issues/8521 --- app/appearance/langs/en_US.json | 2 ++ app/appearance/langs/es_ES.json | 2 ++ app/appearance/langs/fr_FR.json | 2 ++ app/appearance/langs/zh_CHT.json | 2 ++ app/appearance/langs/zh_CN.json | 2 ++ app/src/layout/topBar.ts | 8 +++++--- app/src/types/index.d.ts | 1 + 7 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 0516f85e2..3b3a635a3 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,6 @@ { + "currentKernel": "Current kernel", + "otherOnlineKernels": "Other online kernels", "syncPerception": "⚗\uFE0F Sync perception", "syncPerceptionTip": "After enabling, it will automatically receive and send data sync signals, so that data sync can be performed for all online devices as much as possible in real time (this feature is currently in the experimental stage)", "hide": "Hide", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 52665c6c6..c2471c7ba 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,6 @@ { + "currentKernel": "Núcleo actual", + "otherOnlineKernels": "Otros núcleos en línea", "syncPerception": "⚗\uFE0F Percepción de sincronización", "syncPerceptionTip": "Después de habilitarlo, automáticamente recibirá y enviará señales de sincronización de datos, de modo que la sincronización de datos se pueda realizar para todos los dispositivos en línea tanto como sea posible en tiempo real (esta función se encuentra actualmente en etapa experimental)", "hide": "Ocultar", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index d0c904507..d97cdca95 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,6 @@ { + "currentKernel": "Noyau actuel", + "otherOnlineKernels": "Autres noyaux en ligne", "syncPerception": "⚗\uFE0F Perception de la synchronisation", "syncPerceptionTip": "Après l'activation, il recevra et enverra automatiquement des signaux de synchronisation des données, afin que la synchronisation des données puisse être effectuée pour tous les appareils en ligne autant que possible en temps réel (cette fonctionnalité est actuellement en phase expérimentale)", "hide": "Masquer", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 6285f140e..34b2c23dc 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,6 @@ { + "currentKernel": "當前內核", + "otherOnlineKernels": "其他聯機內核", "syncPerception": "⚗\uFE0F 同步感知", "syncPerceptionTip": "啟用後將自動接收和發送數據同步信號,這樣可以盡量實時地為所有在線設備進行數據同步(該特性目前處於實驗階段)", "hide": "隱藏", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 1bd1de0f7..a64601e37 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,6 @@ { + "currentKernel": "当前内核", + "otherOnlineKernels": "其他联机内核", "syncPerception": "⚗\uFE0F 同步感知", "syncPerceptionTip": "启用后将自动接收和发送数据同步信号,这样可以尽量实时地为所有在线设备进行数据同步(该特性目前处于实验阶段)", "hide": "隐藏", diff --git a/app/src/layout/topBar.ts b/app/src/layout/topBar.ts index 83d58707b..336e3eb34 100644 --- a/app/src/layout/topBar.ts +++ b/app/src/layout/topBar.ts @@ -240,17 +240,19 @@ export const initBar = (app: App) => { if (!window.siyuan.config.sync.enabled || (0 === window.siyuan.config.sync.provider && needSubscribe(""))) { html = response.data.stat; } else { - html = window.siyuan.languages._kernel[82].replace("%s", dayjs(response.data.synced).format("YYYY-MM-DD HH:mm")) + " " + response.data.kernel + "\n" + html = window.siyuan.languages._kernel[82].replace("%s", dayjs(response.data.synced).format("YYYY-MM-DD HH:mm")) + "\n" html += response.data.stat; if (response.data.kernels.length > 0) { - html += "\n\n" + html += window.siyuan.languages.currentKernel + "\n" + html += " " + response.data.kernel + "/" + window.siyuan.config.system.kernelVersion + " (" + window.siyuan.config.system.os + "/" + window.siyuan.config.system.name + ")\n" + html += window.siyuan.languages.otherOnlineKernels + "\n" response.data.kernels.forEach((item: { os: string; ver: string; hostname: string; id: string; }) => { - html += `${item.os}-${item.ver} ${item.hostname} ${item.id}\n` + html += ` ${item.id}/${item.ver} (${item.os}/${item.hostname}) \n` }) } } diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index d56ad65ed..54e6321fd 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -555,6 +555,7 @@ interface IConfig { port: string scheme: string } + name: string kernelVersion: string isInsider: boolean appDir: string