Merge branch 'development' into production

dsv-su · Jun 26, 2024 · 5db708d · 5db708d
2 parents e2943c3 + ce4112a
commit 5db708d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/app/Http/Controllers/MultiplayerController.php b/app/Http/Controllers/MultiplayerController.php
@@ -106,9 +106,10 @@ public function presentation($id)
             $buildsource[$stream->name] = $build;
 
         }
-        $presentation['sources'] = \Illuminate\Support\Collection::make($buildsource);
-
-
+        //If videostreams exist
+        if($buildsource) {
+            $presentation['sources'] = \Illuminate\Support\Collection::make($buildsource);
+        }
 
         //Add subtitles
         if(json_decode($video->subtitles)) {

diff --git a/resources/lang/swe.json b/resources/lang/swe.json
@@ -420,6 +420,6 @@
     "Specify the generated language": "Ange det genererade språket",
     "Choose a language": "Välj ett språk",
     "Caution: This is not intended for language translation! Please be advised that this feature is not designed for accurate language translation.": "Varning: Det är inte avsett för språköversättning! Observera att den här funktionen inte är utformad för korrekt språköversättning.",
-    "We apologize for any inconvenience, but our system will undergo maintenance for the next 30 minutes starting at 11:00 AM today. Thank you for your patience.": "Vi ber om ursäkt för eventuella besvär, men vårt system kommer att genomgå underhåll under de kommande 30 minuterna med start klockan 11:00 idag. Tack för ditt tålamod."
+    "Operational disruption: We are currently experiencing technical issues with subtitle generation. Troubleshooting is in progress.": "Driftsstörning: Vi har för närvarande tekniska problem med undertextgenerering. Felsökning pågår."
 
 }
diff --git a/resources/views/layouts/partials/header.blade.php b/resources/views/layouts/partials/header.blade.php
@@ -494,11 +494,11 @@ class="fas fa-file-download fa-icon fa-fw mr-2"></i>Retrive
     </div>
 </header>
 <!-- Display the message banner exclusively for staff members. -->
-{{--}}
+
 @if(app()->make('play_role') == 'Administrator' or app()->make('play_role') == 'Courseadmin' or app()->make('play_role') == 'Uploader' or app()->make('play_role') == 'Staff')
 
     @include('layouts.partials.message_banner')
 
 @endif
-{{--}}
+
 
diff --git a/resources/views/layouts/partials/message_banner.blade.php b/resources/views/layouts/partials/message_banner.blade.php
@@ -21,7 +21,7 @@
                     {{--}}
                     {{__("Operational disruption: We have temporarily turned off the ability to generate subtitles.")}}
                     {{--}}
-                    {{__("We apologize for any inconvenience, but our system will undergo maintenance for the next 30 minutes starting at 11:00 AM today. Thank you for your patience.")}}
+                    {{__("Operational disruption: We are currently experiencing technical issues with subtitle generation. Troubleshooting is in progress.")}}
 
                 </div>
                 {{--}}
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ @@
                         {{--}}
                         {{__("Operational disruption: We have temporarily turned off the ability to generate subtitles.")}}
                         {{--}}
-                        {{__("We apologize for any inconvenience, but our system will undergo maintenance for the next 30 minutes starting at 11:00 AM today. Thank you for your patience.")}}
+                        {{__("Operational disruption: We are currently experiencing technical issues with subtitle generation. Troubleshooting is in progress.")}}
                     </div>
                     {{--}}
@@ Expand Down @@