From 26d112bd55816ccd0df6128bc63420af25c2a984 Mon Sep 17 00:00:00 2001
From: Richard Park <richard.park@loafle.com>
Date: Wed, 18 Dec 2019 13:44:26 +0900
Subject: [PATCH] i18n is applied

---
 .../ucap-webmessenger-electron/src/index.ts    |  6 +++---
 .../src/app/app-translate.module.ts            |  9 ++++++---
 .../left-sidenav/group.component.html          |  2 +-
 .../messenger-settings.dialog.component.ts     |  3 +++
 .../messenger/messenger.layout.module.ts       |  4 ++++
 .../src/app/services/app.service.ts            |  6 +++---
 .../src/app/store/setting/init/effects.ts      |  4 ++++
 .../src/assets/i18n/en.json                    | 18 +++++++++++++++++-
 .../src/assets/i18n/ko.json                    | 18 +++++++++++++++++-
 .../lib/services/electron-native.service.ts    |  7 ++++++-
 .../src/lib/translate/electron-loader.ts       |  2 +-
 11 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/electron-projects/ucap-webmessenger-electron/src/index.ts b/electron-projects/ucap-webmessenger-electron/src/index.ts
index 28aad24a..c216f832 100644
--- a/electron-projects/ucap-webmessenger-electron/src/index.ts
+++ b/electron-projects/ucap-webmessenger-electron/src/index.ts
@@ -98,7 +98,7 @@ autoUpdater.autoDownload = false;
 autoUpdater.logger = log;
 
 const ucapMessengerLauncher = new AutoLaunch({
-  name: app.getName()
+  name: app.name
 });
 
 app.on(ElectronAppChannel.SecondInstance, (event, args, workingDirectory) => {
@@ -412,9 +412,9 @@ ipcMain.on(FileChannel.ReadFile, (event: IpcMainEvent, ...args: any[]) => {
   try {
     fse.readFile(root(args[0]), (err, data) => {
       if (!!err) {
-        event.returnValue = null;
+        event.returnValue = err;
       } else {
-        event.returnValue = new Blob([data]);
+        event.returnValue = data;
       }
     });
   } catch (error) {
diff --git a/projects/ucap-webmessenger-app/src/app/app-translate.module.ts b/projects/ucap-webmessenger-app/src/app/app-translate.module.ts
index 77a3fd70..b1518a9a 100644
--- a/projects/ucap-webmessenger-app/src/app/app-translate.module.ts
+++ b/projects/ucap-webmessenger-app/src/app/app-translate.module.ts
@@ -4,10 +4,13 @@ import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
 
 import { UCAP_NATIVE_SERVICE, NativeService } from '@ucap-webmessenger/native';
 
-export async function createTranslateLoader(nativeService: NativeService) {
-  // tslint:disable-next-line: variable-name
+import { environment } from '../environments/environment';
+
+export function createTranslateLoader(nativeService: NativeService) {
   const translateLoader = nativeService.getTranslateLoader(
-    './assets/i18n/',
+    environment.production
+      ? './assets/i18n/'
+      : '/projects/ucap-webmessenger-app/src/assets/i18n/',
     '.json'
   );
 
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html
index 3c70f82d..a37f29ba 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html
@@ -1,6 +1,6 @@
 <div>
   <div class="current-head">
-    <h3>그룹</h3>
+    <h3>{{ 'group.label' | translate }}</h3>
     <div class="btn-box">
       <button
         mat-icon-button
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.ts
index 21168bc8..282ed2fa 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.ts
@@ -24,6 +24,7 @@ import {
   NotificationSetting
 } from '@ucap-webmessenger/ui-settings';
 import { NativeService, UCAP_NATIVE_SERVICE } from '@ucap-webmessenger/native';
+import { TranslateService } from '@ngx-translate/core';
 
 export interface MessengerSettingsDialogData {}
 
@@ -50,6 +51,7 @@ export class MessengerSettingsDialogComponent implements OnInit {
     private localStorageService: LocalStorageService,
     private ucapTranslateService: UCapTranslateService,
     @Inject(UCAP_NATIVE_SERVICE) private nativeService: NativeService,
+    private translateService: TranslateService,
     private store: Store<any>,
     @Inject(DOCUMENT) private document: Document,
     private renderer2: Renderer2
@@ -78,6 +80,7 @@ export class MessengerSettingsDialogComponent implements OnInit {
       );
     }
     if (this.appUserInfo.settings.general.locale !== setting.locale) {
+      this.translateService.use(setting.locale);
     }
     if (
       this.appUserInfo.settings.general.hrInfoLocale !== setting.hrInfoLocale
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/messenger.layout.module.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/messenger.layout.module.ts
index fc7072c2..decd71d3 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/messenger.layout.module.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/messenger.layout.module.ts
@@ -40,6 +40,8 @@ import { MatChipsModule } from '@angular/material/chips';
 
 import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
 
+import { TranslateModule } from '@ngx-translate/core';
+
 import { UCapUiModule } from '@ucap-webmessenger/ui';
 import { UCapUiAccountModule } from '@ucap-webmessenger/ui-account';
 import { UCapUiChatModule } from '@ucap-webmessenger/ui-chat';
@@ -92,6 +94,8 @@ import { DIALOGS } from './dialogs';
 
     PerfectScrollbarModule,
 
+    TranslateModule,
+
     UCapUiModule,
     UCapUiAccountModule,
     UCapUiChatModule,
diff --git a/projects/ucap-webmessenger-app/src/app/services/app.service.ts b/projects/ucap-webmessenger-app/src/app/services/app.service.ts
index bd2b3dae..1164f4ca 100644
--- a/projects/ucap-webmessenger-app/src/app/services/app.service.ts
+++ b/projects/ucap-webmessenger-app/src/app/services/app.service.ts
@@ -16,12 +16,12 @@ export class AppService {
     private sessionStorageService: SessionStorageService,
     private appNotificationService: AppNotificationService,
     private appNativeService: AppNativeService,
-    // private translateService: TranslateService,
+    private translateService: TranslateService,
     private ucapTranslateService: UCapTranslateService,
     @Inject(UCAP_NATIVE_SERVICE) private nativeService: NativeService
   ) {
-    // this.translateService.setDefaultLang('ko');
-    // this.translateService.use('ko');
+    this.translateService.setDefaultLang('ko');
+    this.translateService.use('ko');
 
     this.ucapTranslateService.setDefaultLang('ko');
     this.ucapTranslateService.use('ko');
diff --git a/projects/ucap-webmessenger-app/src/app/store/setting/init/effects.ts b/projects/ucap-webmessenger-app/src/app/store/setting/init/effects.ts
index dd7f4110..99b43a10 100644
--- a/projects/ucap-webmessenger-app/src/app/store/setting/init/effects.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/setting/init/effects.ts
@@ -9,6 +9,7 @@ import { LocalStorageService } from '@ucap-webmessenger/web-storage';
 import { AppUserInfo, KEY_APP_USER_INFO } from '@app/types/app-user-info.type';
 
 import { environment } from '../../../../environments/environment';
+import { TranslateService } from '@ngx-translate/core';
 
 @Injectable()
 export class Effects {
@@ -23,6 +24,8 @@ export class Effects {
             environment.customConfig.appKey
           );
 
+          this.translateService.use(appUserInfo.settings.general.locale);
+
           this.ucapTranslateService.use(
             appUserInfo.settings.general.hrInfoLocale
           );
@@ -32,6 +35,7 @@ export class Effects {
   );
   constructor(
     private actions$: Actions,
+    private translateService: TranslateService,
     private ucapTranslateService: UCapTranslateService,
     private localStorageService: LocalStorageService
   ) {}
diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json
index 0967ef42..6ae392b1 100644
--- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json
+++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json
@@ -1 +1,17 @@
-{}
+{
+  "common": {
+    "search": "Search",
+    "searchWord": "Search word",
+    "useOnlyForSpecialCharacter": "Can only use Special characters: {{0}}"
+  },
+  "group": {
+    "label": "Group",
+    "addNew": "Add new group",
+    "expandMore": "Expand all groups",
+    "expandLess": "Collapse all groups",
+    "name": "Group name"
+  },
+  "chat": {},
+  "organization": {},
+  "message": {}
+}
diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
index 0967ef42..0a490518 100644
--- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
+++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
@@ -1 +1,17 @@
-{}
+{
+  "common": {
+    "search": "검색",
+    "searchWord": "검색어",
+    "useOnlyForSpecialCharacter": "특수문자는 {{0}}만 사용할 수 있습니다."
+  },
+  "group": {
+    "label": "그룹",
+    "addNew": "새 그룹 추가",
+    "expandMore": "그룹 전체 열기",
+    "expandLess": "그룹 전체 닫기",
+    "name": "그룹 이름"
+  },
+  "chat": {},
+  "organization": {},
+  "message": {}
+}
diff --git a/projects/ucap-webmessenger-native-electron/src/lib/services/electron-native.service.ts b/projects/ucap-webmessenger-native-electron/src/lib/services/electron-native.service.ts
index d8bcf14d..51cfb636 100644
--- a/projects/ucap-webmessenger-native-electron/src/lib/services/electron-native.service.ts
+++ b/projects/ucap-webmessenger-native-electron/src/lib/services/electron-native.service.ts
@@ -166,7 +166,12 @@ export class ElectronNativeService implements NativeService {
   readFile(path: string): Promise<Buffer> {
     return new Promise<Buffer>((resolve, reject) => {
       try {
-        resolve(this.ipcRenderer.sendSync(FileChannel.ReadFile, path));
+        const buffer = this.ipcRenderer.sendSync(FileChannel.ReadFile, path);
+        if (!!buffer) {
+          resolve(buffer);
+        } else {
+          reject(buffer as Error);
+        }
       } catch (error) {
         reject(error);
       }
diff --git a/projects/ucap-webmessenger-native-electron/src/lib/translate/electron-loader.ts b/projects/ucap-webmessenger-native-electron/src/lib/translate/electron-loader.ts
index 41c16644..5fdc96f2 100644
--- a/projects/ucap-webmessenger-native-electron/src/lib/translate/electron-loader.ts
+++ b/projects/ucap-webmessenger-native-electron/src/lib/translate/electron-loader.ts
@@ -15,7 +15,7 @@ export class TranslateLoaderService implements TranslateLoader {
   public getTranslation(lang: string): Observable<any> {
     return new Observable<any>(subscriber => {
       this.nativeService
-        .readFile(`${this.prefix}${lang}.${this.suffix}`)
+        .readFile(`${this.prefix}${lang}${this.suffix}`)
         .then(buffer => {
           subscriber.next(JSON.parse(buffer.toString('utf-8')));
         })