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

README.md

@@ -149,13 +149,14 @@ To simplify, it is recommended to configure the workspace folder path to be cons
 docker run -d -v /siyuan/workspace:/siyuan/workspace -p 6806:6806 -u 1000:1000 b3log/siyuan --workspace=/siyuan/workspace/ --accessAuthCode=xxx
 ```
 
-Alternatively, see below for an example docker-compose file:
+Alternatively, see below for an example Docker Compose file:
+
 ```
 version: "3.9"
 services:
   main:
     image: b3log/siyuan
-    command: ['--workspace=/siyuan/workspace/','--accessAuthCode=${AuthCode}']
+    command: ['--workspace=/siyuan/workspace/', '--accessAuthCode=${AuthCode}']
     user: '1000:1000'
     ports:
       - 6806:6806

README_zh_CN.md

@@ -152,6 +152,25 @@ docker run -d -v workspace_dir_host:workspace_dir_container -p 6806:6806 b3log/s
 docker run -d -v /siyuan/workspace:/siyuan/workspace -p 6806:6806 -u 1000:1000 b3log/siyuan --workspace=/siyuan/workspace/ --accessAuthCode=xxx
 ```
 
+使用 Docker Compose 部署请参考下面的示例：
+
+```
+version: "3.9"
+services:
+  main:
+    image: b3log/siyuan
+    command: ['--workspace=/siyuan/workspace/', '--accessAuthCode=${AuthCode}']
+    user: '1000:1000'
+    ports:
+      - 6806:6806
+    volumes:
+      - /siyuan/workspace:/siyuan/workspace
+    restart: unless-stopped
+    environment:
+      # A list of time zone identifiers can be found at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+      - TZ=${TimeZone}
+```
+
 #### 用户权限
 
 镜像中是使用默认创建的普通用户 `siyuan`（uid 1000/gid 1000）来启动内核进程的，所以在宿主机创建工作空间文件夹时请注意设置该文件夹所属用户组：`chown -R 1000:1000 /siyuan/workspace`，在启动容器时需要带参数 `-u 1000:1000`。

kernel/server/serve.go

@@ -345,6 +345,7 @@ func serveCheckAuth(c *gin.Context) {
 		"l5":                     model.Conf.Language(177),
 		"l6":                     model.Conf.Language(178),
 		"l7":                     template.HTML(model.Conf.Language(184)),
+		"l8":                     model.Conf.Language(95),
 		"appearanceMode":         model.Conf.Appearance.Mode,
 		"appearanceModeOS":       model.Conf.Appearance.ModeOS,
 		"workspace":              filepath.Base(util.WorkspaceDir),