aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorMoritz Strohm <strohm@data-quest.de>2024-03-25 08:49:01 +0000
committerJan-Hendrik Willms <tleilax+studip@gmail.com>2024-03-25 08:49:01 +0000
commitdaf2bba059fd373c7a20f982faf65c4572a8c326 (patch)
tree092b96d9f7ddd449709ac56a2bc2a37a366eab7c /locale
parent8b18b2d101f4f514e55ba100112f62eb8ac514df (diff)
CalendarDateAssignment::cbSendDateDeletedMail: name the user that deleted the date instead of the editor, fixes #3884
Closes #3884 Merge request studip/studip!2735
Diffstat (limited to 'locale')
-rw-r--r--locale/de/LC_MAILS/_date_information.php2
-rw-r--r--locale/de/LC_MAILS/date_deleted.php2
-rw-r--r--locale/en/LC_MAILS/_date_information.php4
-rw-r--r--locale/en/LC_MAILS/date_deleted.php2
4 files changed, 7 insertions, 3 deletions
diff --git a/locale/de/LC_MAILS/_date_information.php b/locale/de/LC_MAILS/_date_information.php
index 5eab14d..ac8e981 100644
--- a/locale/de/LC_MAILS/_date_information.php
+++ b/locale/de/LC_MAILS/_date_information.php
@@ -23,6 +23,6 @@
<? endforeach ?>
<? endif ?>
-<? if ($receiver_date_assignment) : ?>
+<? if (!empty($receiver_date_assignment)) : ?>
**Ihre Teilnahme:** <?= $receiver_date_assignment->getParticipationAsString() ?>
<? endif ?>
diff --git a/locale/de/LC_MAILS/date_deleted.php b/locale/de/LC_MAILS/date_deleted.php
index 0ff6ef8..0f319d3 100644
--- a/locale/de/LC_MAILS/date_deleted.php
+++ b/locale/de/LC_MAILS/date_deleted.php
@@ -1,4 +1,4 @@
-<?= $date->editor->getFullName() ?> hat einen Termin im Kalender gelöscht.
+<?= $actor->getFullName() ?> hat einen Termin im Kalender gelöscht.
<?= $this->render_partial(__DIR__ . '/_date_information', [
'date' => $date,
diff --git a/locale/en/LC_MAILS/_date_information.php b/locale/en/LC_MAILS/_date_information.php
index a0cb470..0619261 100644
--- a/locale/en/LC_MAILS/_date_information.php
+++ b/locale/en/LC_MAILS/_date_information.php
@@ -22,3 +22,7 @@
- <?= $participant_string ?>
<? endforeach ?>
<? endif ?>
+
+<? if (!empty($receiver_date_assignment)) : ?>
+**Your participation:** <?= $receiver_date_assignment->getParticipationAsString() ?>
+<? endif ?>
diff --git a/locale/en/LC_MAILS/date_deleted.php b/locale/en/LC_MAILS/date_deleted.php
index b4bafd6..91ef248 100644
--- a/locale/en/LC_MAILS/date_deleted.php
+++ b/locale/en/LC_MAILS/date_deleted.php
@@ -1,4 +1,4 @@
-<?= $date->editor->getFullName() ?> has deleted a date in the calendar.
+<?= $actor->getFullName() ?> has deleted a date in the calendar.
<?= $this->render_partial(__DIR__ . '/_date_information', [
'date' => $date,