Commit 31cdfeef by Kim Peace

Added l10n for join collaboration message

parent 4d823d3b
......@@ -53,6 +53,7 @@ $.lang.en = {
"groupChatRoom":"Group",
"myGroup":"My Group",
"allGroup":"All Group",
"message_join": "Join",
"message_ended" : "End",
"returnToRootGroup":"Return to Root Group",
"returnToParentGroup":"Return to Parent Group",
......
......@@ -53,6 +53,7 @@ $.lang.ja = {
"groupChatRoom":"グループ",
"myGroup":"マイグループ",
"allGroup":"全グループ",
"message_join": "参加する",
"message_ended" : "終了しました",
"returnToRootGroup":"トップグループに戻る",
"returnToParentGroup":"上位グループに戻る",
......
......@@ -53,6 +53,7 @@ $.lang.ko = {
"groupChatRoom":"그룹",
"myGroup":"내그룹",
"allGroup":"전그룹",
"message_join": "참가하기",
"message_ended" : "종료되었습니다.",
"returnToRootGroup":"최상위그룹으로 돌아가기",
"returnToParentGroup":"상위그룹으로 돌아가기",
......
......@@ -98,7 +98,6 @@ ChatRoom.loadMessages = function (joinRoomID, joinRoomName) {
let messages = NativeBridgeDataSource.getMessagesByRoomID(roomID);
ChatRoom.prependMessage(messages);
window.addEventListener(
"load",
function (event) {
......@@ -167,9 +166,9 @@ ChatRoom.prependMessage = function (messages) {
// 日付ラーベル表示
if (
messageCreatedTime != checkBeforeDate
&& checkBeforeDate != ""
&& !isToday
messageCreatedTime != checkBeforeDate &&
checkBeforeDate != "" &&
!isToday
) {
const html = ChatRoom.renderDateLabelMessage(beforeDate);
messageElement.append(html);
......@@ -255,6 +254,11 @@ ChatRoom.renderCollaborationMessage = function (message, isToday, isOtherYear) {
collaborationInfo.collaborationType
);
const collaborationJoinMessage =
message.messageType == MessageType.COMMUNICATIONEND
? getLocalizedString("message_ended")
: getLocalizedString("message_join");
const html = Mustache.render(collaborationMessageTemplate, {
messageId: message.messageId,
roomName: roomName,
......@@ -269,6 +273,7 @@ ChatRoom.renderCollaborationMessage = function (message, isToday, isOtherYear) {
createdAtYear: createdAtYear,
isOtherYear: isOtherYear,
isEnded: message.messageType == MessageType.COMMUNICATIONEND ? true : false,
collaborationJoinMessage: collaborationJoinMessage,
});
return message.message.includes("attachedImages") ||
message.message.includes("attachedVideos")
......
<!-- TODO: peacekim not using this file-->
<!-- 通話 -->
<div class="collabo_area_container chat_message" data-messageid="{{messageId}}">
<!-- 時刻 -->
......
......@@ -37,12 +37,7 @@
onclick="NativeBridgeDelegate.joinCollaboration('{{collaborationType}}', {{meetingId}})" {{#isEnded}}
disabled {{/isEnded}}>
<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>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment