瀏覽代碼

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

j8
yanas 8 年之前
父節點
當前提交
c6b117565d
共有 3 個文件被更改,包括 9 次插入2 次删除
  1. 1
    0
      lang/main.json
  2. 7
    1
      modules/UI/recording/Recording.js
  3. 1
    1
      package.json

+ 1
- 0
lang/main.json 查看文件

@@ -387,6 +387,7 @@
387 387
         "failedToStart": "Live streaming failed to start",
388 388
         "buttonTooltip": "Start / Stop live stream",
389 389
         "streamIdRequired": "Please fill in the stream id in order to launch the live streaming.",
390
+        "streamIdHelp": "Where do I find this?",
390 391
         "error": "Live streaming failed. Please try again.",
391 392
         "busy": "All recorders are currently busy. Please try again later."
392 393
     }

+ 7
- 1
modules/UI/recording/Recording.js 查看文件

@@ -51,6 +51,9 @@ function _requestLiveStreamId() {
51 51
     const streamIdRequired
52 52
         = APP.translation.generateTranslationHTML(
53 53
             "liveStreaming.streamIdRequired");
54
+    const streamIdHelp
55
+        = APP.translation.generateTranslationHTML(
56
+            "liveStreaming.streamIdHelp");
54 57
 
55 58
     return new Promise(function (resolve, reject) {
56 59
         dialog = APP.UI.messageHandler.openDialogWithStates({
@@ -60,7 +63,10 @@ function _requestLiveStreamId() {
60 63
                     `<input  class="input-control"
61 64
                     name="streamId" type="text"
62 65
                     data-i18n="[placeholder]dialog.streamKey"
63
-                    autofocus>`,
66
+                    autofocus><div style="text-align: right">
67
+                    <a class="link" target="_new" 
68
+                    href="https://jitsi.org/live">`+streamIdHelp+
69
+                    `</a></div>`,
64 70
                 persistent: false,
65 71
                 buttons: [
66 72
                     {title: cancelButton, value: false},

+ 1
- 1
package.json 查看文件

@@ -66,7 +66,7 @@
66 66
     "eslint-plugin-jsdoc": "*",
67 67
     "eslint-plugin-react": "*",
68 68
     "eslint-plugin-react-native": "^2.2.1",
69
-    "expose-loader": "*",
69
+    "expose-loader": "0.7.1",
70 70
     "file-loader": "^0.10.0",
71 71
     "flow-bin": "^0.37.0",
72 72
     "haste-resolver-webpack-plugin": "^0.2.2",

Loading…
取消
儲存