Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] Broken video call accept dialog #9872

Merged
merged 1 commit into from
Mar 26, 2018
Merged

[FIX] Broken video call accept dialog #9872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,7 @@
"Display_offline_form": "Display Offline Form",
"Displays_action_text": "Displays action text",
"Do_not_display_unread_counter": "Do not display any counter of this channel",
"Do_you_want_to_accept": "Do you want to accept?",
"Do_you_want_to_change_to_s_question": "Do you want to change to <strong>%s</strong>?",
"Domain": "Domain",
"Domain_added": "domain Added",
Expand Down Expand Up @@ -2159,6 +2160,11 @@
"We_have_sent_registration_email": "We have sent you an email to confirm your registration. If you do not receive an email shortly, please come back and try again.",
"Webhook_URL": "Webhook URL",
"Webhooks": "Webhooks",
"WebRTC_direct_audio_call_from_%s": "Direct audio call from %s",
"WebRTC_direct_video_call_from_%s": "Direct video call from %s",
"WebRTC_group_audio_call_from_%s": "Group audio call from %s",
"WebRTC_group_video_call_from_%s": "Group video call from %s",
"WebRTC_monitor_call_from_%s": "Monitor call from %s",
"WebRTC_Enable_Channel": "Enable for Public Channels",
"WebRTC_Enable_Direct": "Enable for Direct Messages",
"WebRTC_Enable_Private": "Enable for Private Channels",
Expand Down Expand Up @@ -2216,4 +2222,4 @@
"your_message_optional": "your message (optional)",
"Your_password_is_wrong": "Your password is wrong!",
"Your_push_was_sent_to_s_devices": "Your push was sent to %s devices"
}
}
8 changes: 7 additions & 1 deletion packages/rocketchat-ui/client/views/app/modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
{{> Template.dynamic template=template data=data}}
{{else}}
<header class="rc-modal__header">
<h1 class="rc-modal__title">{{title}}</h1>
<h1 class="rc-modal__title">
{{#if html}}
{{{title}}}
{{else}}
{{title}}
{{/if}}
</h1>
<button class="contextual-bar__close js-close">
{{> icon classes="rc-modal__close" icon="plus"}}
</button>
Expand Down
16 changes: 8 additions & 8 deletions packages/rocketchat-webrtc/client/WebRTCClass.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,29 +722,29 @@ class WebRTCClass {
let title;
if (data.monitor === true) {
icon = 'eye';
title = `Monitor call from ${ fromUsername }`;
title = t('WebRTC_monitor_call_from_%s', fromUsername);
} else if (subscription && subscription.t === 'd') {
if (data.media && data.media.video) {
icon = 'videocam';
title = `Direct video call from ${ fromUsername }`;
title = t('WebRTC_direct_video_call_from_%s', fromUsername);
} else {
icon = 'phone';
title = `Direct audio call from ${ fromUsername }`;
title = t('WebRTC_direct_audio_call_from_%s', fromUsername);
}
} else if (data.media && data.media.video) {
icon = 'videocam';
title = `Group video call from ${ subscription.name }`;
title = t('WebRTC_group_video_call_from_%s', subscription.name);
} else {
icon = 'phone';
title = `Group audio call from ${ subscription.name }`;
title = t('WebRTC_group_audio_call_from_%s', subscription.name);
}
modal.open({
title: `<i class='icon-${ icon } alert-icon success-color'></i>${ title }`,
text: 'Do you want to accept?',
text: t('Do_you_want_to_accept'),
html: true,
showCancelButton: true,
confirmButtonText: 'Yes',
cancelButtonText: 'No'
confirmButtonText: t('Yes'),
cancelButtonText: t('No')
}, (isConfirm) => {
if (isConfirm) {
FlowRouter.goToRoomById(data.room);
Expand Down