Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
chat_webview
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abookCommunication
chat_webview
Commits
31cdfeef
Commit
31cdfeef
authored
Aug 02, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added l10n for join collaboration message
parent
4d823d3b
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
10 deletions
+14
-10
public_new/js/languages/language_en.js
+1
-0
public_new/js/languages/language_ja.js
+1
-0
public_new/js/languages/language_ko.js
+1
-0
public_new/js/views/chats/chat-room-message.js
+9
-4
public_new/template/template_close_collaboration_message.html
+1
-0
public_new/template/template_open_collaboration_message.html
+1
-6
No files found.
public_new/js/languages/language_en.js
View file @
31cdfeef
...
...
@@ -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"
,
...
...
public_new/js/languages/language_ja.js
View file @
31cdfeef
...
...
@@ -53,6 +53,7 @@ $.lang.ja = {
"groupChatRoom"
:
"グループ"
,
"myGroup"
:
"マイグループ"
,
"allGroup"
:
"全グループ"
,
"message_join"
:
"参加する"
,
"message_ended"
:
"終了しました"
,
"returnToRootGroup"
:
"トップグループに戻る"
,
"returnToParentGroup"
:
"上位グループに戻る"
,
...
...
public_new/js/languages/language_ko.js
View file @
31cdfeef
...
...
@@ -53,6 +53,7 @@ $.lang.ko = {
"groupChatRoom"
:
"그룹"
,
"myGroup"
:
"내그룹"
,
"allGroup"
:
"전그룹"
,
"message_join"
:
"참가하기"
,
"message_ended"
:
"종료되었습니다."
,
"returnToRootGroup"
:
"최상위그룹으로 돌아가기"
,
"returnToParentGroup"
:
"상위그룹으로 돌아가기"
,
...
...
public_new/js/views/chats/chat-room-message.js
View file @
31cdfeef
...
...
@@ -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"
)
...
...
public_new/template/template_close_collaboration_message.html
View file @
31cdfeef
<!-- TODO: peacekim not using this file-->
<!-- 通話 -->
<div
class=
"collabo_area_container chat_message"
data-messageid=
"{{messageId}}"
>
<!-- 時刻 -->
...
...
public_new/template/template_open_collaboration_message.html
View file @
31cdfeef
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment