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

app/appearance/langs/en_US.json

@@ -1,4 +1,5 @@
 {
+  "changelog": "Changelog",
   "returnDesktop": "Press back again to desktop",
   "enterNew": "Enter to create",
   "enterNewTip": "No documents found, Enter to create a new document.",

app/appearance/langs/es_ES.json

@@ -1,4 +1,5 @@
 {
+  "changelog": "Registro de cambios",
   "returnDesktop": "Presiona volver de nuevo al escritorio",
   "enterNew": "Ingresar para crear",
   "enterNewTip": "No se encontraron documentos, ingrese para crear un nuevo documento.",

app/appearance/langs/fr_FR.json

@@ -1,4 +1,5 @@
 {
+  "changelog": "Journal des modifications",
   "returnDesktop": "Appuyez à nouveau sur le bureau",
   "enterNew": "Entrez pour créer",
   "enterNewTip": "Aucun document trouvé, entrez pour créer un nouveau document.",

app/appearance/langs/zh_CHT.json

@@ -1,4 +1,5 @@
 {
+  "changelog": "變更日誌",
   "returnDesktop": "再按一次返回桌面",
   "enterNew": "回車創建",
   "enterNewTip": "搜索結果為空，回車創建新文檔",

app/appearance/langs/zh_CN.json

@@ -1,4 +1,5 @@
 {
+  "changelog": "更新日志",
   "returnDesktop": "再按一次返回桌面",
   "enterNew": "回车创建",
   "enterNewTip": "搜索结果为空，回车创建新文档",

app/src/boot/openChangelog.ts

@@ -2,7 +2,6 @@ import {fetchPost} from "../util/fetch";
 import {Dialog} from "../dialog";
 import {highlightRender} from "../protyle/markdown/highlightRender";
 import {isMobile} from "../util/functions";
-import {Constants} from "../constants";
 
 export const openChangelog = () => {
     fetchPost("/api/system/getChangelog", {}, (response) => {
@@ -10,7 +9,7 @@ export const openChangelog = () => {
             return;
         }
         const dialog = new Dialog({
-            title: `v${Constants.SIYUAN_VERSION} ${window.siyuan.languages.update}`,
+            title: `✨ ${window.siyuan.languages.changelog}`,
             width: isMobile() ? "80vw" : "768px",
             content: `<div style="overflow:auto;height: ${isMobile() ? "80" : "70"}vh;" class="b3-dialog__content b3-typography b3-typography--default">${response.data.html}</div>`
         });

kernel/api/system.go

@@ -45,16 +45,13 @@ func getChangelog(c *gin.Context) {
 		return
 	}
 
-	//if !model.Conf.ShowChangelog {
-	//	return
-	//}
+	if !model.Conf.ShowChangelog {
+		return
+	}
 
-	ver := util.Ver
-	ver = "2.8.4"
-
-	changelogPath := filepath.Join(changelogsDir, "v"+ver+"_"+model.Conf.Lang+".md")
+	changelogPath := filepath.Join(changelogsDir, "v"+util.Ver+"_"+model.Conf.Lang+".md")
 	if !gulu.File.IsExist(changelogPath) {
-		changelogPath = filepath.Join(changelogsDir, "v"+ver+".md")
+		changelogPath = filepath.Join(changelogsDir, "v"+util.Ver+".md")
 		if !gulu.File.IsExist(changelogPath) {
 			logging.LogErrorf("changelog not found: %s", changelogPath)
 			return