From 4398b4d7efbe7d00b1f3c0d75067662b2d9dbe89 Mon Sep 17 00:00:00 2001
From: SpikeHD <spikegdofficial@gmail.com>
Date: Mon, 16 May 2022 20:20:33 -0700
Subject: [PATCH] more language stuff

---
 lang/en.json                       |  2 +-
 src/ui/components/menu/Options.tsx | 18 +++++++++++++-----
 src/utils/configuration.ts         |  2 ++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/lang/en.json b/lang/en.json
index 35086db..2731c93 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -14,7 +14,7 @@
     "grasscutter_jar": "Set Grasscutter Jar",
     "java_path": "Set Custom Java Path",
     "grasscutter_with_game": "Automatically launch Grasscutter with game",
-    "language": "Select Language"
+    "language": "Select Language (requires restart)"
   },
   "downloads": {
     "grasscutter_stable_data": "Download Grasscutter Stable Data",
diff --git a/src/ui/components/menu/Options.tsx b/src/ui/components/menu/Options.tsx
index a8255a2..b63e9e3 100644
--- a/src/ui/components/menu/Options.tsx
+++ b/src/ui/components/menu/Options.tsx
@@ -17,7 +17,8 @@ interface IState {
   grasscutter_path: string
   java_path: string
   grasscutter_with_game: boolean
-  language_options: { [key: string]: string }[]
+  language_options: { [key: string]: string }[],
+  current_language: string
 }
 
 export default class Options extends React.Component<IProps, IState> {
@@ -29,7 +30,8 @@ export default class Options extends React.Component<IProps, IState> {
       grasscutter_path: '',
       java_path: '',
       grasscutter_with_game: false,
-      language_options: []
+      language_options: [],
+      current_language: 'en'
     }
   }
 
@@ -42,7 +44,8 @@ export default class Options extends React.Component<IProps, IState> {
       grasscutter_path: config.grasscutter_path || '',
       java_path: config.java_path || '',
       grasscutter_with_game: config.grasscutter_with_game || false,
-      language_options: languages
+      language_options: languages,
+      current_language: config.language || 'en'
     })
 
     this.forceUpdate()
@@ -115,11 +118,16 @@ export default class Options extends React.Component<IProps, IState> {
             <Tr text="options.language" />
           </div>
           <div className='OptionValue'>
-            <select onChange={(event) => {
+            <select defaultValue={this.state.current_language} onChange={(event) => {
               this.setLanguage(event.target.value)
             }}>
               {this.state.language_options.map(lang => (
-                <option key={Object.keys(lang)[0]} value={Object.keys(lang)[0]}>{lang[Object.keys(lang)[0]]}</option>
+                <option
+                  key={Object.keys(lang)[0]}
+                  value={Object.keys(lang)[0]}>
+
+                  {lang[Object.keys(lang)[0]]}
+                </option>
               ))}
             </select>
           </div>
diff --git a/src/utils/configuration.ts b/src/utils/configuration.ts
index 93ac627..d1f554c 100644
--- a/src/utils/configuration.ts
+++ b/src/utils/configuration.ts
@@ -18,6 +18,7 @@ let defaultConfig: Configuration
     startup_launch: false,
     last_ip: '',
     last_port: '',
+    language: 'en',
   }
 })()
 
@@ -34,6 +35,7 @@ export interface Configuration {
   startup_launch: boolean
   last_ip: string
   last_port: string
+  language: string
 }
 
 export async function setConfigOption(key: string, value: any): Promise<void> {