diff --git a/electron-projects/ucap-webmessenger-electron/src/index.ts b/electron-projects/ucap-webmessenger-electron/src/index.ts index 402d0a58..7c4d4c37 100644 --- a/electron-projects/ucap-webmessenger-electron/src/index.ts +++ b/electron-projects/ucap-webmessenger-electron/src/index.ts @@ -616,7 +616,7 @@ ipcMain.on(ProcessChannel.Execute, (event: IpcMainEvent, ...args: any[]) => { const executableName: string = args[0]; const binPath = __DEV__ ? path.join(__dirname, '../../', 'config/build/win/bin/') - : path.join(__dirname, '..', '..', '/bin/'); + : path.join(__dirname, '..', '..', '..', '/bin/'); const executablePath = __WIN32__ ? path.join(binPath, `${executableName}.exe`) diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json index e73d58e2..7121d43d 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json @@ -410,6 +410,10 @@ "simpleView": "Simple View", "preview": "Preview" }, + "languages": { + "ko": "Korean", + "en": "English" + }, "timezone": { "Africa/Abidjan": "Africa/Abidjan", "Africa/Accra": "Africa/Accra", diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json index 9b21162c..f6c3e561 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json @@ -410,6 +410,10 @@ "simpleView": "간략 보기", "preview": "미리 보기" }, + "languages": { + "ko": "한국어", + "en": "영어" + }, "timezone": { "Africa/Abidjan": "아프리카/아비 장", "Africa/Accra": "아프리카/아크라", diff --git a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html index 35c13b97..ebee0967 100644 --- a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html +++ b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.html @@ -80,11 +80,11 @@ [value]="setting.locale" (selectionChange)="onSelectionChangeLocale($event)" > - - 한국어 (대한민국) - - - 영어 (미국) + + {{ language.displayName }} @@ -99,11 +99,11 @@ [value]="setting.hrInfoLocale" (selectionChange)="onSelectionChangeHrInfoLocale($event)" > - - 한국어 (대한민국) - - - 영어 (미국) + + {{ language.displayName }} @@ -111,7 +111,7 @@ -

시간대

+

{{ 'settings.genernal.timezone' | translate }}

{ this.setTimezoneData(); + this.setLanguageData(); }); } @@ -145,25 +161,35 @@ export class GeneralComponent implements OnInit, OnDestroy { } private setTimezoneData() { - this.translateService - .get('common.timezone') - .pipe(take(1)) - .subscribe(timezoneData => { - let timezoneList: TimezoneData[] = []; - for (const name of moment.tz.names()) { - const displayName = `(UTC${moment.tz(name).format('Z')}) ${ - timezoneData[name] - }`; - timezoneList.push({ - displayName, - name - }); - } - timezoneList = timezoneList.sort((a: TimezoneData, b: TimezoneData) => { - return a.displayName.localeCompare(b.displayName); - }); + const timezoneData = this.translateService.instant('common.timezone'); - this.timezoneList = timezoneList; + let timezoneList: TimezoneData[] = []; + for (const name of moment.tz.names()) { + const displayName = `(UTC${moment.tz(name).format('Z')}) ${ + timezoneData[name] + }`; + timezoneList.push({ + displayName, + name }); + } + timezoneList = timezoneList.sort((a: TimezoneData, b: TimezoneData) => { + return a.displayName.localeCompare(b.displayName); + }); + + this.timezoneList = timezoneList; + } + + private setLanguageData() { + const languageData = this.translateService.instant('common.languages'); + + const languageList: LanguageData[] = []; + for (const key in languageData) { + if (languageData.hasOwnProperty(key)) { + languageList.push({ displayName: languageData[key], name: key }); + } + } + + this.languageList = languageList; } }