Fix osd deactiviation and naming

iszmais · Jul 4, 2024 · 673678c · 673678c
1 parent 3bf030b
commit 673678c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/Services/Notifications/README.md b/Services/Notifications/README.md
@@ -60,7 +60,7 @@ The use of the [Toast](../../src/GlobalScreen/Scope/Toast/README.md) is mandator
 
 ### General Settings
 
-#### On-Screen Notifications
+#### Toasts
 
 If enabled, users will be notified of certain events by pop-up notifications in the form of toasts.
 

diff --git a/...es/Provider/NotificationToastProvider.php → ...s/Provider/NotificationsToastProvider.php b/...es/Provider/NotificationToastProvider.php → ...s/Provider/NotificationsToastProvider.php
@@ -36,7 +36,7 @@
 /**
  * @author Ingmar Szmais <[email protected]>
  */
-class NotificationToastProvider extends AbstractToastProvider
+class NotificationsToastProvider extends AbstractToastProvider
 {
     /**
      * @inheritDoc
@@ -46,14 +46,6 @@ public function getToasts(): array
         $settings = new ilSetting('notifications');
         $toasts = [];
 
-        if (
-            $settings->get('enable_osd', '0') !== '1' ||
-            0 === $this->dic->user()->getId() ||
-            $this->dic->user()->isAnonymous()
-        ) {
-            return $toasts;
-        }
-
         $osd_repository = new ilNotificationOSDRepository($this->dic->database());
         $osd_notification_handler = new ilNotificationOSDHandler($osd_repository);
 

diff --git a/Services/Notifications/docu/images/settings_enable_osd_en.png b/Services/Notifications/docu/images/settings_enable_osd_en.png
diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
@@ -12285,7 +12285,7 @@ noti#:#noti_activate_notification#:#Benachrichtigung aktivieren
 noti#:#noti_deactivate_notification#:#Benachrichtigung deaktivieren
 noti#:#noti_notification_activated#:#Benachrichtigungen sind aktiviert
 noti#:#noti_notification_deactivated#:#Benachrichtigungen sind deaktiviert
-notifications_adm#:#enable_osd#:#Pop-up-Benachrichtigungen aktivieren
+notifications_adm#:#enable_osd#:#Pop-up Benachrichtigungen aktivieren
 notifications_adm#:#enable_osd_desc#:#Wenn aktiviert, werden Benutzer durch ein Pop-up über neue Benachrichtigungen informiert.
 notifications_adm#:#notification_settings#:#Benachrichtigungseinstellungen
 notifications_adm#:#osd_delay#:#Anzeigeverzögerung
@@ -12297,7 +12297,7 @@ notifications_adm#:#osd_interval#:#Abfrageintervall
 notifications_adm#:#osd_interval_desc#:#Abfrageintervall für Nachrichten in Millisekunden.Eine geringere Zeit ermöglicht zeitnähere Benachrichtigungen, erhöht aber die Serverlast.
 notifications_adm#:#osd_play_sound#:#Ton abspielen
 notifications_adm#:#osd_play_sound_desc#:#Ton abspielen bei Erhalt einer neuen Benachrichtigung.
-notifications_adm#:#osd_settings#:#Popup Benachrichtigungen
+notifications_adm#:#osd_settings#:#Pop-up Benachrichtigungen
 notifications_adm#:#osd_vanish#:#Anzeigedauer
 notifications_adm#:#osd_vanish_desc#:#Dauer der Anzeige von Benachrichtigungen in Millisekunden
 obj#:#cont_filter_empty#:#Bitte nutzen Sie den Filter zur Anzeige von Objekten.

diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
@@ -12285,8 +12285,8 @@ noti#:#noti_activate_notification#:#Activate Notification
 noti#:#noti_deactivate_notification#:#Deactivate Notification
 noti#:#noti_notification_activated#:#Notification Activated
 noti#:#noti_notification_deactivated#:#Notification Deactivated
-notifications_adm#:#enable_osd#:#Enable On-Screen Notifications
-notifications_adm#:#enable_osd_desc#:#If enabled, users are notified by a popup about new notifications.
+notifications_adm#:#enable_osd#:#Enable Toasts
+notifications_adm#:#enable_osd_desc#:#If enabled, users are notified by a pop-up about new notifications.
 notifications_adm#:#notification_settings#:#Notification Settings
 notifications_adm#:#osd_delay#:#Presentation Delay
 notifications_adm#:#osd_delay_desc#:#Delay of the visible presentation in milliseconds.
@@ -12297,7 +12297,7 @@ notifications_adm#:#osd_interval#:#Refreshinterval
 notifications_adm#:#osd_interval_desc#:#Polling interval for checking of new notifications in miliseconds. A lower number will notify the user more quickly but increases the number of requests the web server must handle.
 notifications_adm#:#osd_play_sound#:#Play a Sound
 notifications_adm#:#osd_play_sound_desc#:#Play a sound when receiving a new notficiation.
-notifications_adm#:#osd_settings#:#On-Screen Notifications
+notifications_adm#:#osd_settings#:#Toasts
 notifications_adm#:#osd_vanish#:#Presentation Time
 notifications_adm#:#osd_vanish_desc#:#Visible time of a notification on the screen in miliseconds.
 obj#:#cont_filter_empty#:#Please use the filter to see any objects.