From 4d303df05ad2116c1407c8432eaec5c05f307c37 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Wed, 15 Jan 2020 09:52:20 +0900
Subject: [PATCH] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC.=20136?=
 =?UTF-8?q?=20=EC=AA=BD=EC=A7=80=20=EB=82=A0=EC=A7=9C=20=ED=91=9C=EA=B8=B0?=
 =?UTF-8?q?=20=EC=98=A4=EB=A5=98=20151=20=EC=AA=BD=EC=A7=80=20=EC=98=88?=
 =?UTF-8?q?=EC=95=BD=20=EB=B3=B4=EB=82=B4=EA=B8=B0=20=EC=9B=94/=EC=9D=BC?=
 =?UTF-8?q?=20=ED=91=9C=EA=B8=B0=20=EC=98=A4=EB=A5=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

대화입력폼 다국어 처리.
---
 .../ucap-webmessenger-app/src/assets/i18n/en.json   |  3 +++
 .../ucap-webmessenger-app/src/assets/i18n/ko.json   |  3 +++
 .../src/lib/components/form.component.html          |  2 +-
 .../src/lib/components/list-item.component.html     |  2 +-
 .../src/lib/components/write.component.html         | 13 +++++++++++--
 .../src/lib/components/general.component.ts         |  1 +
 .../src/lib/components/pick-date.component.ts       |  8 +++++++-
 7 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json
index 5af8ce35..43706be4 100644
--- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json
+++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json
@@ -198,6 +198,7 @@
     "isRoomTypeSecret": "This room is secret type",
     "notificationIsOn": "Notification is on",
     "notificationIsOff": "Notification is off",
+    "typeMessage": "Type your message.",
     "event": {
       "inviteToRoomWith": "{{owner}} invited {{inviter}}.",
       "exitFromRoomWith": "{{exitor}} has left.",
@@ -276,6 +277,8 @@
     "detailOfViewers": "Detail of viewers",
     "selectRecipient": "Select recipient",
     "andOthers": "and {{count}}others",
+    "addReceiver": "Add Reciever",
+    "countOfReceiver": "{{count}} total recipients",
     "results": {
       "successForSending": "Your message has been sent.",
       "successForReservation": "You have scheduled a message transfer.",
diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
index 0d88386b..2e91f02a 100644
--- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
+++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
@@ -198,6 +198,7 @@
     "isRoomTypeSecret": "비밀 대화방입니다.",
     "notificationIsOn": "알림 켜짐",
     "notificationIsOff": "알림 꺼짐",
+    "typeMessage": "대화를 입력하세요.",
     "event": {
       "inviteToRoomWith": "{{owner}}이 {{inviter}}을 초대했습니다.",
       "exitFromRoomWith": "{{exitor}}님이 퇴장하셨습니다.",
@@ -276,6 +277,8 @@
     "detailOfViewers": "읽음 확인",
     "selectRecipient": "수신자 선택",
     "andOthers": "외 {{count}}명",
+    "addReceiver": "수신자 추가",
+    "countOfReceiver": "총 수신자 {{count}}명",
     "results": {
       "successForSending": "쪽지를 전송하였습니다.",
       "successForReservation": "쪽지 전송을 예약 하였습니다.",
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html
index 4be941ee..b08053ed 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html
@@ -50,7 +50,7 @@
       <textarea
         matInput
         #replyInput
-        placeholder="Type your message"
+        placeholder="{{ 'chat.typeMessage' | translate }}"
         ngModel
         name="message"
         [matTextareaAutosize]="true"
diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.html b/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.html
index 36daf520..3a80a0c1 100644
--- a/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.html
+++ b/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.html
@@ -61,7 +61,7 @@
     </dd>
   </dl>
   <div class="date">
-    <span>{{ message.regDate | ucapDate: 'MM:DD' }}</span>
+    <span>{{ message.regDate | ucapDate: 'C' }}</span>
     <span
       *ngIf="message.type === MessageType.Receive && !message.readYn"
       class="badge-new bg-warn-darkest"
diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.html b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.html
index 280480c3..c4770966 100644
--- a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.html
+++ b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.html
@@ -7,9 +7,18 @@
         class="mat-mini-fab mat-button-base mat-accent mat-elevation-z"
       >
         <mat-icon>add</mat-icon>
-        <span class="mat-fab__label">수신자 추가</span>
+        <span class="mat-fab__label">{{
+          'message.addReceiver' | translate
+        }}</span>
       </button>
-      <span class="receiver-sum text-accent-color">총 수신자 OO명</span>
+      <span
+        *ngIf="receiverList.length > 0"
+        class="receiver-sum text-accent-color"
+      >
+        {{
+          'message.countOfReceiver' | translate: { count: receiverList.length }
+        }}
+      </span>
     </div>
     <mat-chip-list #chipList aria-label="receiver selection">
       <mat-chip
diff --git a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.ts b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.ts
index f3164d92..d2b62454 100644
--- a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.ts
+++ b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.ts
@@ -78,6 +78,7 @@ export class GeneralComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
+    this.logger.debug('general setting', this.setting);
     let themeIndex: number;
     switch (this.setting.appTheme) {
       case 'theme-default':
diff --git a/projects/ucap-webmessenger-ui/src/lib/components/pick-date.component.ts b/projects/ucap-webmessenger-ui/src/lib/components/pick-date.component.ts
index c936a745..50be754d 100644
--- a/projects/ucap-webmessenger-ui/src/lib/components/pick-date.component.ts
+++ b/projects/ucap-webmessenger-ui/src/lib/components/pick-date.component.ts
@@ -10,6 +10,7 @@ import {
 import { ucapAnimations } from '../animations';
 import { MatCalendar, DateAdapter } from '@angular/material';
 import { Subject } from 'rxjs';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ucap-pick-date',
@@ -34,7 +35,12 @@ export class PickDateComponent<D> implements OnInit {
   calendar: MatCalendar<D>;
 
   // tslint:disable-next-line: variable-name
-  constructor(@Optional() private _dateAdapter: DateAdapter<D>) {}
+  constructor(
+    @Optional() private _dateAdapter: DateAdapter<D>,
+    private translateService: TranslateService
+  ) {
+    this._dateAdapter.setLocale(this.translateService.currentLang);
+  }
 
   ngOnInit() {}