Merge 8cbb9e2274 into 7d34c383a2

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

l10n/ar.js

@@ -128,6 +128,7 @@ OC.L10N.register(
     "Unpublishing calendar failed" : "محاولة إلغاء نشر التقويم أخفقت",
     "can edit" : "يمكن التحرير",
     "Unshare with {displayName}" : "إلغاء المشاركة مع {displayName}",
+    "{teamDisplayName} (Team)" : "{teamDisplayName} (فريق)",
     "An error occurred while unsharing the calendar." : "حدث خطأ أثناء إلغاء مشاركة التقويم",
     "An error occurred, unable to change the permission of the share." : "حدث خطأ، لا يمكن تعديل صلاحيات نشر التقويم.",
     "Share with users or groups" : "شارك مع مستخدمين او مجموعات",

l10n/ar.json

@@ -126,6 +126,7 @@
     "Unpublishing calendar failed" : "محاولة إلغاء نشر التقويم أخفقت",
     "can edit" : "يمكن التحرير",
     "Unshare with {displayName}" : "إلغاء المشاركة مع {displayName}",
+    "{teamDisplayName} (Team)" : "{teamDisplayName} (فريق)",
     "An error occurred while unsharing the calendar." : "حدث خطأ أثناء إلغاء مشاركة التقويم",
     "An error occurred, unable to change the permission of the share." : "حدث خطأ، لا يمكن تعديل صلاحيات نشر التقويم.",
     "Share with users or groups" : "شارك مع مستخدمين او مجموعات",

l10n/de_DE.js

@@ -128,6 +128,7 @@ OC.L10N.register(
     "Unpublishing calendar failed" : "Aufhebung der Veröffentlichung des Kalenders fehlgeschlagen",
     "can edit" : "kann bearbeiten",
     "Unshare with {displayName}" : "Mit {displayName} nicht mehr teilen",
+    "{teamDisplayName} (Team)" : "{teamDisplayName} (Team)",
     "An error occurred while unsharing the calendar." : "Es ist ein Fehler beim Aufheben der Freigabe des Kalenders aufgetreten.",
     "An error occurred, unable to change the permission of the share." : "Es ist ein Fehler aufgetreten, die Berechtigung für die Freigabe konnte nicht geändert werden.",
     "Share with users or groups" : "Mit Benutzern oder Gruppen teilen",

l10n/de_DE.json

@@ -126,6 +126,7 @@
     "Unpublishing calendar failed" : "Aufhebung der Veröffentlichung des Kalenders fehlgeschlagen",
     "can edit" : "kann bearbeiten",
     "Unshare with {displayName}" : "Mit {displayName} nicht mehr teilen",
+    "{teamDisplayName} (Team)" : "{teamDisplayName} (Team)",
     "An error occurred while unsharing the calendar." : "Es ist ein Fehler beim Aufheben der Freigabe des Kalenders aufgetreten.",
     "An error occurred, unable to change the permission of the share." : "Es ist ein Fehler aufgetreten, die Berechtigung für die Freigabe konnte nicht geändert werden.",
     "Share with users or groups" : "Mit Benutzern oder Gruppen teilen",

l10n/en_GB.js

@@ -128,6 +128,7 @@ OC.L10N.register(
     "Unpublishing calendar failed" : "Unpublishing calendar failed",
     "can edit" : "can edit",
     "Unshare with {displayName}" : "Unshare with {displayName}",
+    "{teamDisplayName} (Team)" : "{teamDisplayName} (Team)",
     "An error occurred while unsharing the calendar." : "An error occurred while unsharing the calendar.",
     "An error occurred, unable to change the permission of the share." : "An error occurred, unable to change the permission of the share.",
     "Share with users or groups" : "Share with users or groups",

l10n/en_GB.json

@@ -126,6 +126,7 @@
     "Unpublishing calendar failed" : "Unpublishing calendar failed",
     "can edit" : "can edit",
     "Unshare with {displayName}" : "Unshare with {displayName}",
+    "{teamDisplayName} (Team)" : "{teamDisplayName} (Team)",
     "An error occurred while unsharing the calendar." : "An error occurred while unsharing the calendar.",
     "An error occurred, unable to change the permission of the share." : "An error occurred, unable to change the permission of the share.",
     "Share with users or groups" : "Share with users or groups",

l10n/es_MX.js

@@ -1,6 +1,9 @@
 OC.L10N.register(
     "calendar",
     {
+    "Provided email-address is too long" : "La dirección de correo electrónico proporcionada es demasiado larga",
+    "User-Session unexpectedly expired" : "La sesión de usuario expiró inesperadamente",
+    "Provided email-address is not valid" : "La dirección de correo electrónico proporcionada es inválida",
     "%s has published the calendar »%s«" : "%s ha publicado el calendario »%s«",
     "Hello," : "Hola,",
     "We wanted to inform you that %s has published the calendar »%s«." : "Queremos informarte que %s ha publicado el calendario »%s«.",
@@ -8,6 +11,7 @@ OC.L10N.register(
     "Cheers!" : "¡Saludos!",
     "Upcoming events" : "Próximos eventos",
     "No upcoming events" : "No hay eventos próximos",
+    "%1$s with %2$s" : "%1$s con %2$s",
     "Calendar" : "Calendario",
     "Appointments" : "Citas",
     "Confirm" : "Confirmar",

l10n/es_MX.json

@@ -1,4 +1,7 @@
 { "translations": {
+    "Provided email-address is too long" : "La dirección de correo electrónico proporcionada es demasiado larga",
+    "User-Session unexpectedly expired" : "La sesión de usuario expiró inesperadamente",
+    "Provided email-address is not valid" : "La dirección de correo electrónico proporcionada es inválida",
     "%s has published the calendar »%s«" : "%s ha publicado el calendario »%s«",
     "Hello," : "Hola,",
     "We wanted to inform you that %s has published the calendar »%s«." : "Queremos informarte que %s ha publicado el calendario »%s«.",
@@ -6,6 +9,7 @@
     "Cheers!" : "¡Saludos!",
     "Upcoming events" : "Próximos eventos",
     "No upcoming events" : "No hay eventos próximos",
+    "%1$s with %2$s" : "%1$s con %2$s",
     "Calendar" : "Calendario",
     "Appointments" : "Citas",
     "Confirm" : "Confirmar",

l10n/fr.js

@@ -128,6 +128,7 @@ OC.L10N.register(
     "Unpublishing calendar failed" : "Impossible de dé-publier l'agenda",
     "can edit" : "peut modifier",
     "Unshare with {displayName}" : "Ne plus partager avec {displayName}",
+    "{teamDisplayName} (Team)" : "{teamDisplayName} (Équipe)",
     "An error occurred while unsharing the calendar." : "Une erreur est survenue lors de l'annulation du partage de l'agenda.",
     "An error occurred, unable to change the permission of the share." : "Une erreur s’est produite, impossible de changer la permission du partage.",
     "Share with users or groups" : "Partager avec des utilisateurs ou des groupes",

l10n/fr.json

@@ -126,6 +126,7 @@
     "Unpublishing calendar failed" : "Impossible de dé-publier l'agenda",
     "can edit" : "peut modifier",
     "Unshare with {displayName}" : "Ne plus partager avec {displayName}",
+    "{teamDisplayName} (Team)" : "{teamDisplayName} (Équipe)",
     "An error occurred while unsharing the calendar." : "Une erreur est survenue lors de l'annulation du partage de l'agenda.",
     "An error occurred, unable to change the permission of the share." : "Une erreur s’est produite, impossible de changer la permission du partage.",
     "Share with users or groups" : "Partager avec des utilisateurs ou des groupes",

l10n/sr.js

@@ -128,6 +128,7 @@ OC.L10N.register(
     "Unpublishing calendar failed" : "Није успео прекид објављивања календара",
     "can edit" : "може да мења",
     "Unshare with {displayName}" : "Уклони дељење са {displayName}",
+    "{teamDisplayName} (Team)" : "{teamDisplayName} (Тим)",
     "An error occurred while unsharing the calendar." : "Дошло је до грешке приликом уклањања дељења календара.",
     "An error occurred, unable to change the permission of the share." : "Дошло је до грешке, не може да се измени дозвола дељења.",
     "Share with users or groups" : "Дели са корисницима или групама",

l10n/sr.json

@@ -126,6 +126,7 @@
     "Unpublishing calendar failed" : "Није успео прекид објављивања календара",
     "can edit" : "може да мења",
     "Unshare with {displayName}" : "Уклони дељење са {displayName}",
+    "{teamDisplayName} (Team)" : "{teamDisplayName} (Тим)",
     "An error occurred while unsharing the calendar." : "Дошло је до грешке приликом уклањања дељења календара.",
     "An error occurred, unable to change the permission of the share." : "Дошло је до грешке, не може да се измени дозвола дељења.",
     "Share with users or groups" : "Дели са корисницима или групама",

l10n/sv.js

@@ -128,6 +128,7 @@ OC.L10N.register(
     "Unpublishing calendar failed" : "Avpublicering av kalendern misslyckades",
     "can edit" : "kan redigera",
     "Unshare with {displayName}" : "Sluta dela med {displayName}",
+    "{teamDisplayName} (Team)" : "{teamDisplayName} (Team)",
     "An error occurred while unsharing the calendar." : "Ett fel uppstod när delningen av kalendern skulle tas bort.",
     "An error occurred, unable to change the permission of the share." : "Ett fel inträffade. Det gick inte att ändra behörighet för delningen.",
     "Share with users or groups" : "Dela med användare eller grupper",

l10n/sv.json

@@ -126,6 +126,7 @@
     "Unpublishing calendar failed" : "Avpublicering av kalendern misslyckades",
     "can edit" : "kan redigera",
     "Unshare with {displayName}" : "Sluta dela med {displayName}",
+    "{teamDisplayName} (Team)" : "{teamDisplayName} (Team)",
     "An error occurred while unsharing the calendar." : "Ett fel uppstod när delningen av kalendern skulle tas bort.",
     "An error occurred, unable to change the permission of the share." : "Ett fel inträffade. Det gick inte att ändra behörighet för delningen.",
     "Share with users or groups" : "Dela med användare eller grupper",

l10n/tr.js

@@ -128,6 +128,7 @@ OC.L10N.register(
     "Unpublishing calendar failed" : "Takvim yayından kaldırılamadı",
     "can edit" : "düzenleyebilir",
     "Unshare with {displayName}" : "{displayName} ile paylaşımı kaldır",
+    "{teamDisplayName} (Team)" : "{teamDisplayName} (Takım)",
     "An error occurred while unsharing the calendar." : "Takvim paylaşımdan kaldırılırken bir sorun çıktı",
     "An error occurred, unable to change the permission of the share." : "Bir sorun çıktı. Takvimin izin ayarı değiştirilemedi.",
     "Share with users or groups" : "Kullanıcı ya da gruplar ile paylaş",

l10n/tr.json

@@ -126,6 +126,7 @@
     "Unpublishing calendar failed" : "Takvim yayından kaldırılamadı",
     "can edit" : "düzenleyebilir",
     "Unshare with {displayName}" : "{displayName} ile paylaşımı kaldır",
+    "{teamDisplayName} (Team)" : "{teamDisplayName} (Takım)",
     "An error occurred while unsharing the calendar." : "Takvim paylaşımdan kaldırılırken bir sorun çıktı",
     "An error occurred, unable to change the permission of the share." : "Bir sorun çıktı. Takvimin izin ayarı değiştirilemedi.",
     "Share with users or groups" : "Kullanıcı ya da gruplar ile paylaş",

l10n/zh_HK.js

@@ -128,6 +128,7 @@ OC.L10N.register(
     "Unpublishing calendar failed" : "取消發佈日曆失敗",
     "can edit" : "可編輯",
     "Unshare with {displayName}" : "取消與 {displayName} 的分享",
+    "{teamDisplayName} (Team)" : "{teamDisplayName}（團隊）",
     "An error occurred while unsharing the calendar." : "取消分享日曆時發生錯誤。",
     "An error occurred, unable to change the permission of the share." : "發生錯誤，無法變更分享權限",
     "Share with users or groups" : "與用戶或群組分享",

l10n/zh_HK.json

@@ -126,6 +126,7 @@
     "Unpublishing calendar failed" : "取消發佈日曆失敗",
     "can edit" : "可編輯",
     "Unshare with {displayName}" : "取消與 {displayName} 的分享",
+    "{teamDisplayName} (Team)" : "{teamDisplayName}（團隊）",
     "An error occurred while unsharing the calendar." : "取消分享日曆時發生錯誤。",
     "An error occurred, unable to change the permission of the share." : "發生錯誤，無法變更分享權限",
     "Share with users or groups" : "與用戶或群組分享",

l10n/zh_TW.js

@@ -128,6 +128,7 @@ OC.L10N.register(
     "Unpublishing calendar failed" : "取消發佈日曆失敗",
     "can edit" : "可編輯",
     "Unshare with {displayName}" : "取消與 {displayName} 的分享",
+    "{teamDisplayName} (Team)" : "{teamDisplayName}（團隊）",
     "An error occurred while unsharing the calendar." : "取消分享行事曆時發生錯誤。",
     "An error occurred, unable to change the permission of the share." : "發生錯誤，無法變更分享權限",
     "Share with users or groups" : "與使用者或群組分享",

l10n/zh_TW.json

@@ -126,6 +126,7 @@
     "Unpublishing calendar failed" : "取消發佈日曆失敗",
     "can edit" : "可編輯",
     "Unshare with {displayName}" : "取消與 {displayName} 的分享",
+    "{teamDisplayName} (Team)" : "{teamDisplayName}（團隊）",
     "An error occurred while unsharing the calendar." : "取消分享行事曆時發生錯誤。",
     "An error occurred, unable to change the permission of the share." : "發生錯誤，無法變更分享權限",
     "Share with users or groups" : "與使用者或群組分享",

lib/Controller/BookingController.php

@@ -214,7 +214,7 @@ class BookingController extends Controller {
 			);
 		}
 
-		return JsonResponse::success($booking);
+		return JsonResponse::success();
 	}
 
 	/**

src/fullcalendar/eventSources/eventSourceFunction.js

@@ -73,10 +73,12 @@ export function eventSourceFunction(calendarObjects, calendar, start, end, timez
 				jsStart = object.startDate.getInTimezone(timezone).jsDate
 				jsEnd = object.endDate.getInTimezone(timezone).jsDate
 			} else if (object.name === 'VTODO') {
-				// For tasks, we only want to display when it is due,
-				// not for how long it has been in progress already
-				jsStart = object.endDate.getInTimezone(timezone).jsDate
-				jsEnd = object.endDate.getInTimezone(timezone).jsDate
+				jsStart = jsEnd = object.endDate.getInTimezone(timezone).jsDate
+
+				// If available, set task start to allow visualization
+				if (object.startDate) {
+					jsStart = object.startDate.getInTimezone(timezone).jsDate
+				}
 			} else {
 				// We do not want to display anything that's neither
 				// an event nor a task

tests/javascript/unit/fullcalendar/eventSources/freeBusyResourceEventSourceFunction.test.js

@@ -592,7 +592,7 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
 				recurrenceId: 123,
 			},
 			id: '1###1',
-			start: event1End,
+			start: event1Start,
 			title: 'Untitled task',
 		}, {
 			allDay: false,
@@ -613,7 +613,7 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
 				recurrenceId: 123,
 			},
 			id: '1###2',
-			start: event2End,
+			start: event2Start,
 			title: 'Untitled task',
 		}, {
 			allDay: false,
@@ -634,7 +634,7 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
 				recurrenceId: 123,
 			},
 			id: '1###3',
-			start: event3End,
+			start: event3Start,
 			title: 'Untitled task (99%)',
 		}, {
 			allDay: false,
@@ -655,7 +655,7 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
 				recurrenceId: 123,
 			},
 			id: '1###4',
-			start: event4End,
+			start: event4Start,
 			title: 'This task has a title',
 		}, {
 			allDay: false,
@@ -676,30 +676,30 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
 				recurrenceId: 123,
 			},
 			id: '1###5',
-			start: event5End,
+			start: event5Start,
 			title: 'This task has a title and percent (99%)',
 		}])
 
-		expect(eventComponentSet[0].startDate.getInTimezone).toHaveBeenCalledTimes(0)
-		expect(eventComponentSet[0].endDate.getInTimezone).toHaveBeenCalledTimes(2)
+		expect(eventComponentSet[0].startDate.getInTimezone).toHaveBeenCalledTimes(1)
+		expect(eventComponentSet[0].startDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
+		expect(eventComponentSet[0].endDate.getInTimezone).toHaveBeenCalledTimes(1)
 		expect(eventComponentSet[0].endDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
-		expect(eventComponentSet[0].endDate.getInTimezone).toHaveBeenNthCalledWith(2, timezone)
-		expect(eventComponentSet[1].startDate.getInTimezone).toHaveBeenCalledTimes(0)
-		expect(eventComponentSet[1].endDate.getInTimezone).toHaveBeenCalledTimes(2)
+		expect(eventComponentSet[1].startDate.getInTimezone).toHaveBeenCalledTimes(1)
+		expect(eventComponentSet[1].startDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
+		expect(eventComponentSet[1].endDate.getInTimezone).toHaveBeenCalledTimes(1)
 		expect(eventComponentSet[1].endDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
-		expect(eventComponentSet[1].endDate.getInTimezone).toHaveBeenNthCalledWith(2, timezone)
-		expect(eventComponentSet[2].startDate.getInTimezone).toHaveBeenCalledTimes(0)
-		expect(eventComponentSet[2].endDate.getInTimezone).toHaveBeenCalledTimes(2)
+		expect(eventComponentSet[2].startDate.getInTimezone).toHaveBeenCalledTimes(1)
+		expect(eventComponentSet[2].startDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
+		expect(eventComponentSet[2].endDate.getInTimezone).toHaveBeenCalledTimes(1)
 		expect(eventComponentSet[2].endDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
-		expect(eventComponentSet[2].endDate.getInTimezone).toHaveBeenNthCalledWith(2, timezone)
-		expect(eventComponentSet[3].startDate.getInTimezone).toHaveBeenCalledTimes(0)
-		expect(eventComponentSet[3].endDate.getInTimezone).toHaveBeenCalledTimes(2)
+		expect(eventComponentSet[3].startDate.getInTimezone).toHaveBeenCalledTimes(1)
+		expect(eventComponentSet[3].startDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
+		expect(eventComponentSet[3].endDate.getInTimezone).toHaveBeenCalledTimes(1)
 		expect(eventComponentSet[3].endDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
-		expect(eventComponentSet[3].endDate.getInTimezone).toHaveBeenNthCalledWith(2, timezone)
-		expect(eventComponentSet[4].startDate.getInTimezone).toHaveBeenCalledTimes(0)
-		expect(eventComponentSet[4].endDate.getInTimezone).toHaveBeenCalledTimes(2)
+		expect(eventComponentSet[4].startDate.getInTimezone).toHaveBeenCalledTimes(1)
+		expect(eventComponentSet[4].startDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
+		expect(eventComponentSet[4].endDate.getInTimezone).toHaveBeenCalledTimes(1)
 		expect(eventComponentSet[4].endDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
-		expect(eventComponentSet[4].endDate.getInTimezone).toHaveBeenNthCalledWith(2, timezone)
 
 		expect(translate).toHaveBeenCalledTimes(3)
 		expect(translate).toHaveBeenNthCalledWith(1, 'calendar', 'Untitled task')