holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing space and extra spaces in calendar's birthday tooltip

Browse Source
This commit is contained in:
Hadi Nategh 2018-12-10 14:20:11 +01:00
parent c3b518b7d5
commit b24d9f9cde
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Contacts.php
View File

@ -1815,9 +1815,8 @@ class Contacts extends Contacts\Storage
'day' => $d,
'month' => $m,
'occurence' => 0,
'name' => lang('Birthday').' '.($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']).' '.$pers['n_middle'].' '.
$pers['n_family'].
($GLOBALS['egw_info']['server']['hide_birthdays'] == 'age' ? ' '.($year - $y): '').
'name' => implode(' ', array_filter(array(lang('Birthday'),($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']), $pers['n_middle'],
$pers['n_family'], ($GLOBALS['egw_info']['server']['hide_birthdays'] == 'age' ? ($year - $y): '')))).
($y && in_array($GLOBALS['egw_info']['server']['hide_birthdays'], array('','age')) ? ' ('.$y.')' : ''),
'birthyear' => $y, // this can be used to identify birthdays from holidays
);

4
calendar/js/et2_widget_daycol.js
View File

@ -417,7 +417,7 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
var holidays = et2_calendar_view.get_holidays(this,this.options.date.substring(0,4));
var holiday_list = [];
var holiday_pref = (egw.preference('birthdays_as_events','calendar')||'').split(',');
// Show holidays as events on mobile or by preference
var holidays_as_events = egwIsMobile() || egw.preference('birthdays_as_events','calendar') === true ||
holiday_pref.indexOf('holiday') >= 0;
@ -508,7 +508,7 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
}
}
}
this.title.attr('title', holiday_list.join(','));
this.title.attr('title', holiday_list.join(', '));
},
/**