Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better distinction of 'current' and 'future' itip messages in UI and message text

Browse source
This commit is contained in:
Thomas Bruederli 2015-02-15 18:39:28 +01:00
parent 108fae9dd0
commit dbdce67e1e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/libcalendaring/lib/libcalendaring_itip.php
View file

@ -125,7 +125,7 @@ class libcalendaring_itip
$recurrence_info = ''; $recurrence_info = '';
if (!empty($event['recurrence_id'])) { if (!empty($event['recurrence_id'])) {
$recurrence_info = "\n\n** " . $this->gettext('itip'.strtolower($method).'occurrenceonly') . ' **'; $recurrence_info = "\n\n** " . $this->gettext($event['thisandfuture'] ? 'itipmessagefutureoccurrence' : 'itipmessagesingleoccurrence') . ' **';
} }
else if (!empty($event['recurrence'])) { else if (!empty($event['recurrence'])) {
$recurrence_info = sprintf("\n%s: %s", $this->gettext('recurring'), $this->lib->recurrence_text($event['recurrence'])); $recurrence_info = sprintf("\n%s: %s", $this->gettext('recurring'), $this->lib->recurrence_text($event['recurrence']));
@ -742,7 +742,7 @@ class libcalendaring_itip
} }
if (!empty($event['recurrence_date'])) { if (!empty($event['recurrence_date'])) {
$table->add('label', ''); $table->add('label', '');
$table->add('recurrence-id', $this->gettext('itipsingleoccurrence')); $table->add('recurrence-id', $this->gettext($event['thisandfuture'] ? 'itipfutureoccurrence' : 'itipsingleoccurrence'));
} }
else if (!empty($event['recurrence'])) { else if (!empty($event['recurrence'])) {
$table->add('label', $this->gettext('recurring')); $table->add('label', $this->gettext('recurring'));

6
plugins/libcalendaring/localization/en_US.inc
View file

@ -111,9 +111,9 @@ $labels['declineattendeeconfirm'] = 'Enter a message to the declined participant
$labels['rsvprecurringevent'] = 'This is a series of events! Does your response apply to all, this occurrence only or this and future occurrences?'; $labels['rsvprecurringevent'] = 'This is a series of events! Does your response apply to all, this occurrence only or this and future occurrences?';
$labels['itipsingleoccurrence'] = 'This is a <em>single occurrence</em> out of a series of events'; $labels['itipsingleoccurrence'] = 'This is a <em>single occurrence</em> out of a series of events';
$labels['itiprequestoccurrenceonly'] = 'The invitation only refers to this single occurrence'; $labels['itipfutureoccurrence'] = 'Refers to <em>this and all future occurrences</em> of a series of events';
$labels['itipreplyoccurrenceonly'] = 'The response only refers to this single occurrence'; $labels['itipmessagesingleoccurrence'] = 'The message only refers to this single occurrence';
$labels['itipcanceloccurrenceonly'] = 'The cancellation only refers to this single occurrence'; $labels['itipmessagefutureoccurrence'] = 'The message refers to this and all future occurrences';
$labels['youhaveaccepted'] = 'You have accepted this invitation'; $labels['youhaveaccepted'] = 'You have accepted this invitation';
$labels['youhavetentative'] = 'You have tentatively accepted this invitation'; $labels['youhavetentative'] = 'You have tentatively accepted this invitation';