Merge branch 'livestream_help_link' of https://github.com/jitsi/jitsi-meet into livestream_help_link

This commit is contained in:
yanas
2017-02-15 16:41:49 -06:00
3 changed files with 9 additions and 2 deletions
+1
View File
@@ -387,6 +387,7 @@
"failedToStart": "Live streaming failed to start",
"buttonTooltip": "Start / Stop live stream",
"streamIdRequired": "Please fill in the stream id in order to launch the live streaming.",
"streamIdHelp": "Where do I find this?",
"error": "Live streaming failed. Please try again.",
"busy": "All recorders are currently busy. Please try again later."
}
+7 -1
View File
@@ -51,6 +51,9 @@ function _requestLiveStreamId() {
const streamIdRequired
= APP.translation.generateTranslationHTML(
"liveStreaming.streamIdRequired");
const streamIdHelp
= APP.translation.generateTranslationHTML(
"liveStreaming.streamIdHelp");
return new Promise(function (resolve, reject) {
dialog = APP.UI.messageHandler.openDialogWithStates({
@@ -60,7 +63,10 @@ function _requestLiveStreamId() {
`<input class="input-control"
name="streamId" type="text"
data-i18n="[placeholder]dialog.streamKey"
autofocus>`,
autofocus><div style="text-align: right">
<a class="link" target="_new"
href="https://jitsi.org/live">`+streamIdHelp+
`</a></div>`,
persistent: false,
buttons: [
{title: cancelButton, value: false},
+1 -1
View File
@@ -66,7 +66,7 @@
"eslint-plugin-jsdoc": "*",
"eslint-plugin-react": "*",
"eslint-plugin-react-native": "^2.2.1",
"expose-loader": "*",
"expose-loader": "0.7.1",
"file-loader": "^0.10.0",
"flow-bin": "^0.37.0",
"haste-resolver-webpack-plugin": "^0.2.2",