From 8b3115648931bd1c69a887af3927fdcd22d43205 Mon Sep 17 00:00:00 2001 From: leejinho Date: Mon, 3 Feb 2020 13:32:28 +0900 Subject: [PATCH] =?UTF-8?q?bugfix=20::=20=EB=8B=A4=EA=B5=AD=EC=96=B4=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=8B=9C=20>=20=EC=AA=BD=EC=A7=80=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=20>=20select=20=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EB=B0=9C=EC=83=9D=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../left-sidenav/message.component.html | 25 ++++----- .../left-sidenav/message.component.ts | 51 ++++++++++++++++++- .../message-detail.dialog.component.html | 6 +-- .../src/assets/i18n/en.json | 10 ++-- .../src/assets/i18n/ko.json | 10 ++-- 5 files changed, 74 insertions(+), 28 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.html index 0f845061..7d1cece4 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.html @@ -48,7 +48,7 @@ > - {{ 'message.messageTypeReceiving' | translate }} + {{ 'message.type.messageTypeReceiving' | translate }} - {{ 'message.messageTypeOutgoing' | translate }} + {{ 'message.type.messageTypeOutgoing' | translate }} - {{ 'message.messageTypeReservation' | translate }} + {{ 'message.type.messageTypeReservation' | translate }} - {{ - 'message.messageTypeAll' | translate - }} - {{ - 'message.messageTypeReceiving' | translate - }} - {{ - 'message.messageTypeOutgoing' | translate - }} - {{ - 'message.messageTypeReservation' | translate - }} + + {{ messageType.displayName }} + , private formBuilder: FormBuilder, @@ -217,6 +224,15 @@ export class MessageBoxComponent if (!!this.tabs) { this.tabs.realignInkBar(); } + + this.setMessageTypeData(); + this.langChangeSubscription = merge( + this.translateService.onLangChange, + this.translateService.onDefaultLangChange, + this.translateService.onTranslationChange + ).subscribe(() => { + this.setMessageTypeData(); + }); } ngAfterViewChecked(): void { @@ -230,6 +246,9 @@ export class MessageBoxComponent if (!!this.messageDetailInfo) { this.messageDetailInfo.unsubscribe(); } + if (!!this.langChangeSubscription) { + this.langChangeSubscription.unsubscribe(); + } } onSelectedIndexTab(value: number) { @@ -347,4 +366,32 @@ export class MessageBoxComponent }) ); } + + private setMessageTypeData() { + const messageTypeData = this.translateService.instant('message.type'); + + const messageTypeList: MessageTypeData[] = []; + for (const key in messageTypeData) { + if (messageTypeData.hasOwnProperty(key)) { + let name = 'A'; + switch (key) { + case 'messageTypeAll': + name = MessageType.All; + break; + case 'messageTypeReceiving': + name = MessageType.Receive; + break; + case 'messageTypeOutgoing': + name = MessageType.Send; + break; + case 'messageTypeReservation': + name = MessageType.Reservation; + break; + } + messageTypeList.push({ displayName: messageTypeData[key], name }); + } + } + + this.messageTypeList = messageTypeList; + } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html index 10bc0467..65cb4915 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html @@ -3,13 +3,13 @@ {{ - 'message.messageTypeReceiving' | translate + 'message.type.messageTypeReceiving' | translate }} {{ - 'message.messageTypeOutgoing' | translate + 'message.type.messageTypeOutgoing' | translate }} {{ - 'message.messageTypeReservation' | translate + 'message.type.messageTypeReservation' | translate }} diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json index b360b41f..285e3293 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json @@ -293,10 +293,6 @@ "sendTo": "Send message", "sendReservation": "Send reservation", "placeholderForSearch": "search for name, title, content", - "messageTypeAll": "All", - "messageTypeReceiving": "Receiving", - "messageTypeOutgoing": "Outgoing", - "messageTypeReservation": "Reservation", "searchTypeName": "Name", "searchTypeTitle": "Title", "searchTypeContent": "Content", @@ -318,6 +314,12 @@ "andOthers": "and {{count}}others", "addReceiver": "Add Reciever", "countOfReceiver": "{{count}} total recipients", + "type": { + "messageTypeAll": "All", + "messageTypeReceiving": "Receiving", + "messageTypeOutgoing": "Outgoing", + "messageTypeReservation": "Reservation" + }, "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 0ac79cee..603e2d48 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json @@ -293,10 +293,6 @@ "sendTo": "쪽지 보내기", "sendReservation": "쪽지 예약 보내기", "placeholderForSearch": "이름, 제목, 내용 검색", - "messageTypeAll": "전체", - "messageTypeReceiving": "수신", - "messageTypeOutgoing": "발신", - "messageTypeReservation": "예약", "searchTypeName": "이름", "searchTypeTitle": "제목", "searchTypeContent": "내용", @@ -318,6 +314,12 @@ "andOthers": "외 {{count}}명", "addReceiver": "수신자 추가", "countOfReceiver": "총 수신자 {{count}}명", + "type": { + "messageTypeAll": "전체", + "messageTypeReceiving": "수신", + "messageTypeOutgoing": "발신", + "messageTypeReservation": "예약" + }, "results": { "successForSending": "쪽지를 전송하였습니다.", "successForReservation": "쪽지 전송을 예약 하였습니다.",