0012008: add default attendee strategy 'none'
authorsstamer <s.stamer@metaways.de>
Thu, 7 Jul 2016 12:17:44 +0000 (14:17 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 14 Jul 2016 12:00:10 +0000 (14:00 +0200)
... and adds strategy translations

https://forge.tine20.org/view.php?id=12008

Change-Id: I6d10f44bbc8e793694cac96ae1570768ff0c39c5
Reviewed-on: http://gerrit.tine20.com/customers/3322
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
tine20/Calendar/Preference.php
tine20/Calendar/js/Model.js
tine20/Calendar/translations/de.po

index 4b2db3a..f0ef101 100644 (file)
@@ -324,25 +324,30 @@ class Calendar_Preference extends Tinebase_Preference_Abstract
                 $preference->options    = '';
                 break;
             case self::DEFAULTATTENDEE_STRATEGY:
+                $translate = Tinebase_Translation::getTranslation($this->_application);
                 $preference->value      = 'me';
                 $preference->options    = '<?xml version="1.0" encoding="UTF-8"?>
                     <options>
                         <option>
-                            <label>Me</label>
+                            <label>' . $translate->_('Me') . '</label>
                             <value>me</value>
                         </option>
                         <option>
-                            <label>Intelligent</label>
+                            <label>' . $translate->_('Intelligent') . '</label>
                             <value>intelligent</value>
                         </option>
                         <option>
-                            <label>Calendar owner</label>
+                            <label>' . $translate->_('Calendar owner') . '</label>
                             <value>calendarOwner</value>
                         </option>
                         <option>
-                            <label>Filtered attendee</label>
+                            <label>' . $translate->_('Filtered attendee') . '</label>
                             <value>filteredAttendee</value>
                         </option>
+                        <option>
+                            <label>' . $translate->_('None') . '</label>
+                            <value>none</value>
+                        </option>
                     </options>';
                 break;
             case self::DEFAULT_TIMEINCREMENT:
index b0e6492..66191e2 100644 (file)
@@ -219,7 +219,7 @@ Tine.Calendar.Model.Event.getDefaultAttendee = function(organizer, container) {
         defaultResourceData = Tine.Calendar.Model.Attender.getDefaultResourceData(),
         filteredContainers = westPanel.getContainerTreePanel().getFilterPlugin().getFilter().value || [],
         prefs = app.getRegistry().get('preferences'),
-        defaultAttendeeStrategy = prefs.get('defaultAttendeeStrategy') || 'me', // one of['me', 'intelligent', 'calendarOwner', 'filteredAttendee']
+        defaultAttendeeStrategy = prefs.get('defaultAttendeeStrategy') || 'me',// one of['me', 'intelligent', 'calendarOwner', 'filteredAttendee', 'none']
         defaultAttendee = []
         calendarResources = app.getRegistry().get('calendarResources');
         
@@ -238,6 +238,8 @@ Tine.Calendar.Model.Event.getDefaultAttendee = function(organizer, container) {
     }
     
     switch(defaultAttendeeStrategy) {
+        case 'none':
+            break;
         case 'me':
             defaultAttendee.push(Ext.apply(Tine.Calendar.Model.Attender.getDefaultData(), {
                 user_type: 'user',
index 9ed9de0..9edae4d 100644 (file)
@@ -338,7 +338,7 @@ msgstr "Keine Wiederholungsregel definiert"
 
 #: js/RrulePanel.js:77 js/Calendar-FAT-debug.js:10689 js/Calendar-FAT.js:6
 msgid "None"
-msgstr "Einmalig"
+msgstr "Keine"
 
 #: js/RrulePanel.js:91 js/Calendar-FAT-debug.js:10703 js/Calendar-FAT.js:6
 msgid "Weekly"
@@ -1432,7 +1432,7 @@ msgstr "Inkrement der Zeiteinheit für Termine"
 
 #: Preference.php:171
 msgid "Default set Events to privat"
-msgstr "Setze standardmäßig Termine auf privat"
+msgstr "Setze standartmäßig Termine auf privat"
 
 #: Preference.php:172
 msgid "If enabled every created event is always privat."
@@ -1723,9 +1723,6 @@ msgstr "\"%2$s\" Antwort von %1$s"
 msgid "Event details"
 msgstr "Termin Details"
 
-msgid "Send Alarm Notifications Emails"
-msgstr "Sende E-Mails mit Alarm-Benachrichtigungen"
-
 msgid "Print Event"
 msgstr "Termin Drucken"
 
@@ -1755,3 +1752,18 @@ msgstr "Angezeigte Zeit"
 
 msgid "Time to be displayed at once"
 msgstr "Wie viele Zeit auf einmal angezeigt werden sollen"
+
+msgid "Me"
+msgstr "Meine"
+
+msgid "Intelligent"
+msgstr "Intelligent"
+
+msgid "Calendar owner"
+msgstr "Kalender Besitzer"
+
+msgid "Filtered attendee"
+msgstr "Gefilterte Teilnehmer"
+
+msgid "Send Alarm Notifications Emails"
+msgstr "Sende E-Mails mit Alarm-Benachrichtigungen"