Added l10n for join collaboration message

public_new/js/languages/language_en.js

@@ -53,6 +53,7 @@ $.lang.en = {
     "groupChatRoom":"Group",
     "groupChatRoom":"Group",
     "myGroup":"My Group",
     "myGroup":"My Group",
     "allGroup":"All Group",
     "allGroup":"All Group",
+    "message_join": "Join",
     "message_ended" : "End",
     "message_ended" : "End",
     "returnToRootGroup":"Return to Root Group",
     "returnToRootGroup":"Return to Root Group",
     "returnToParentGroup":"Return to Parent Group",
     "returnToParentGroup":"Return to Parent Group",

public_new/js/languages/language_ja.js

@@ -53,6 +53,7 @@ $.lang.ja = {
     "groupChatRoom":"グループ",
     "groupChatRoom":"グループ",
     "myGroup":"マイグループ",
     "myGroup":"マイグループ",
     "allGroup":"全グループ",
     "allGroup":"全グループ",
+    "message_join": "参加する",
     "message_ended" : "終了しました",
     "message_ended" : "終了しました",
     "returnToRootGroup":"トップグループに戻る",
     "returnToRootGroup":"トップグループに戻る",
     "returnToParentGroup":"上位グループに戻る",
     "returnToParentGroup":"上位グループに戻る",

public_new/js/languages/language_ko.js

@@ -53,6 +53,7 @@ $.lang.ko = {
     "groupChatRoom":"그룹",
     "groupChatRoom":"그룹",
     "myGroup":"내그룹",
     "myGroup":"내그룹",
     "allGroup":"전그룹",
     "allGroup":"전그룹",
+    "message_join": "참가하기",
     "message_ended" : "종료되었습니다.",
     "message_ended" : "종료되었습니다.",
     "returnToRootGroup":"최상위그룹으로 돌아가기",
     "returnToRootGroup":"최상위그룹으로 돌아가기",
     "returnToParentGroup":"상위그룹으로 돌아가기",
     "returnToParentGroup":"상위그룹으로 돌아가기",

public_new/js/views/chats/chat-room-message.js

@@ -98,7 +98,6 @@ ChatRoom.loadMessages = function (joinRoomID, joinRoomName) {
   let messages = NativeBridgeDataSource.getMessagesByRoomID(roomID);
   let messages = NativeBridgeDataSource.getMessagesByRoomID(roomID);
   ChatRoom.prependMessage(messages);
   ChatRoom.prependMessage(messages);
 
 
-
   window.addEventListener(
   window.addEventListener(
     "load",
     "load",
     function (event) {
     function (event) {
@@ -167,9 +166,9 @@ ChatRoom.prependMessage = function (messages) {
 
 
     // 日付ラーベル表示
     // 日付ラーベル表示
     if (
     if (
-      messageCreatedTime != checkBeforeDate 
-      && checkBeforeDate != "" 
-      && !isToday
+      messageCreatedTime != checkBeforeDate &&
+      checkBeforeDate != "" &&
+      !isToday
     ) {
     ) {
       const html = ChatRoom.renderDateLabelMessage(beforeDate);
       const html = ChatRoom.renderDateLabelMessage(beforeDate);
       messageElement.append(html);
       messageElement.append(html);
@@ -255,6 +254,11 @@ ChatRoom.renderCollaborationMessage = function (message, isToday, isOtherYear) {
     collaborationInfo.collaborationType
     collaborationInfo.collaborationType
   );
   );
 
 
+  const collaborationJoinMessage =
+    message.messageType == MessageType.COMMUNICATIONEND
+      ? getLocalizedString("message_ended")
+      : getLocalizedString("message_join");
+
   const html = Mustache.render(collaborationMessageTemplate, {
   const html = Mustache.render(collaborationMessageTemplate, {
     messageId: message.messageId,
     messageId: message.messageId,
     roomName: roomName,
     roomName: roomName,
@@ -269,6 +273,7 @@ ChatRoom.renderCollaborationMessage = function (message, isToday, isOtherYear) {
     createdAtYear: createdAtYear,
     createdAtYear: createdAtYear,
     isOtherYear: isOtherYear,
     isOtherYear: isOtherYear,
     isEnded: message.messageType == MessageType.COMMUNICATIONEND ? true : false,
     isEnded: message.messageType == MessageType.COMMUNICATIONEND ? true : false,
+    collaborationJoinMessage: collaborationJoinMessage,
   });
   });
   return message.message.includes("attachedImages") ||
   return message.message.includes("attachedImages") ||
     message.message.includes("attachedVideos")
     message.message.includes("attachedVideos")

public_new/template/template_close_collaboration_message.html

+<!-- TODO: peacekim not using this file-->
 <!-- 通話 -->
 <!-- 通話 -->
 <div class="collabo_area_container chat_message" data-messageid="{{messageId}}">
 <div class="collabo_area_container chat_message" data-messageid="{{messageId}}">
   <!-- 時刻 -->
   <!-- 時刻 -->

public_new/template/template_open_collaboration_message.html

@@ -37,12 +37,7 @@
             onclick="NativeBridgeDelegate.joinCollaboration('{{collaborationType}}', {{meetingId}})" {{#isEnded}}
             onclick="NativeBridgeDelegate.joinCollaboration('{{collaborationType}}', {{meetingId}})" {{#isEnded}}
             disabled {{/isEnded}}>
             disabled {{/isEnded}}>
             <img src="icon/icon_profile_phone_white.svg" alt="通話">
             <img src="icon/icon_profile_phone_white.svg" alt="通話">
-            {{#isEnded}}
-            <span class="collaboration_join_message">終了しました</span>
-            {{/isEnded}}
-            {{^isEnded}}
-            <span class="collaboration_join_message">参加する</span>
-            {{/isEnded}}
+            <span class="collaboration_join_message">{{collaborationJoinMessage}}</span>
           </button>
           </button>
         </div>
         </div>
       </div>
       </div>