Apply ko lang when ko lang in Windows

JeongJun-Lee · May 22, 2021 · f5cc075 · f5cc075
1 parent e9ed775
commit f5cc075
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/src/main/main.ts b/src/main/main.ts
@@ -17,7 +17,7 @@ const runtimeProperties: RuntimeGlobalProperties = {
     roomIds: [],
     file: commandLineOptions.file || '',
     appName: 'entry',
-    language: app.getLocale()
+    language: ''
 };
 
 global.sharedObject = Object.assign({}, runtimeProperties, configurations, commandLineOptions);
@@ -45,6 +45,7 @@ if (!app.requestSingleInstanceLock()) {
         mainWindow = new MainWindowManager(commandLineOptions);
         const hardwareWindow = new HardwareWindowManager();
         const aboutWindow = new AboutWindowManager(mainWindow.window);
+        global.sharedObject.language = app.getLocale();
 
         app.on('second-instance', (event, commandLine, workingDirectory) => {
             // 어플리케이션을 중복 실행했습니다. 주 어플리케이션 인스턴스를 활성화 합니다.

diff --git a/src/renderer/components/header.tsx b/src/renderer/components/header.tsx
@@ -129,6 +129,7 @@ class Header extends Component<IProps, IState> {
     }
 
     getLangValue() {
+        this.props.persist.lang = window.getSharedObject().language == 'uz' ? 'uz' : 'ko';
         const lang = this.props.persist.lang;
         return _get(Lang, lang);
     }

diff --git a/src/renderer/helper/importToggleHelper.ts b/src/renderer/helper/importToggleHelper.ts
@@ -29,7 +29,7 @@ export default class {
      */
     static async changeLang(lang: string) {
         window.Lang = await import(`../resources/lang/${lang}.json`);
-        window.getSharedObject().language = window.Lang.type;
+        window.getSharedObject().language = lang;
         window.initNativeMenu();
     }
 }
diff --git a/src/renderer/initEntry.ts b/src/renderer/initEntry.ts
@@ -3,7 +3,7 @@ import StorageManager from './helper/storageManager';
 import ImportToggleHelper from './helper/importToggleHelper';
 
 // Lang, EntryStatic
-const lastLang = StorageManager.getPersistLangType() || 'uz'; // 'ko'; // Changed for uz version
+const lastLang = StorageManager.getPersistLangType() || (window.getSharedObject().language == 'ru' ? 'uz' : 'ko');
 const lastWSMode = StorageManager.getPersistWorkspaceMode();
 
 (async() => {

diff --git a/src/renderer/store/modules/persist.ts b/src/renderer/store/modules/persist.ts
@@ -21,8 +21,7 @@ export interface IPersistState {
 }
 
 const defaultState: IPersistState = {
-    // Changed for uz version
-    lang: 'uz', // 'ko',
+    lang: 'ko',
     mode: 'workspace', // undefined,
 };