From 0ac9b7499ad38dbc01b05170a8db7d575f3ac2da Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Wed, 7 Dec 2022 11:01:29 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E6=A1=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=AB=AF=E5=88=9D=E5=A7=8B=E5=8C=96=E6=97=B6=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E5=A4=96=E8=A7=82=E8=AF=AD=E8=A8=80=20Fix=20https://g?=
 =?UTF-8?q?ithub.com/siyuan-note/siyuan/issues/6803?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/electron/init.html | 27 +++++++++++++++------------
 app/electron/main.js   | 10 ++++++++++
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/app/electron/init.html b/app/electron/init.html
index 0fd6694e6..e28631878 100644
--- a/app/electron/init.html
+++ b/app/electron/init.html
@@ -205,10 +205,11 @@
         <div class="fn__space"></div>
         <div class="fn__flex-1"></div>
         <select class="b3-select lang">
-            <option value="en-US">English</option>
-            <option value="fr-FR">Français</option>
-            <option value="zh-CN">简体中文</option>
-            <option value="zh-CHT">繁體中文</option>
+            <option value="en_US">English</option>
+            <option value="es_ES">Español</option>
+            <option value="fr_FR">Français</option>
+            <option value="zh_CN">简体中文</option>
+            <option value="zh_CHT">繁體中文</option>
         </select>
     </label>
     <label class="b3-label">
@@ -247,10 +248,11 @@
         <div class="fn__space"></div>
         <div class="fn__flex-1"></div>
         <select class="b3-select lang">
-            <option value="en-US">English</option>
-            <option value="fr-FR">Français</option>
-            <option value="zh-CN">简体中文</option>
-            <option value="zh-CHT">繁體中文</option>
+            <option value="en_US">English</option>
+            <option value="es_ES">Español</option>
+            <option value="fr_FR">Français</option>
+            <option value="zh_CN">简体中文</option>
+            <option value="zh_CHT">繁體中文</option>
         </select>
     </label>
     <label class="b3-label">
@@ -300,7 +302,7 @@
   }
 
   const setLang = (lang) => {
-    if (lang === 'zh-CN') {
+    if (lang === 'zh_CN') {
       document.title = `思源笔记 v${getSearch('v')}`
       document.getElementById('zhCN').classList.remove('fn__none')
       document.getElementById('enUS').classList.add('fn__none')
@@ -311,7 +313,8 @@
     }
   }
 
-  setLang(navigator.language)
+  let lang = decodeURIComponent(getSearch('lang'));
+  setLang(lang)
 
   document.querySelectorAll('.version').forEach(item => {
     item.textContent = `🔖 v${getSearch('v')}`
@@ -322,7 +325,7 @@
   })
 
   document.querySelectorAll('.lang').forEach(item => {
-    item.value = navigator.language
+    item.value = lang
     item.addEventListener('change', () => {
       document.querySelectorAll('.lang').forEach(item1 => {
         item1.value = item.value
@@ -355,7 +358,7 @@
           if (!fs.existsSync(initPath)) {
             fs.mkdirSync(initPath, {mode: 0o755, recursive: true})
           }
-          const lang = document.querySelector('.lang').value.replaceAll('-', '_')
+          const lang = document.querySelector('.lang').value
           ipcRenderer.send('siyuan-first-init', `${initPath}-${lang}`)
         }
       })
diff --git a/app/electron/main.js b/app/electron/main.js
index 186d37813..09d1bc74f 100644
--- a/app/electron/main.js
+++ b/app/electron/main.js
@@ -710,9 +710,19 @@ app.whenReady().then(() => {
     if (isDevEnv) {
       initHTMLPath = path.join(appDir, 'electron', 'init.html')
     }
+
+    let languages = app.getPreferredSystemLanguages();
+    let language = "en_US";
+    if (languages && 0 < languages.length) {
+      if ("zh-Hans-CN" === languages[0]) {
+        language = "zh_CN"
+      }
+    }
+
     firstOpenWindow.loadFile(
       initHTMLPath, {
         query: {
+          lang: language,
           home: app.getPath('home'),
           v: appVer,
           icon: path.join(appDir, 'stage', 'icon-large.png'),