TT#44287 Conferencing: Replace hard coded strings

Change-Id: I02085ada23462763db5f0b0b070c986f7fe9431c
changes/84/29984/1
Hans-Peter Herzog 7 years ago
parent 1b070aaa8a
commit fd9d72d116

@ -17,7 +17,7 @@
flat flat
@click="confirm" @click="confirm"
> >
{{ $t('buttons.exit') }} {{ $t('buttons.confirm') }}
</q-btn> </q-btn>
</csc-dialog> </csc-dialog>
</template> </template>

@ -87,7 +87,8 @@
<csc-confirm-dialog <csc-confirm-dialog
ref="confirmDialog" ref="confirmDialog"
title-icon="exit_to_app" title-icon="exit_to_app"
title="Exit conference" :title="$t('conferencing.exitDialogTitle')"
:message="$t('conferencing.exitDialogText')"
@confirm="leave" @confirm="leave"
/> />
</q-layout> </q-layout>

@ -15,7 +15,7 @@
id="csc-conf-link-input" id="csc-conf-link-input"
dark dark
:value="conferenceIdInput" :value="conferenceIdInput"
placeholder="Conference name" :placeholder="$t('conferencing.idPlaceholder')"
align="left" align="left"
@change="conferenceIdChanged" @change="conferenceIdChanged"
:disable="isJoining" :disable="isJoining"
@ -26,7 +26,7 @@
flat flat
icon="link" icon="link"
@click="showShareDialog" @click="showShareDialog"
>Share</q-btn> >{{ $t('conferencing.shareButtonLabel') }}</q-btn>
</q-input> </q-input>
<q-btn <q-btn
class="csc-button" class="csc-button"

@ -1,7 +1,7 @@
<template> <template>
<csc-dialog <csc-dialog
ref="dialogComp" ref="dialogComp"
:title="'Share conference'" :title="$t('conferencing.shareDialogTitle')"
:titleIcon="'link'" :titleIcon="'link'"
> >
<div <div
@ -22,7 +22,7 @@
icon="link" icon="link"
@click="copy" @click="copy"
> >
Copy link {{ $t('conferencing.copyLinkButtonLabel') }}
</q-btn> </q-btn>
</csc-dialog> </csc-dialog>
</template> </template>

@ -539,6 +539,13 @@
"busy": "busy" "busy": "busy"
}, },
"conferencing": { "conferencing": {
"joinText": "Join conference with name" "joinText": "Join conference with name",
"idPlaceholder": "Conference name",
"shareButtonLabel": "Share",
"shareDialogTitle": "Share conference",
"copyLinkButtonLabel": "Copy link",
"exitDialogTitle": "Leave conference",
"exitDialogText": "Leave current conference now!",
"leaveButtonLabel": "Leave"
} }
} }

@ -189,6 +189,9 @@ export default {
let localMediaStream; let localMediaStream;
media.build().then(($localMediaStream)=>{ media.build().then(($localMediaStream)=>{
localMediaStream = $localMediaStream; localMediaStream = $localMediaStream;
localMediaStream.onVideoEnded(()=>{
context.dispatch('createLocalMedia', MediaTypes.mic);
});
Vue.$conference.setLocalMediaStream(localMediaStream); Vue.$conference.setLocalMediaStream(localMediaStream);
switch(type) { switch(type) {
default: default:
@ -229,7 +232,9 @@ export default {
}).then(()=>{ }).then(()=>{
context.commit('localMediaSucceeded', localMediaStream); context.commit('localMediaSucceeded', localMediaStream);
}).catch((err)=>{ }).catch((err)=>{
context.commit('localMediaFailed', err.message); if(!context.getters.hasLocalMediaStream) {
context.commit('localMediaFailed', err.message);
}
}); });
}, },
enableMicrophone(context) { enableMicrophone(context) {

Loading…
Cancel
Save