🎨 Internationalization supports Japanese #11212

siyuan-note · May 1, 2024 · 6e0da99 · 6e0da99
1 parent 71d00fc
commit 6e0da99
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 6 deletions.
diff --git a/app/electron/init.html b/app/electron/init.html
@@ -210,6 +210,7 @@ <h2>思源笔记</h2>
             <option value="fr_FR">Français</option>
             <option value="zh_CN">简体中文</option>
             <option value="zh_CHT">繁體中文</option>
+            <option value="jp_JP">日本語</option>
         </select>
     </label>
     <label class="b3-label">
@@ -253,6 +254,7 @@ <h2>SiYuan</h2>
             <option value="fr_FR">Français</option>
             <option value="zh_CN">简体中文</option>
             <option value="zh_CHT">繁體中文</option>
+            <option value="jp_JP">日本語</option>
         </select>
     </label>
     <label class="b3-label">

diff --git a/app/src/config/appearance.ts b/app/src/config/appearance.ts
@@ -6,7 +6,7 @@ import {Constants} from "../constants";
 import {exportLayout, resetLayout} from "../layout/util";
 import {isBrowser} from "../util/functions";
 import {fetchPost} from "../util/fetch";
-import {genOptions} from "../util/genOptions";
+import {genLangOptions, genOptions} from "../util/genOptions";
 import {openSnippets} from "./util/snippets";
 import {loadAssets} from "../util/assets";
 import {resetFloatDockSize} from "../layout/dock/util";
@@ -94,7 +94,7 @@ export const appearance = {
         <div class="b3-label__text">${window.siyuan.languages.language1}</div>
     </div>
     <span class="fn__space"></span>
-    <select id="lang" class="b3-select fn__flex-center fn__size200">${genOptions(window.siyuan.config.langs, window.siyuan.config.appearance.lang)}</select>
+    <select id="lang" class="b3-select fn__flex-center fn__size200">${genLangOptions(window.siyuan.config.langs, window.siyuan.config.appearance.lang)}</select>
 </div>
 <div class="b3-label config__item${isBrowser() ? " fn__none" : " fn__flex"}">
     <div class="fn__flex-1">

diff --git a/app/src/constants.ts b/app/src/constants.ts
@@ -190,6 +190,7 @@ export abstract class Constants {
         en_US: "20210808180117-6v0mkxr",
         fr_FR: "20210808180117-6v0mkxr",
         es_ES: "20210808180117-6v0mkxr",
+        jp_JP: "20210808180117-6v0mkxr",
     };
     public static readonly QUICK_DECK_ID = "20230218211946-2kw8jgx";
 

diff --git a/app/src/mobile/settings/appearance.ts b/app/src/mobile/settings/appearance.ts
@@ -1,5 +1,5 @@
 import {fetchPost} from "../../util/fetch";
-import {genOptions} from "../../util/genOptions";
+import {genLangOptions, genOptions} from "../../util/genOptions";
 import {openModel} from "../menu/model";
 
 export const initAppearance = () => {
@@ -40,7 +40,7 @@ export const initAppearance = () => {
 <div class="b3-label">
     ${window.siyuan.languages.language}
     <div class="fn__hr"></div>
-    <select id="lang" class="b3-select fn__block">${genOptions(window.siyuan.config.langs, window.siyuan.config.appearance.lang)}</select>
+    <select id="lang" class="b3-select fn__block">${genLangOptions(window.siyuan.config.langs, window.siyuan.config.appearance.lang)}</select>
     <div class="b3-label__text">${window.siyuan.languages.language1}</div>
 </div>`,
         bindEvent(modelMainElement: HTMLElement) {

diff --git a/app/src/types/config.d.ts b/app/src/types/config.d.ts
@@ -263,7 +263,7 @@ declare namespace Config {
      * User interface language
      * Same as {@link IAppearance.lang}
      */
-    export type TLang = "en_US" | "es_ES" | "fr_FR" | "zh_CHT" | "zh_CN";
+    export type TLang = "en_US" | "es_ES" | "fr_FR" | "zh_CHT" | "zh_CN" | "jp_JP";
 
     /**
      * SiYuan bazaar related configuration

diff --git a/app/src/util/genOptions.ts b/app/src/util/genOptions.ts
@@ -9,3 +9,12 @@ export const genOptions = (data: string[] | { label: string, name: string }[], k
     });
     return html;
 };
+
+export const genLangOptions = (data: { label: string, name: string }[], key: string) => {
+    let html = "";
+    data.forEach((item: { label: string, name: string }) => {
+        html += `<option value="${item.name}" ${key === item.name ? "selected" : ""}>${item.label} (${item.name})</option>`;
+    });
+    return html;
+};
+
diff --git a/kernel/util/working.go b/kernel/util/working.go
@@ -79,7 +79,7 @@ func Boot() {
 	readOnly := flag.String("readonly", "false", "read-only mode")
 	accessAuthCode := flag.String("accessAuthCode", "", "access auth code")
 	ssl := flag.Bool("ssl", false, "for https and wss")
-	lang := flag.String("lang", "", "zh_CN/zh_CHT/en_US/fr_FR/es_ES")
+	lang := flag.String("lang", "", "zh_CN/zh_CHT/en_US/fr_FR/es_ES/jp_JP")
 	mode := flag.String("mode", "prod", "dev/prod")
 	flag.Parse()