Quellcode durchsuchen

fix(recorder): "already started" notification

master
Hristo Terezov vor 3 Jahren
Ursprung
Commit
bcb0fe919c
3 geänderte Dateien mit 19 neuen und 4 gelöschten Zeilen
  1. 2
    0
      lang/main.json
  2. 12
    1
      react/features/recording/actions.any.js
  3. 5
    3
      react/features/recording/middleware.js

+ 2
- 0
lang/main.json Datei anzeigen

@@ -501,6 +501,7 @@
501 501
         "expandedPending": "The live streaming is being started...",
502 502
         "failedToStart": "Live Streaming failed to start",
503 503
         "getStreamKeyManually": "We weren’t able to fetch any live streams. Try getting your live stream key from YouTube.",
504
+        "inProgress": "Recording or live streaming in progress",
504 505
         "invalidStreamKey": "Live stream key may be incorrect.",
505 506
         "off": "Live Streaming stopped",
506 507
         "offBy": "{{name}} stopped the live streaming",
@@ -761,6 +762,7 @@
761 762
         "expandedPending": "Recording is being started...",
762 763
         "failedToStart": "Recording failed to start",
763 764
         "fileSharingdescription": "Share recording with meeting participants",
765
+        "inProgress": "Recording or live streaming in progress",
764 766
         "linkGenerated": "We have generated a link to your recording.",
765 767
         "live": "LIVE",
766 768
         "loggedIn": "Logged in as {{userName}}",

+ 12
- 1
react/features/recording/actions.any.js Datei anzeigen

@@ -9,7 +9,8 @@ import {
9 9
     NOTIFICATION_TIMEOUT,
10 10
     hideNotification,
11 11
     showErrorNotification,
12
-    showNotification
12
+    showNotification,
13
+    showWarningNotification
13 14
 } from '../notifications';
14 15
 
15 16
 import {
@@ -115,6 +116,16 @@ export function showRecordingError(props: Object) {
115 116
     return showErrorNotification(props);
116 117
 }
117 118
 
119
+/**
120
+ * Signals that the recording warning notification should be shown.
121
+ *
122
+ * @param {Object} props - The Props needed to render the notification.
123
+ * @returns {showWarningNotification}
124
+ */
125
+export function showRecordingWarning(props: Object) {
126
+    return showWarningNotification(props);
127
+}
128
+
118 129
 /**
119 130
  * Signals that the stopped recording notification should be shown on the
120 131
  * screen for a given period.

+ 5
- 3
react/features/recording/middleware.js Datei anzeigen

@@ -27,6 +27,7 @@ import {
27 27
     showPendingRecordingNotification,
28 28
     showRecordingError,
29 29
     showRecordingLimitNotification,
30
+    showRecordingWarning,
30 31
     showStartedRecordingNotification,
31 32
     showStoppedRecordingNotification,
32 33
     updateRecordingSessionData
@@ -262,10 +263,11 @@ function _showRecordingErrorNotification(recorderSession, dispatch) {
262 263
         }));
263 264
         break;
264 265
     case JitsiMeetJS.constants.recording.error.UNEXPECTED_REQUEST:
265
-        dispatch(showRecordingError({
266
-            titleKey: isStreamMode
266
+        dispatch(showRecordingWarning({
267
+            descriptionKey: isStreamMode
267 268
                 ? 'liveStreaming.sessionAlreadyActive'
268
-                : 'recording.sessionAlreadyActive'
269
+                : 'recording.sessionAlreadyActive',
270
+            titleKey: isStreamMode ? 'liveStreaming.inProgress' : 'recording.inProgress'
269 271
         }));
270 272
         break;
271 273
     default:

Laden…
Abbrechen
Speichern