From b9ed6bf6cfc172e5aa183bd18ef997ffe3d3aabf Mon Sep 17 00:00:00 2001 From: leejinho Date: Thu, 16 Jan 2020 18:07:03 +0900 Subject: [PATCH] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC=20158?= =?UTF-8?q?=20=EB=8C=80=ED=99=94=20=EC=83=81=EB=8C=80=20=EC=97=86=EC=9D=8C?= =?UTF-8?q?=20=ED=91=9C=EC=8B=9C=20=EC=97=86=EC=9D=8C=20159=20=EC=AA=BD?= =?UTF-8?q?=EC=A7=80=20=ED=8C=8C=EC=9D=BC=20=EB=8B=A4=EC=9A=B4=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EB=90=98=EC=A7=80=20=EC=95=8A=EC=9D=8C=20162=20PC?= =?UTF-8?q?=EC=9B=90=EA=B2=A9=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83?= =?UTF-8?q?=EC=8B=9C=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=EB=90=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/messages.component.html | 6 +-- .../components/messages.component.ts | 26 +++++++++- .../right-drawer/album-box.component.html | 1 + .../right-drawer/room-user-list.component.ts | 5 +- .../message-detail.dialog.component.ts | 4 +- .../components/login.page.component.ts | 47 ++++++++++++++----- .../src/app/services/notification.service.ts | 7 +++ .../src/app/types/logout-info.type.ts | 1 + .../src/assets/i18n/en.json | 11 ++++- .../src/assets/i18n/ko.json | 11 ++++- .../src/lib/protocols/logout-remote.ts | 10 ++-- .../lib/components/list-item.component.html | 5 +- .../src/lib/components/list-item.component.ts | 27 +++++++++-- 13 files changed, 125 insertions(+), 36 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html index bb3d6cfb..4a301e5e 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html @@ -77,7 +77,7 @@ {{ roomInfo.roomName }} - {{ _roomUserInfos | ucapTranslate: 'name':',' }} + {{ getRoomNameByRoomUser(_roomUserInfos) }} @@ -319,9 +319,7 @@ #messageContextMenuTrigger="matMenuTrigger" [matMenuTriggerFor]="messageContextMenu" > - +