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

Fix delegatedto/delegatedfrom labels (Bifrost#T20377)

Browse source
This commit is contained in:
Aleksander Machniak 2016-12-28 08:16:33 +01:00
parent 8edb261a0b
commit bfa8ff2a67
9 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/calendar/calendar_ui.js
View file

@ -1946,9 +1946,9 @@ function rcube_calendar_ui(settings)
+ (!data.noreply && settings.itip_notify & 1 ? 'checked="checked" ' : '') + '/>';
if (data['delegated-to'])
tooltip = rcmail.gettext('delegatedto', 'calendar') + data['delegated-to'];
tooltip = rcmail.gettext('libcalendaring.delegatedto') + ' ' + data['delegated-to'];
else if (data['delegated-from'])
tooltip = rcmail.gettext('delegatedfrom', 'calendar') + data['delegated-from'];
tooltip = rcmail.gettext('libcalendaring.delegatedfrom') + ' ' + data['delegated-from'];
else if (status)
tooltip = status_label;

2
plugins/calendar/localization/en_US.inc
View file

@ -164,8 +164,6 @@ $labels['availbusy'] = 'Busy';
$labels['availunknown'] = 'Unknown';
$labels['availtentative'] = 'Tentative';
$labels['availoutofoffice'] = 'Out of Office';
$labels['delegatedto'] = 'Delegated to: ';
$labels['delegatedfrom'] = 'Delegated from: ';
$labels['scheduletime'] = 'Find availability';
$labels['sendinvitations'] = 'Send invitations';
$labels['sendnotifications'] = 'Notify participants about modifications';

4
plugins/libcalendaring/libcalendaring.js
View file

@ -1026,9 +1026,9 @@ rcube_libcalendaring.attendee_html = function(data)
}
if (data['delegated-to'])
tooltip = rcmail.gettext('delegatedto', context) + data['delegated-to'];
tooltip = rcmail.gettext('delegatedto', context) + ' ' + data['delegated-to'];
else if (data['delegated-from'])
tooltip = rcmail.gettext('delegatedfrom', context) + data['delegated-from'];
tooltip = rcmail.gettext('delegatedfrom', context) + ' ' + data['delegated-from'];
return $('<span>').append(
$('<span>').attr({'class': 'attendee ' + status, title: tooltip}).append(name.text(dispname))

13
plugins/libcalendaring/libcalendaring.php
View file

@ -131,12 +131,13 @@ class libcalendaring extends rcube_plugin
$this->include_script('libcalendaring.js');
$this->include_stylesheet($this->local_skin_path() . '/libcal.css');
$this->rc->output->add_label(
'libcalendaring.itipaccepted', 'libcalendaring.itiptentative', 'libcalendaring.itipdeclined',
'libcalendaring.itipdelegated', 'libcalendaring.expandattendeegroup', 'libcalendaring.expandattendeegroupnodata',
'libcalendaring.statusorganizer', 'libcalendaring.statusaccepted', 'libcalendaring.statusdeclined',
'libcalendaring.statusdelegated', 'libcalendaring.statusunknown', 'libcalendaring.statusneeds-action',
'libcalendaring.statustentative', 'libcalendaring.statuscompleted', 'libcalendaring.statusin-process'
$this->add_label(
'itipaccepted', 'itiptentative', 'itipdeclined',
'itipdelegated', 'expandattendeegroup', 'expandattendeegroupnodata',
'statusorganizer', 'statusaccepted', 'statusdeclined',
'statusdelegated', 'statusunknown', 'statusneeds-action',
'statustentative', 'statuscompleted', 'statusin-process',
'delegatedto', 'delegatedfrom'
);
}

2
plugins/libcalendaring/localization/de_CH.inc
View file

@ -85,6 +85,8 @@ $labels['statusneeds-action'] = 'Braucht Aktion';
$labels['statusunknown'] = 'Unbekannt';
$labels['statuscompleted'] = 'Abgeschlossen';
$labels['statusin-process'] = 'In Bearbeitung';
$labels['delegatedto'] = 'Delegiert an:';
$labels['delegatedfrom'] = 'Delegiert von:';
$labels['itipinvitation'] = 'Einladung zu';
$labels['itipupdate'] = 'Aktialisiert:';
$labels['itipcancellation'] = 'Abgesagt:';

2
plugins/libcalendaring/localization/de_DE.inc
View file

@ -84,6 +84,8 @@ $labels['statusdelegated'] = 'Delegiert';
$labels['statusneeds-action'] = 'Braucht Aktion';
$labels['statusunknown'] = 'Unbekannt';
$labels['statuscompleted'] = 'Abgeschlossen';
$labels['delegatedto'] = 'Delegiert an:';
$labels['delegatedfrom'] = 'Delegiert von:';
$labels['statusin-process'] = 'In Bearbeitung';
$labels['itipinvitation'] = 'Einladung zu';
$labels['itipupdate'] = 'Aktialisiert:';

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

@ -97,6 +97,8 @@ $labels['statusneeds-action'] = 'Needs action';
$labels['statusunknown'] = 'Unknown';
$labels['statuscompleted'] = 'Completed';
$labels['statusin-process'] = 'In process';
$labels['delegatedto'] = 'Delegated to: ';
$labels['delegatedfrom'] = 'Delegated from: ';
// itip related labels
$labels['itipinvitation'] = 'Invitation to';

2
plugins/tasklist/localization/en_US.inc
View file

@ -197,8 +197,6 @@ $labels['removefromcalendar'] = 'Remove from my tasks';
$labels['delegateinvitation'] = 'Delegate assignment';
$labels['andnmore'] = '$nr more...';
$labels['delegatedto'] = 'Delegated to: ';
$labels['delegatedfrom'] = 'Delegated from: ';
$labels['savetotasklist'] = 'Save to tasks';
$labels['comment'] = 'Comment';
$labels['errorimportingtask'] = 'Failed to import task(s)';

4
plugins/tasklist/tasklist.js
View file

@ -1890,9 +1890,9 @@ function rcube_tasklist_ui(settings)
+ (!data.noreply && settings.itip_notify & 1 ? 'checked="checked" ' : '') + '/>';
if (data['delegated-to'])
tooltip = rcmail.gettext('delegatedto', 'tasklist') + data['delegated-to'];
tooltip = rcmail.gettext('libcalendaring.delegatedto') + ' ' + data['delegated-to'];
else if (data['delegated-from'])
tooltip = rcmail.gettext('delegatedfrom', 'tasklist') + data['delegated-from'];
tooltip = rcmail.gettext('libcalendaring.delegatedfrom') + ' ' + data['delegated-from'];
else if (status)
tooltip = status_label;