From 1fe784ad3c9395d326f3862ad3440b91247fbe8f Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 7 Jan 2019 09:23:40 -0700 Subject: [PATCH] Calendar - Move quick add preference to configuration tab - Fix wrong preference name in add dialog checkbox - Translations from Birgit --- calendar/inc/class.calendar_hooks.inc.php | 16 ++++++++-------- calendar/lang/egw_de.lang | 5 +++++ calendar/lang/egw_en.lang | 5 +++++ calendar/templates/default/add.xet | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php index 9fe66670e3..52dd823510 100644 --- a/calendar/inc/class.calendar_hooks.inc.php +++ b/calendar/inc/class.calendar_hooks.inc.php @@ -245,14 +245,6 @@ class calendar_hooks 'admin' => False, 'default'=> '1', // 1 = week ),*/ - 'new_event_dialog' => array( - 'type' => 'select', - 'label' => 'New event dialog', - 'name' => 'new_event_dialog', - 'values'=> array('add' => lang('Quick add'), 'edit' => lang('Regular edit')), - 'help' => 'Use quick add or full edit dialog when creating a new event', - 'default' => 'add', - ), 'multiple_weeks' => array( 'type' => 'select', 'label' => 'Weeks in multiple week view', @@ -449,6 +441,14 @@ class calendar_hooks 'xmlrpc' => False, 'admin' => False ), + 'new_event_dialog' => array( + 'type' => 'select', + 'label' => 'Add appointments via shortened dialog or complete edit window', + 'name' => 'new_event_dialog', + 'values'=> array('add' => lang('Quick add'), 'edit' => lang('Regular edit')), + 'help' => 'Use quick add or full edit dialog when creating a new event', + 'default' => 'add', + ), 'limit_des_lines' => array( 'type' => 'input', 'size' => 5, diff --git a/calendar/lang/egw_de.lang b/calendar/lang/egw_de.lang index 2c9746722e..6aada11480 100644 --- a/calendar/lang/egw_de.lang +++ b/calendar/lang/egw_de.lang @@ -26,6 +26,7 @@ action that caused the notify: added, canceled, accepted, rejected, ... calendar actions calendar de Befehle actions... calendar de Aktionen... add alarm calendar de Alarm zufügen +add appointments via shortened dialog or complete edit window calendar de Termine hinzufügen über verkürzten Dialog oder komplettes Bearbeiten-Fenster add current view as favorite calendar de Ansicht als Favorit zufügen add new alarm calendar de Neuen Alarm erstellen add new participants or resource calendar de Neue(n) Teilnehmer oder Ressource auswählen @@ -54,6 +55,7 @@ allow booking requests from any user when creating events? calendar de Erlaube B allow users to prevent change notifications ('do not notify') calendar de Erlaube Benutzern Benachrichtigungen über Änderungen zu unterdrücken ('Nicht benachrichtigen') allows to edit the event again calendar de Erlaubt den Termin erneut zu bearbeiten always calendar de Immer +always use full edit dialog calendar de Immer das komplette Bearbeiten-Fenster verwenden apply the action on the whole query, not only the shown events calendar de Befehl auf die gesamte Abfrage anwenden, NICHT nur auf die angezeigten Termine apply the changes calendar de Übernimmt die Änderungen appointment settings calendar de Einstellungen der Terminverwaltung @@ -430,6 +432,7 @@ private and global public calendar de Privat und Global öffentlich private and group public calendar de Privat und Gruppen öffentlich private only calendar de nur private quantity calendar de Menge +quick add calendar de schnelles Hinzufügen range fields calendar de Feldbereich re-edit event calendar de Termin erneut bearbeiten receive email updates calendar de Empfange E-Mail-Updates @@ -441,6 +444,7 @@ recurrence calendar de Wiederholung recurrence enddate calendar de Enddatum der Wiederholung recurrences and conflict check calendar de Wiederholungen und Konfliktprüfung recurring event calendar de Wiederholender Termin +regular edit calendar de reguläres Bearbeiten reject calendar de Absagen rejected calendar de Abgesagt repeat days calendar de Wiederholungstage @@ -595,6 +599,7 @@ update timezones common de Zeitzonen aktualisieren updated calendar de Aktualisiert use end date calendar de Enddatum benutzen use given criteria: calendar de Kriterien benutzen: +use quick add or full edit dialog when creating a new event calendar de Wollen Sie den verkürzten Dialog zum schnellen Hinzufügen oder das vollständigen Bearbeiten-Fenster verwenden, wenn Sie ein neues Ereignis erstellen. use range-views to optimise calendar queries? calendar de Sollen spezielle Bereichs-Ansichten verwendet werden, um Kalenderabfragen zu optimieren? use side menu to filter participants calendar de Zum Filtern von Teilnehmern, bitte Seitenmenu verwenden use the selected time and close the popup calendar de benutzt die ausgewählte Zeit und schließt das Pop-up diff --git a/calendar/lang/egw_en.lang b/calendar/lang/egw_en.lang index 427a0a271f..5daf35e2c9 100644 --- a/calendar/lang/egw_en.lang +++ b/calendar/lang/egw_en.lang @@ -26,6 +26,7 @@ action that caused the notify: added, canceled, accepted, rejected, ... calendar actions calendar en Actions actions... calendar en Actions... add alarm calendar en Add alarm +add appointments via shortened dialog or complete edit window calendar en Add appointments via shortened dialog or complete edit window add current view as favorite calendar en Add current view as favorite add new alarm calendar en Add new alarm add new participants or resource calendar en Add new participants or resource @@ -54,6 +55,7 @@ allow booking requests from any user when creating events? calendar en Allow boo allow users to prevent change notifications ('do not notify') calendar en Allow users to prevent change notifications 'Do not notify' allows to edit the event again calendar en Allows to edit the event again always calendar en Always +always use full edit dialog calendar en Always use full edit dialog apply the action on the whole query, not only the shown events calendar en Apply the action on the whole query, NOT only the shown events. apply the changes calendar en Apply the changes appointment settings calendar en Appointment settings @@ -432,6 +434,7 @@ private and global public calendar en Private and global public private and group public calendar en Private and group public private only calendar en Private only quantity calendar en Quantity +quick add calendar en Quick add range fields calendar en Range fields re-edit event calendar en Re-edit event receive email updates calendar en Receive email updates @@ -443,6 +446,7 @@ recurrence calendar en Recurrence recurrence enddate calendar en Recurrence end date recurrences and conflict check calendar en Recurrences and conflict check recurring event calendar en Recurring event +regular edit calendar en Regular edit reject calendar en Reject rejected calendar en Rejected repeat days calendar en Repeat days @@ -597,6 +601,7 @@ update timezones common en Update time zones updated calendar en Updated use end date calendar en Use end date use given criteria: calendar en Use given criteria: +use quick add or full edit dialog when creating a new event calendar en Use quick add or full edit dialog when creating a new event use range-views to optimise calendar queries? calendar en Use range-views to optimise calendar queries? use side menu to filter participants calendar en Use side menu to filter participants use the selected time and close the popup calendar en Use the selected time and close the popup diff --git a/calendar/templates/default/add.xet b/calendar/templates/default/add.xet index 84f0491fc6..b5d56c9363 100644 --- a/calendar/templates/default/add.xet +++ b/calendar/templates/default/add.xet @@ -31,7 +31,7 @@