From 023d75a476e06883930afde8ebbe5970e96d8ffe Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Tue, 4 Feb 2020 17:54:42 +0900
Subject: [PATCH] =?UTF-8?q?PC=20=EC=A4=91=EB=B3=B5=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EC=95=8C=EB=A6=BC=20=EB=A9=94=EC=8B=9C=EC=A7=80=20?=
 =?UTF-8?q?=EB=AC=B8=EA=B5=AC=20=EB=B3=80=EA=B2=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/app/pages/account/components/login.page.component.ts    | 2 +-
 projects/ucap-webmessenger-app/src/assets/i18n/en.json          | 2 +-
 projects/ucap-webmessenger-app/src/assets/i18n/ko.json          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts
index 127eb536..1f9d2f9c 100644
--- a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts
@@ -205,7 +205,7 @@ export class LoginPageComponent implements OnInit, OnDestroy {
             'accounts.results.doLogoutDuplicate',
             {
               ip: personLogout.ip,
-              mac: personLogout.mac
+              mac: personLogout.mac.replace(/:/g, '-')
             }
           );
 
diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json
index 285e3293..adf1f035 100644
--- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json
+++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json
@@ -22,7 +22,7 @@
     "results": {
       "changedPassword": "Password changed. Please log in again.",
       "doLogout": "You have been logged out.",
-      "doLogoutDuplicate": "You logged in from another device.<br/> * Ip : {{ip}}<br/> * Mac : {{mac}}",
+      "doLogoutDuplicate": "You are logged in with the same username elsewhere.<br/>Please check the contact information below.<br/><br/>[IP]: {{ip}}<br/>[MAC]: {{mac}}",
       "doLogoutByOthers": "Forced logout by user."
     },
     "errors": {
diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
index 603e2d48..6cafa9e7 100644
--- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
+++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
@@ -22,7 +22,7 @@
     "results": {
       "changedPassword": "비밀번호가 변경되었습니다. 다시 로그인하여 주십시오",
       "doLogout": "로그아웃 되었습니다.",
-      "doLogoutDuplicate": "다른 디바이스에서 로그인하였습니다.<br/> * Ip : {{ip}}<br/> * Mac : {{mac}}",
+      "doLogoutDuplicate": "다른 곳에서 같은 아이디로 로그인하였습니다.<br/>아래 상대방 접속 정보를 확인하세요.<br/><br/> [IP] : {{ip}}<br/>[MAC] : {{mac}}",
       "doLogoutByOthers": "사용자에 의해 강제로그아웃 하였습니다."
     },
     "errors": {