From d9c164298b52bd195b089ef56fdc23140ada3947 Mon Sep 17 00:00:00 2001
From: Richard Park <richard.park@loafle.com>
Date: Tue, 24 Dec 2019 18:14:16 +0900
Subject: [PATCH] translate is modified

---
 .../components/left-side.component.ts         |  4 ++--
 .../chat/create-chat.dialog.component.html    | 23 ++++++++++++-------
 .../src/assets/i18n/en.json                   | 14 ++++++++---
 .../src/assets/i18n/ko.json                   | 14 ++++++++---
 .../components/tenant-search.component.html   |  2 +-
 .../src/lib/ucap-ui-organization.module.ts    |  4 +++-
 6 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts
index cb78983e..633e848e 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts
@@ -174,7 +174,7 @@ export class LeftSideComponent implements OnInit, OnDestroy {
       width: '600px',
       data: {
         type: UserSelectDialogType.NewChat,
-        title: type === 'TIMER' ? 'New Timer Chat' : 'New Chat'
+        title: type === 'TIMER' ? 'chat.newTimerChat' : 'chat.newChat'
       }
     });
 
@@ -203,7 +203,7 @@ export class LeftSideComponent implements OnInit, OnDestroy {
       width: '600px',
       data: {
         type: UserSelectDialogType.NewGroup,
-        title: 'New Group'
+        title: 'group.addNew'
       }
     });
 
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html
index 6bdd98c4..7f87a15d 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html
@@ -1,19 +1,21 @@
 <mat-card class="confirm-card mat-elevation-z">
   <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
-    <mat-card-title>{{ data.title }}</mat-card-title>
+    <mat-card-title>{{ data.title | translate }}</mat-card-title>
   </mat-card-header>
   <mat-card-content>
     <div *ngIf="data.type === UserSelectDialogType.NewGroup">
       <form name="inputForm" [formGroup]="inputForm" novalidate>
         <mat-form-field
-          hintLabel="특수문자는 '-,_'만 사용할 수 있습니다."
+          hintLabel="{{
+            'common.useOnlyForSpecialCharacter' | translate: { v: '-,_' }
+          }}"
           style="display:block;margin-bottom:10px;"
         >
           <input
             matInput
             #input
             maxlength="20"
-            placeholder="그룹이름"
+            placeholder="{{ 'group.name' | translate }}"
             formControlName="groupName"
           />
           <mat-hint align="end">{{ input.value?.length || 0 }}/20</mat-hint>
@@ -45,7 +47,7 @@
                 stroke-width="1.5"
                 stroke-linecap="butt"
                 stroke-linejoin="round"
-                matTooltip="그룹"
+                matTooltip="{{ 'group.label' | translate }}"
                 matTooltipPosition="after"
               >
                 <path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path>
@@ -107,7 +109,7 @@
                 </div>
 
                 <div class="result-num">
-                  검색결과
+                  {{ 'common.searchResult' | translate }}
                   <span class="text-accent-color"
                     >({{ searchUserInfos.length }}명)</span
                   >
@@ -129,7 +131,9 @@
           </mat-tab>
           <mat-tab>
             <ng-template mat-tab-label>
-              <mat-icon matTooltip="조직도" matTooltipPosition="after"
+              <mat-icon
+                matTooltip="{{ 'organization.chart' | translate }}"
+                matTooltipPosition="after"
                 >device_hub</mat-icon
               >
             </ng-template>
@@ -150,7 +154,9 @@
           </mat-tab>
           <mat-tab *ngIf="data.type === UserSelectDialogType.MessageForward">
             <ng-template mat-tab-label>
-              <mat-icon matTooltip="대화방" matTooltipPosition="before"
+              <mat-icon
+                matTooltip="{{ 'chat.room' | translate }}"
+                matTooltipPosition="before"
                 >chat</mat-icon
               >
             </ng-template>
@@ -187,7 +193,8 @@
         </mat-chip-list>
       </div>
       <span *ngIf="isShowSelectedUserList"
-        >{{ selectedUserList.length }}명</span
+        >{{ selectedUserList.length }}
+        {{ 'common.howPersons' | translate }}</span
       >
     </div>
   </mat-card-content>
diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json
index 816a749f..5ed246ae 100644
--- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json
+++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json
@@ -2,7 +2,9 @@
   "common": {
     "search": "Search",
     "searchWord": "Search word",
-    "useOnlyForSpecialCharacter": "Can only use Special characters: {{0}}",
+    "searchResult": "Search result",
+    "useOnlyForSpecialCharacter": "Can only use Special characters: {{v}}",
+    "howPersons": "person(s)",
     "timezone": {
       "Africa/Abidjan": "Africa/Abidjan",
       "Africa/Accra": "Africa/Accra",
@@ -606,7 +608,13 @@
     "expandLess": "Collapse all groups",
     "name": "Group name"
   },
-  "chat": {},
-  "organization": {},
+  "chat": {
+    "room": "Chat room",
+    "newTimerChat": "New Timer Chat",
+    "newChat": "New Chat"
+  },
+  "organization": {
+    "chart": "Organization chart"
+  },
   "message": {}
 }
diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
index d0e6f55c..fd8b1ae2 100644
--- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
+++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
@@ -2,7 +2,9 @@
   "common": {
     "search": "검색",
     "searchWord": "검색어",
-    "useOnlyForSpecialCharacter": "특수문자는 {{0}}만 사용할 수 있습니다.",
+    "searchResult": "검색 결과",
+    "useOnlyForSpecialCharacter": "특수문자는 {{v}}만 사용할 수 있습니다.",
+    "howPersons": "명",
     "timezone": {
       "Africa/Abidjan": "아프리카/아비 장",
       "Africa/Accra": "아프리카/아크라",
@@ -606,7 +608,13 @@
     "expandLess": "그룹 전체 닫기",
     "name": "그룹 이름"
   },
-  "chat": {},
-  "organization": {},
+  "chat": {
+    "room": "대화방",
+    "newTimerChat": "새로운 타이머 대화",
+    "newChat": "새로운 대화"
+  },
+  "organization": {
+    "chart": "조직도"
+  },
   "message": {}
 }
diff --git a/projects/ucap-webmessenger-ui-organization/src/lib/components/tenant-search.component.html b/projects/ucap-webmessenger-ui-organization/src/lib/components/tenant-search.component.html
index c73d4782..37a1412e 100644
--- a/projects/ucap-webmessenger-ui-organization/src/lib/components/tenant-search.component.html
+++ b/projects/ucap-webmessenger-ui-organization/src/lib/components/tenant-search.component.html
@@ -15,7 +15,7 @@
       <input
         matInput
         #searchWordInput
-        placeholder="검색어"
+        placeholder="{{ 'common.searchWord' | translate }}"
         (keydown.enter)="onKeyDownEnter(searchWordInput.value)"
       />
       <button
diff --git a/projects/ucap-webmessenger-ui-organization/src/lib/ucap-ui-organization.module.ts b/projects/ucap-webmessenger-ui-organization/src/lib/ucap-ui-organization.module.ts
index 3691b611..b67ee813 100644
--- a/projects/ucap-webmessenger-ui-organization/src/lib/ucap-ui-organization.module.ts
+++ b/projects/ucap-webmessenger-ui-organization/src/lib/ucap-ui-organization.module.ts
@@ -15,7 +15,7 @@ import { MatSelectModule } from '@angular/material/select';
 import { MatTreeModule } from '@angular/material/tree';
 
 import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
-
+import { TranslateModule } from '@ngx-translate/core';
 import { UCapUiModule } from '@ucap-webmessenger/ui';
 
 import { TenantSearchComponent } from './components/tenant-search.component';
@@ -39,6 +39,8 @@ const SERVICES = [];
     MatSelectModule,
     MatTreeModule,
 
+    TranslateModule,
+
     PerfectScrollbarModule,
 
     UCapUiModule