Compare commits

...

3 Commits

Author SHA1 Message Date
Patrick Robertson bf4251864a
Merge 190e869767 into 6c930f2be0 2024-04-25 12:00:38 +02:00
Nextcloud bot 6c930f2be0
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-25 00:30:17 +00:00
Patrick Robertson 190e869767 Allow any calendar the user has access to, to be selected for the 'conflict' calendar
Signed-off-by: Patrick Robertson <robertson.patrick@gmail.com>
2024-04-19 16:47:54 +08:00
4 changed files with 62 additions and 1 deletions

View File

@ -55,6 +55,10 @@ OC.L10N.register(
"An error occurred, unable to change visibility of the calendar." : "Prodúxose un error, nun ye posible camudar la visibilidá del calendariu.",
"_Unsharing the calendar in {countdown} second_::_Unsharing the calendar in {countdown} seconds_" : ["Va dexar de compartise'l calendariu en {countdown} segundu","Va dexar de compartise'l calendariu en {countdown} segundos"],
"_Deleting the calendar in {countdown} second_::_Deleting the calendar in {countdown} seconds_" : ["Va desaniciase'l calendariu en {countdown} segundu","Va desaniciase'l calendariu en {countdown} segundos"],
"New calendar" : "Calendariu nuevu",
"Name for new calendar" : "Nome del calendariu nuevu",
"Creating calendar …" : "Creando'l calendariu…",
"Creating subscription …" : "Creando la soscripción…",
"An error occurred, unable to create the calendar." : "Prodúxose un error, nun ye posible crear el calendariu.",
"Copy subscription link" : "Copiar l'enllaz de soscripción",
"Copying link …" : "Copiando l'enllaz …",
@ -84,12 +88,17 @@ OC.L10N.register(
"Copy public link" : "Copiar l'enllaz públicu",
"Send link to calendar via email" : "Unviar l'enllaz del calendariu per corréu electrónicu",
"Enter one address" : "Introduz una direción",
"Sending email …" : "Unviando'l mensaxe…",
"Copy embedding code" : "Copiar el códigu pa empotrar",
"Copying code …" : "Copiando'l códigu …",
"Copied code" : "Copióse'l códigu",
"Could not copy code" : "Nun se pudo copiar el códigu",
"Delete share link" : "Desaniciar esti enllaz d'usu compartíu",
"Deleting share link …" : "Desaniciando l'enllaz d'usu compartíu…",
"An error occurred, unable to publish calendar." : "Prodúxose un error, nun ye posible espublizar el calendariu.",
"An error occurred, unable to send email." : "Prodúxose un error, nun ye posible unviar el mensaxe.",
"Embed code copied to clipboard." : "El códigu incrustáu copióse nel cartafueyu.",
"Embed code could not be copied to clipboard." : "El códigu incrustáu nun se pudo copiar nel cartafueyu.",
"Unshare with {displayName}" : "Dexar de compartir con {displayName}",
"An error occurred while unsharing the calendar." : "Prodúxose un error mentanto se dexaba de compartir el calendariu.",
"An error occurred, unable to change the permission of the share." : "Prodúxose un error, nun ye posible camudar el permisu del elementu compartíu.",
@ -105,7 +114,10 @@ OC.L10N.register(
"Cancel" : "Encaboxar",
"Invalid location selected" : "Seleicionóse una llocalización inválida",
"Automatic" : "Automáticu",
"or" : "o",
"Navigation" : "Navegación",
"Previous period" : "Periodu anterior",
"Next period" : "Periodu siguiente",
"Views" : "Vistes",
"Day view" : "Vista de díes",
"Week view" : "Vista de selmanes",
@ -191,18 +203,29 @@ OC.L10N.register(
"Accept" : "Aceptar",
"Decline" : "Refugar",
"Tentative" : "Provisional",
"The invitation has been accepted successfully." : "La invitación aceptóse correutamente.",
"Failed to accept the invitation." : "Nun se pue aceptar la invitación",
"The invitation has been declined successfully." : "La invitación refugóse correutamente.",
"Failed to decline the invitation." : "Nun se pue refugar la invitación",
"Your participation has been marked as tentative." : "La to participación marcóse como provisional.",
"Failed to set the participation status to tentative." : "Nun se pudo afitar l'estáu de la participación a provisional",
"Attendees" : "Asistentes",
"No attendees yet" : "Nun hai nengún asistente",
"You do not own this calendar, so you cannot add attendees to this event" : "Esti calendariu nun te pertenez, polo que nun pues amestar asistentes a esti eventu",
"Error creating Talk room" : "Hebo un error al crear la sala de Talk",
"_%n more guest_::_%n more guests_" : ["%n convidáu más","%n convidaos más"],
"Remove group" : "Quitar el grupu",
"_%n member_::_%n members_" : ["%n miembru","%n miembros"],
"No match found" : "Nun s'atopó nenguna coincidencia",
"Remove color" : "Quitar el color",
"Event title" : "Títulu del eventu",
"All day" : "Tol día",
"Repeat" : "Repitir",
"never" : "enxamás",
"first" : "primer",
"third" : "tercer",
"fourth" : "cuartu",
"fifth" : "quintu",
"_month_::_months_" : ["mes","meses"],
"_year_::_years_" : ["añu","años"],
"Suggestions" : "Suxerencies",
@ -211,6 +234,7 @@ OC.L10N.register(
"_{seatingCapacity} seat_::_{seatingCapacity} seats_" : ["{seatingCapacity} asientu","{seatingCapacity} asientos"],
"Projector" : "Proyeutor",
"Whiteboard" : "Pizarra",
"More details" : "Mas detalles",
"Pick a date" : "Escueyi una data",
"Please enter a valid date" : "Introduz una data válida",
"Global" : "Global",

View File

@ -53,6 +53,10 @@
"An error occurred, unable to change visibility of the calendar." : "Prodúxose un error, nun ye posible camudar la visibilidá del calendariu.",
"_Unsharing the calendar in {countdown} second_::_Unsharing the calendar in {countdown} seconds_" : ["Va dexar de compartise'l calendariu en {countdown} segundu","Va dexar de compartise'l calendariu en {countdown} segundos"],
"_Deleting the calendar in {countdown} second_::_Deleting the calendar in {countdown} seconds_" : ["Va desaniciase'l calendariu en {countdown} segundu","Va desaniciase'l calendariu en {countdown} segundos"],
"New calendar" : "Calendariu nuevu",
"Name for new calendar" : "Nome del calendariu nuevu",
"Creating calendar …" : "Creando'l calendariu…",
"Creating subscription …" : "Creando la soscripción…",
"An error occurred, unable to create the calendar." : "Prodúxose un error, nun ye posible crear el calendariu.",
"Copy subscription link" : "Copiar l'enllaz de soscripción",
"Copying link …" : "Copiando l'enllaz …",
@ -82,12 +86,17 @@
"Copy public link" : "Copiar l'enllaz públicu",
"Send link to calendar via email" : "Unviar l'enllaz del calendariu per corréu electrónicu",
"Enter one address" : "Introduz una direción",
"Sending email …" : "Unviando'l mensaxe…",
"Copy embedding code" : "Copiar el códigu pa empotrar",
"Copying code …" : "Copiando'l códigu …",
"Copied code" : "Copióse'l códigu",
"Could not copy code" : "Nun se pudo copiar el códigu",
"Delete share link" : "Desaniciar esti enllaz d'usu compartíu",
"Deleting share link …" : "Desaniciando l'enllaz d'usu compartíu…",
"An error occurred, unable to publish calendar." : "Prodúxose un error, nun ye posible espublizar el calendariu.",
"An error occurred, unable to send email." : "Prodúxose un error, nun ye posible unviar el mensaxe.",
"Embed code copied to clipboard." : "El códigu incrustáu copióse nel cartafueyu.",
"Embed code could not be copied to clipboard." : "El códigu incrustáu nun se pudo copiar nel cartafueyu.",
"Unshare with {displayName}" : "Dexar de compartir con {displayName}",
"An error occurred while unsharing the calendar." : "Prodúxose un error mentanto se dexaba de compartir el calendariu.",
"An error occurred, unable to change the permission of the share." : "Prodúxose un error, nun ye posible camudar el permisu del elementu compartíu.",
@ -103,7 +112,10 @@
"Cancel" : "Encaboxar",
"Invalid location selected" : "Seleicionóse una llocalización inválida",
"Automatic" : "Automáticu",
"or" : "o",
"Navigation" : "Navegación",
"Previous period" : "Periodu anterior",
"Next period" : "Periodu siguiente",
"Views" : "Vistes",
"Day view" : "Vista de díes",
"Week view" : "Vista de selmanes",
@ -189,18 +201,29 @@
"Accept" : "Aceptar",
"Decline" : "Refugar",
"Tentative" : "Provisional",
"The invitation has been accepted successfully." : "La invitación aceptóse correutamente.",
"Failed to accept the invitation." : "Nun se pue aceptar la invitación",
"The invitation has been declined successfully." : "La invitación refugóse correutamente.",
"Failed to decline the invitation." : "Nun se pue refugar la invitación",
"Your participation has been marked as tentative." : "La to participación marcóse como provisional.",
"Failed to set the participation status to tentative." : "Nun se pudo afitar l'estáu de la participación a provisional",
"Attendees" : "Asistentes",
"No attendees yet" : "Nun hai nengún asistente",
"You do not own this calendar, so you cannot add attendees to this event" : "Esti calendariu nun te pertenez, polo que nun pues amestar asistentes a esti eventu",
"Error creating Talk room" : "Hebo un error al crear la sala de Talk",
"_%n more guest_::_%n more guests_" : ["%n convidáu más","%n convidaos más"],
"Remove group" : "Quitar el grupu",
"_%n member_::_%n members_" : ["%n miembru","%n miembros"],
"No match found" : "Nun s'atopó nenguna coincidencia",
"Remove color" : "Quitar el color",
"Event title" : "Títulu del eventu",
"All day" : "Tol día",
"Repeat" : "Repitir",
"never" : "enxamás",
"first" : "primer",
"third" : "tercer",
"fourth" : "cuartu",
"fifth" : "quintu",
"_month_::_months_" : ["mes","meses"],
"_year_::_years_" : ["añu","años"],
"Suggestions" : "Suxerencies",
@ -209,6 +232,7 @@
"_{seatingCapacity} seat_::_{seatingCapacity} seats_" : ["{seatingCapacity} asientu","{seatingCapacity} asientos"],
"Projector" : "Proyeutor",
"Whiteboard" : "Pizarra",
"More details" : "Mas detalles",
"Pick a date" : "Escueyi una data",
"Please enter a valid date" : "Introduz una data válida",
"Global" : "Global",

View File

@ -210,6 +210,7 @@ export default {
...mapGetters([
'ownSortedCalendars',
'isTalkEnabled',
'allSortedCalendars',
]),
...mapStores(useAppointmentConfigStore),
formTitle() {
@ -237,7 +238,7 @@ export default {
},
selectableConflictCalendars() {
// The target calendar is always a conflict calendar, remove it from additional conflict calendars
return this.ownSortedCalendars.filter(calendar => calendar.url !== this.calendar.url)
return this.allSortedCalendars.filter(calendar => calendar.url !== this.calendar.url)
},
conflictCalendars() {
const freebusyUris = this.editing.calendarFreeBusyUris ?? []

View File

@ -446,6 +446,18 @@ const getters = {
.sort((a, b) => a.order - b.order)
},
/**
* List all sorted calendars, including readonly
*
* @param {object} state the store data
* @return {Array}
*/
allSortedCalendars(state) {
return state.calendars
.filter(calendar => calendar.supportsEvents)
.sort((a, b) => a.order - b.order)
},
/**
* List of sorted calendars
*