diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php index 44e4c0ea82..c9b71d8682 100644 --- a/calendar/inc/class.calendar_hooks.inc.php +++ b/calendar/inc/class.calendar_hooks.inc.php @@ -310,7 +310,7 @@ class calendar_hooks 'type' => 'checkbox', 'label' => 'Show birthdays as events', 'name' => 'birthdays_as_events', - 'help' => 'Show birthdays as all day non-blocking events instead of via mouseover of the date.', + 'help' => 'Show birthdays as all day non-blocking events as well as via mouseover of the date.', 'default'=> FALSE ), 'limit_all_day_lines' => array( diff --git a/calendar/js/et2_widget_daycol.js b/calendar/js/et2_widget_daycol.js index 600a2cd8ea..d7e2248326 100644 --- a/calendar/js/et2_widget_daycol.js +++ b/calendar/js/et2_widget_daycol.js @@ -444,7 +444,7 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte event.doLoadingFinished(); event._update(); } - else + if (!egwIsMobile()) { //If the birthdays are already displayed as event, don't //show them in the caption diff --git a/calendar/lang/egw_de.lang b/calendar/lang/egw_de.lang index 2add2cf769..0a8bf168de 100644 --- a/calendar/lang/egw_de.lang +++ b/calendar/lang/egw_de.lang @@ -476,6 +476,8 @@ show all status incl. rejected events calendar de Zeige alle Status einschl. abg show all status, but rejected calendar de Zeige alle Status außer abgesagte Termine show all status, but unknown calendar de Zeige alle Termine außer Einladungen show also events just owned by selected user calendar de Zeige zusätzlich Termine die dem ausgewählten Benutzer nur gehören +show birthdays as all day non-blocking events as well as via mouseover of the date. calendar de Zeige Geburtstage als ganztägiges nicht-blockierendes Ereignis an, statt per Tooltip auf dem Datum. +show birthdays as events calendar de Zeige Geburtstage als Termine an show birthdays from addressbook admin de Zeige Geburtstage vom Adressbuch show default view on main screen calendar de Kalenderansicht auf der Startseite anzeigen show empty rows in planner calendar de Zeige leere Zeilen im Planer diff --git a/calendar/lang/egw_en.lang b/calendar/lang/egw_en.lang index 8cba9f41c7..39842ce881 100644 --- a/calendar/lang/egw_en.lang +++ b/calendar/lang/egw_en.lang @@ -476,6 +476,8 @@ show all status incl. rejected events calendar en Show all status incl. rejected show all status, but rejected calendar en Show all status, but rejected show all status, but unknown calendar en Show all status, but unknown show also events just owned by selected user calendar en Show also events just owned by selected user +show birthdays as all day non-blocking events as well as via mouseover of the date. calendar en Show birthdays as all day non-blocking events as well as via mouseover of the date. +show birthdays as events calendar en Show birthdays as events show birthdays from addressbook admin en Show birthdays from address book show default view on main screen calendar en Show calendar on main screen show empty rows in planner calendar en Show empty rows in planner