Merge branch 'bug/properly-handle-event-status' into 'master'

Bug/properly handle event status

Closes #194

See merge request framasoft/mobilizon!248
This commit is contained in:
Thomas Citharel 2019-10-11 16:45:18 +02:00
commit 838288a384
20 changed files with 335 additions and 102 deletions

View File

@ -13,6 +13,7 @@
"Add": "Add",
"Additional comments": "Additional comments",
"Administration": "Administration",
"All the places have already been taken": "All the places have been taken|One place is still available|{places} places are still available",
"Allow all comments": "Allow all comments",
"Approve": "Approve",
"Are you sure you want to cancel the event creation? You'll lose all modifications.": "Are you sure you want to cancel the event creation? You'll lose all modifications.",
@ -25,6 +26,7 @@
"Cancel my participation request…": "Cancel my participation request…",
"Cancel my participation…": "Cancel my participation…",
"Cancel": "Cancel",
"Cancelled: Won't happen": "Cancelled: Won't happen",
"Category": "Category",
"Change my identity…": "Change my identity…",
"Change my password": "Change my password",
@ -70,9 +72,11 @@
"Enter the link URL": "Enter the link URL",
"Error while validating account": "Error while validating account",
"Event already passed": "Event already passed",
"Event cancelled": "Event cancelled",
"Event creation": "Event creation",
"Event edition": "Event edition",
"Event list": "Event list",
"Event to be confirmed": "Event to be confirmed",
"Event {eventTitle} deleted": "Event {eventTitle} deleted",
"Event {eventTitle} reported": "Event {eventTitle} reported",
"Event": "Event",
@ -273,6 +277,5 @@
"{count} participants": "{count} participants",
"{count} requests waiting": "{count} requests waiting",
"{license} guarantees {respect} of the people who will use it. Since {source}, anyone can audit it, which guarantees its transparency.": "{license} guarantees {respect} of the people who will use it. Since {source}, anyone can audit it, which guarantees its transparency.",
"© The Mobilizon Contributors {date} - Made with Elixir, Phoenix, VueJS & with some love and some weeks": "© The Mobilizon Contributors {date} - Made with Elixir, Phoenix, VueJS & with some love and some weeks",
"All the places have already been taken": "All the places have been taken|One place is still available|{places} places are still available"
"© The Mobilizon Contributors {date} - Made with Elixir, Phoenix, VueJS & with some love and some weeks": "© The Mobilizon Contributors {date} - Made with Elixir, Phoenix, VueJS & with some love and some weeks"
}

View File

@ -15,6 +15,7 @@
"Add": "Ajouter",
"Additional comments": "Commentaires additionnels",
"Administration": "Administration",
"All the places have already been taken": "Toutes les places ont été prises|Une place est encore disponible|{places} places sont encore disponibles",
"Allow all comments": "Autoriser tous les commentaires",
"Approve": "Approuver",
"Are you going to this event?": "Allez-vous à cet événement ?",
@ -29,6 +30,7 @@
"Cancel my participation request…": "Annuler ma demande de participation…",
"Cancel my participation…": "Annuler ma participation…",
"Cancel": "Annuler",
"Cancelled: Won't happen": "Annulé: N'aura pas lieu",
"Category": "Catégorie",
"Change my identity…": "Changer mon identité…",
"Change my password": "Modifier mon mot de passe",
@ -80,9 +82,11 @@
"Enter the link URL": "Entrez l'URL du lien",
"Error while validating account": "Erreur lors de la validation du compte",
"Event already passed": "Événement déjà passé",
"Event cancelled": "Événement annulé",
"Event creation": "Création d'événement",
"Event edition": "Édition d'événement",
"Event list": "Liste d'événements",
"Event to be confirmed": "Événement à confirmer",
"Event {eventTitle} deleted": "Événement {eventTitle} supprimé",
"Event {eventTitle} reported": "Événement {eventTitle} signalé",
"Event": "Événement",
@ -312,6 +316,5 @@
"{count} participants": "Un⋅e participant⋅e|{count} participant⋅e⋅s",
"{count} requests waiting": "Un⋅e demande en attente|{count} demandes en attente",
"{license} guarantees {respect} of the people who will use it. Since {source}, anyone can audit it, which guarantees its transparency.": "{license} garantit {respect} des personnes qui l'utiliseront. Puisque {source}, il est publiquement auditable, ce qui garantit sa transparence.",
"© The Mobilizon Contributors {date} - Made with Elixir, Phoenix, VueJS & with some love and some weeks": "© Les contributeurs de Mobilizon {date} - Fait avec Elixir, Phoenix, VueJS & et de l'amour et des semaines",
"All the places have already been taken": "Toutes les places ont été prises|Une place est encore disponible|{places} places sont encore disponibles"
"© The Mobilizon Contributors {date} - Made with Elixir, Phoenix, VueJS & with some love and some weeks": "© Les contributeurs de Mobilizon {date} - Fait avec Elixir, Phoenix, VueJS & et de l'amour et des semaines"
}

View File

@ -140,21 +140,29 @@
{{ $t('Status') }}
</h2>
<div class="field">
<b-radio v-model="event.status"
<b-field>
<b-radio-button v-model="event.status"
name="status"
type="is-warning"
:native-value="EventStatus.TENTATIVE">
<b-icon icon="calendar-question"></b-icon>
{{ $t('Tentative: Will be confirmed later') }}
</b-radio>
</div>
<div class="field">
<b-radio v-model="event.status"
</b-radio-button>
<b-radio-button v-model="event.status"
name="status"
type="is-success"
:native-value="EventStatus.CONFIRMED">
<b-icon icon="calendar-check"></b-icon>
{{ $t('Confirmed: Will happen') }}
</b-radio>
</div>
</b-radio-button>
<b-radio-button v-model="event.status"
name="status"
type="is-danger"
:native-value="EventStatus.CANCELLED">
<b-icon icon="calendar-remove"></b-icon>
{{ $t("Cancelled: Won't happen") }}
</b-radio-button>
</b-field>
</form>
</div>
</div>

View File

@ -34,7 +34,7 @@
</div>
<div class="event-participation has-text-right" v-if="new Date(endDate) > new Date()">
<participation-button
v-if="currentActor.id && !actorIsOrganizer && !event.draft && (eventCapacityOK || actorIsParticipant)"
v-if="currentActor.id && !actorIsOrganizer && !event.draft && (eventCapacityOK || actorIsParticipant) && event.status !== EventStatus.CANCELLED"
:participation="participations[0]"
:current-actor="currentActor"
@joinEvent="joinEvent"
@ -55,6 +55,10 @@
<div class="column is-three-quarters-desktop">
<p class="tags" v-if="event.tags.length > 0">
<b-tag type="is-warning" size="is-medium" v-if="event.draft">{{ $t('Draft') }}</b-tag>
<span class="event-status" v-if="event.status !== EventStatus.CONFIRMED">
<b-tag type="is-warning" v-if="event.status === EventStatus.TENTATIVE">{{ $t('Event to be confirmed') }}</b-tag>
<b-tag type="is-danger" v-if="event.status === EventStatus.CANCELLED">{{ $t('Event cancelled') }}</b-tag>
</span>
<span class="visibility" v-if="!event.draft">
<b-tag type="is-info" v-if="event.visibility === EventVisibility.PUBLIC">{{ $t('Public event') }}</b-tag>
<b-tag type="is-info" v-if="event.visibility === EventVisibility.UNLISTED">{{ $t('Private event') }}</b-tag>
@ -215,7 +219,7 @@
import { EVENT_PERSON_PARTICIPATION, FETCH_EVENT, JOIN_EVENT, LEAVE_EVENT } from '@/graphql/event';
import { Component, Prop } from 'vue-property-decorator';
import { CURRENT_ACTOR_CLIENT } from '@/graphql/actor';
import { EventVisibility, IEvent, IParticipant, ParticipantRole } from '@/types/event.model';
import { EventStatus, EventVisibility, IEvent, IParticipant, ParticipantRole } from '@/types/event.model';
import { IPerson, Person } from '@/types/actor';
import { GRAPHQL_API_ENDPOINT } from '@/api/_entrypoint';
import DateCalendarIcon from '@/components/Event/DateCalendarIcon.vue';
@ -299,6 +303,7 @@ export default class Event extends EventMixin {
isReportModalActive: boolean = false;
isJoinModalActive: boolean = false;
EventVisibility = EventVisibility;
EventStatus = EventStatus;
RouteName = RouteName;
get eventTitle() {

View File

@ -42,6 +42,20 @@
<tr>
<td bgcolor="#ffffff" align="left" style="padding: 20px 30px 40px 30px; color: #777777; font-family: 'Lato', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
<table width="100%">
<%= if MapSet.member?(@changes, :status) do %>
<tr>
<td bgcolor="#ffffff" align="center">
<%= case @event.status do %>
<% :confirmed -> %>
<%= gettext "Event has been confirmed" %>
<% :tentative -> %>
<%= gettext "Event status has been set as tentative" %>
<% :cancelled -> %>
<%= gettext "Event has been cancelled" %>
<% end %>
</td>
</tr>
<% end %>
<%= if MapSet.member?(@changes, :title) do %>
<tr>
<td bgcolor="#ffffff" align="left">

View File

@ -9,7 +9,7 @@ defmodule Mobilizon.Service.Events.Tool do
alias MobilizonWeb.Email
alias Mobilizon.Storage.Repo
@important_changes [:title, :begins_on, :ends_on]
@important_changes [:title, :begins_on, :ends_on, :status]
def calculate_event_diff_and_send_notifications(
%Event{} = old_event,

View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:87
#: lib/mobilizon_web/templates/email/event_updated.html.eex:101
msgid "Go to event page"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70
#: lib/mobilizon_web/templates/email/event_updated.html.eex:99
#: lib/mobilizon_web/templates/email/event_updated.html.eex:113
#: lib/mobilizon_web/templates/email/event_updated.text.eex:21
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:68
#: lib/mobilizon_web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48
#: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:54
msgid "Event has been cancelled"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:50
msgid "Event has been confirmed"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:52
msgid "Event status has been set as tentative"
msgstr ""

View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:87
#: lib/mobilizon_web/templates/email/event_updated.html.eex:101
msgid "Go to event page"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70
#: lib/mobilizon_web/templates/email/event_updated.html.eex:99
#: lib/mobilizon_web/templates/email/event_updated.html.eex:113
#: lib/mobilizon_web/templates/email/event_updated.text.eex:21
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:68
#: lib/mobilizon_web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48
#: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:54
msgid "Event has been cancelled"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:50
msgid "Event has been confirmed"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:52
msgid "Event status has been set as tentative"
msgstr ""

View File

@ -136,13 +136,13 @@ msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:87
#: lib/mobilizon_web/templates/email/event_updated.html.eex:101
msgid "Go to event page"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70
#: lib/mobilizon_web/templates/email/event_updated.html.eex:99
#: lib/mobilizon_web/templates/email/event_updated.html.eex:113
#: lib/mobilizon_web/templates/email/event_updated.text.eex:21
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr ""
@ -221,7 +221,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:68
#: lib/mobilizon_web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr ""
@ -252,7 +252,7 @@ msgid "New title: %{title}"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr ""
@ -267,7 +267,7 @@ msgid "The event %{title} was updated"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48
#: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr ""
@ -306,3 +306,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:54
msgid "Event has been cancelled"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:50
msgid "Event has been confirmed"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:52
msgid "Event status has been set as tentative"
msgstr ""

View File

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2019-10-11 10:37+0200\n"
"PO-Revision-Date: 2019-10-11 15:49+0200\n"
"Last-Translator: Thomas Citharel <thomas.citharel@framasoft.org>\n"
"Language-Team: English <https://weblate.framasoft.org/projects/mobilizon/backend/en/>\n"
"Language: en\n"
@ -20,7 +20,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Poedit 2.0.6\n"
#: lib/mobilizon_web/templates/email/password_reset.html.eex:48 lib/mobilizon_web/templates/email/password_reset.text.eex:12
#: lib/mobilizon_web/templates/email/password_reset.html.eex:48
#: lib/mobilizon_web/templates/email/password_reset.text.eex:12
msgid "If you didn't request this, please ignore this email. Your password won't change until you access the link below and create a new one."
msgstr "If you didn't request this, please ignore this email. Your password won't change until you access the link below and create a new one."
@ -28,7 +29,8 @@ msgstr "If you didn't request this, please ignore this email. Your password won'
msgid "Feed for %{email} on Mobilizon"
msgstr "Feed for %{email} on Mobilizon"
#: lib/mobilizon_web/templates/email/email.html.eex:153 lib/mobilizon_web/templates/email/email.text.eex:6
#: lib/mobilizon_web/templates/email/email.html.eex:153
#: lib/mobilizon_web/templates/email/email.text.eex:6
msgid "%{instance} is a Mobilizon server."
msgstr "%{instance} is a Mobilizon server."
@ -48,11 +50,13 @@ msgstr "Activate my account"
msgid "Ask the community on Framacolibri"
msgstr "Ask the community on Framacolibri"
#: lib/mobilizon_web/templates/email/report.html.eex:62 lib/mobilizon_web/templates/email/report.text.eex:11
#: lib/mobilizon_web/templates/email/report.html.eex:62
#: lib/mobilizon_web/templates/email/report.text.eex:11
msgid "Comments"
msgstr "Comments"
#: lib/mobilizon_web/templates/email/report.html.eex:46 lib/mobilizon_web/templates/email/report.text.eex:6
#: lib/mobilizon_web/templates/email/report.html.eex:46
#: lib/mobilizon_web/templates/email/report.text.eex:6
msgid "Event"
msgstr "Event"
@ -80,7 +84,8 @@ msgstr "Need some help? Something not working properly?"
msgid "New report on %{instance}"
msgstr "New report on %{instance}"
#: lib/mobilizon_web/templates/email/report.html.eex:80 lib/mobilizon_web/templates/email/report.text.eex:18
#: lib/mobilizon_web/templates/email/report.html.eex:80
#: lib/mobilizon_web/templates/email/report.text.eex:18
msgid "Reason"
msgstr "Reason"
@ -120,15 +125,18 @@ msgstr "Activate my account"
msgid "All good!"
msgstr "All good!"
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:45 lib/mobilizon_web/templates/email/event_participation_approved.text.eex:7
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:45
#: lib/mobilizon_web/templates/email/event_participation_approved.text.eex:7
msgid "An organizer just approved your participation. You're now going to this event!"
msgstr "An organizer just approved your participation. You're now going to this event!"
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58 lib/mobilizon_web/templates/email/event_updated.html.eex:87
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:101
msgid "Go to event page"
msgstr "Go to event page"
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70 lib/mobilizon_web/templates/email/event_updated.html.eex:99
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70
#: lib/mobilizon_web/templates/email/event_updated.html.eex:113
#: lib/mobilizon_web/templates/email/event_updated.text.eex:21
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr "If you need to cancel your participation, just access the event page through link above and click on the participation button."
@ -165,7 +173,8 @@ msgstr "Resetting your password is easy. Just press the button below and follow
msgid "Sorry!"
msgstr "Sorry!"
#: lib/mobilizon_web/templates/email/event_participation_rejected.html.eex:45 lib/mobilizon_web/templates/email/event_participation_rejected.text.eex:7
#: lib/mobilizon_web/templates/email/event_participation_rejected.html.eex:45
#: lib/mobilizon_web/templates/email/event_participation_rejected.text.eex:7
msgid "Unfortunately, the organizers rejected your participation."
msgstr "Unfortunately, the organizers rejected your participation."
@ -177,7 +186,8 @@ msgstr "You created an account on %{host} with this email address. You are one c
msgid "You requested to participate in event %{title}"
msgstr "You requested to participate in event %{title}"
#: lib/mobilizon_web/templates/email/event_participation_approved.text.eex:5 lib/mobilizon_web/templates/email/event_participation_rejected.html.eex:38
#: lib/mobilizon_web/templates/email/event_participation_approved.text.eex:5
#: lib/mobilizon_web/templates/email/event_participation_rejected.html.eex:38
#: lib/mobilizon_web/templates/email/event_participation_rejected.text.eex:5
msgid "You requested to participate in event %{title}."
msgstr "You requested to participate in event %{title}."
@ -190,7 +200,7 @@ msgstr "Your participation to event %{title} has been approved"
msgid "Your participation to event %{title} has been rejected"
msgstr "Your participation to event %{title} has been rejected"
#: lib/mobilizon_web/templates/email/event_updated.html.eex:68
#: lib/mobilizon_web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr "Ending of event"
@ -198,7 +208,8 @@ msgstr "Ending of event"
msgid "Event %{title} has been updated"
msgstr "Event %{title} has been updated"
#: lib/mobilizon_web/templates/email/event_updated.html.eex:13 lib/mobilizon_web/templates/email/event_updated.text.eex:1
#: lib/mobilizon_web/templates/email/event_updated.html.eex:13
#: lib/mobilizon_web/templates/email/event_updated.text.eex:1
msgid "Event updated!"
msgstr "Event updated!"
@ -214,7 +225,7 @@ msgstr "New date and time for start of event: %{begins_on}"
msgid "New title: %{title}"
msgstr "New title: %{title}"
#: lib/mobilizon_web/templates/email/event_updated.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr "Start of event"
@ -226,7 +237,7 @@ msgstr "The event %{title} was just updated"
msgid "The event %{title} was updated"
msgstr "The event %{title} was updated"
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48
#: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr "Title"
@ -234,7 +245,8 @@ msgstr "Title"
msgid "View the updated event on: %{link}"
msgstr "Your participation to event %{title} has been rejected"
#: lib/mobilizon_web/templates/email/password_reset.html.eex:38 lib/mobilizon_web/templates/email/password_reset.text.eex:5
#: lib/mobilizon_web/templates/email/password_reset.html.eex:38
#: lib/mobilizon_web/templates/email/password_reset.text.eex:5
msgid "You requested a new password for your account on %{instance}."
msgstr "You requested a new password for your account on %{instance}."
@ -248,8 +260,7 @@ msgstr "In the meantime, please consider that the software is not (yet) finished
#: lib/mobilizon_web/templates/email/email.html.eex:93
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of %{b_start}version 1 of the software in the first half of 2020%{b_end}."
msgstr ""
"Mobilizon is under development, we will add new features to this site during regular updates, until the release of %{b_start}version 1 of the software in the first half of 2020%{b_end}."
msgstr "Mobilizon is under development, we will add new features to this site during regular updates, until the release of %{b_start}version 1 of the software in the first half of 2020%{b_end}."
#: lib/mobilizon_web/templates/email/email.html.eex:90
msgid "This is a demonstration site to test the beta version of Mobilizon."
@ -258,3 +269,15 @@ msgstr "This is a demonstration site to test the beta version of Mobilizon."
#: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning"
msgstr "Warning"
#: lib/mobilizon_web/templates/email/event_updated.html.eex:54
msgid "Event has been cancelled"
msgstr "Event has been cancelled"
#: lib/mobilizon_web/templates/email/event_updated.html.eex:50
msgid "Event has been confirmed"
msgstr "Event has been confirmed"
#: lib/mobilizon_web/templates/email/event_updated.html.eex:52
msgid "Event status has been set as tentative"
msgstr "Event status has been set as tentative"

View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:87
#: lib/mobilizon_web/templates/email/event_updated.html.eex:101
msgid "Go to event page"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70
#: lib/mobilizon_web/templates/email/event_updated.html.eex:99
#: lib/mobilizon_web/templates/email/event_updated.html.eex:113
#: lib/mobilizon_web/templates/email/event_updated.text.eex:21
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:68
#: lib/mobilizon_web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48
#: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:54
msgid "Event has been cancelled"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:50
msgid "Event has been confirmed"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:52
msgid "Event status has been set as tentative"
msgstr ""

View File

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2019-10-11 10:40+0200\n"
"PO-Revision-Date: 2019-10-11 15:49+0200\n"
"Last-Translator: Quentin <quentinantonin@free.fr>\n"
"Language-Team: French <https://weblate.framasoft.org/projects/mobilizon/backend/fr/>\n"
"Language: fr_FR\n"
@ -131,12 +131,12 @@ msgid "An organizer just approved your participation. You're now going to this e
msgstr "Un⋅e organisateur⋅ice vient d'approuver votre participation. Vous allez désormais à cet événement !"
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:87
#: lib/mobilizon_web/templates/email/event_updated.html.eex:101
msgid "Go to event page"
msgstr "Aller à la page de l'événement"
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70
#: lib/mobilizon_web/templates/email/event_updated.html.eex:99
#: lib/mobilizon_web/templates/email/event_updated.html.eex:113
#: lib/mobilizon_web/templates/email/event_updated.text.eex:21
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr "Si vous avez besoin d'annuler votre participation, il suffit d'accéder à la page de l'événement à partir du lien ci-dessus et de cliquer sur le bouton de participation."
@ -200,7 +200,7 @@ msgstr "Votre participation à l'événement %{title} a été approuvée"
msgid "Your participation to event %{title} has been rejected"
msgstr "Votre participation à l'événement %{title} a été rejetée"
#: lib/mobilizon_web/templates/email/event_updated.html.eex:68
#: lib/mobilizon_web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr "Fin de l'événement"
@ -225,7 +225,7 @@ msgstr "Nouvelle date et heure de début de l'événement : %{begins_on}"
msgid "New title: %{title}"
msgstr "Nouveau titre : %{title}"
#: lib/mobilizon_web/templates/email/event_updated.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr "Début de l'événement"
@ -237,7 +237,7 @@ msgstr "L'événement %{title} vient d'être mis à jour"
msgid "The event %{title} was updated"
msgstr "L'événement %{title} a été mis à jour"
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48
#: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr "Titre"
@ -269,3 +269,15 @@ msgstr "Ceci est un site de démonstration permettant de tester la version bêta
#: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning"
msgstr "Attention"
#: lib/mobilizon_web/templates/email/event_updated.html.eex:54
msgid "Event has been cancelled"
msgstr "L'événement a été annulé"
#: lib/mobilizon_web/templates/email/event_updated.html.eex:50
msgid "Event has been confirmed"
msgstr "L'événement a été confirmé"
#: lib/mobilizon_web/templates/email/event_updated.html.eex:52
msgid "Event status has been set as tentative"
msgstr "Le statut de l'événement à été défini comme « à confirmer »"

View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:87
#: lib/mobilizon_web/templates/email/event_updated.html.eex:101
msgid "Go to event page"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70
#: lib/mobilizon_web/templates/email/event_updated.html.eex:99
#: lib/mobilizon_web/templates/email/event_updated.html.eex:113
#: lib/mobilizon_web/templates/email/event_updated.text.eex:21
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:68
#: lib/mobilizon_web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48
#: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:54
msgid "Event has been cancelled"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:50
msgid "Event has been confirmed"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:52
msgid "Event status has been set as tentative"
msgstr ""

View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:87
#: lib/mobilizon_web/templates/email/event_updated.html.eex:101
msgid "Go to event page"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70
#: lib/mobilizon_web/templates/email/event_updated.html.eex:99
#: lib/mobilizon_web/templates/email/event_updated.html.eex:113
#: lib/mobilizon_web/templates/email/event_updated.text.eex:21
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:68
#: lib/mobilizon_web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48
#: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:54
msgid "Event has been cancelled"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:50
msgid "Event has been confirmed"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:52
msgid "Event status has been set as tentative"
msgstr ""

View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:87
#: lib/mobilizon_web/templates/email/event_updated.html.eex:101
msgid "Go to event page"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70
#: lib/mobilizon_web/templates/email/event_updated.html.eex:99
#: lib/mobilizon_web/templates/email/event_updated.html.eex:113
#: lib/mobilizon_web/templates/email/event_updated.text.eex:21
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:68
#: lib/mobilizon_web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48
#: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:54
msgid "Event has been cancelled"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:50
msgid "Event has been confirmed"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:52
msgid "Event status has been set as tentative"
msgstr ""

View File

@ -153,13 +153,13 @@ msgstr "Lorganizator ven daprovar vòstra participacion. Ara anatz a aques
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:87
#: lib/mobilizon_web/templates/email/event_updated.html.eex:101
msgid "Go to event page"
msgstr "Anar a la pagina de leveniment"
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70
#: lib/mobilizon_web/templates/email/event_updated.html.eex:99
#: lib/mobilizon_web/templates/email/event_updated.html.eex:113
#: lib/mobilizon_web/templates/email/event_updated.text.eex:21
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr ""
@ -240,7 +240,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr "Vòstra participacion a leveniment %{title} es estada regetada"
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:68
#: lib/mobilizon_web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr "Fin de leveniment"
@ -271,7 +271,7 @@ msgid "New title: %{title}"
msgstr "Títol novèl : %{title}"
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr "Debuta de leveniment"
@ -286,7 +286,7 @@ msgid "The event %{title} was updated"
msgstr "Leveniment %{title} es estat actualizat"
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48
#: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr "Títol"
@ -325,3 +325,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:54
msgid "Event has been cancelled"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:50
msgid "Event has been confirmed"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:52
msgid "Event status has been set as tentative"
msgstr ""

View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:87
#: lib/mobilizon_web/templates/email/event_updated.html.eex:101
msgid "Go to event page"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70
#: lib/mobilizon_web/templates/email/event_updated.html.eex:99
#: lib/mobilizon_web/templates/email/event_updated.html.eex:113
#: lib/mobilizon_web/templates/email/event_updated.text.eex:21
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:68
#: lib/mobilizon_web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48
#: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:54
msgid "Event has been cancelled"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:50
msgid "Event has been confirmed"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:52
msgid "Event status has been set as tentative"
msgstr ""

View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:87
#: lib/mobilizon_web/templates/email/event_updated.html.eex:101
msgid "Go to event page"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70
#: lib/mobilizon_web/templates/email/event_updated.html.eex:99
#: lib/mobilizon_web/templates/email/event_updated.html.eex:113
#: lib/mobilizon_web/templates/email/event_updated.text.eex:21
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:68
#: lib/mobilizon_web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48
#: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:54
msgid "Event has been cancelled"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:50
msgid "Event has been confirmed"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:52
msgid "Event status has been set as tentative"
msgstr ""

View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:87
#: lib/mobilizon_web/templates/email/event_updated.html.eex:101
msgid "Go to event page"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70
#: lib/mobilizon_web/templates/email/event_updated.html.eex:99
#: lib/mobilizon_web/templates/email/event_updated.html.eex:113
#: lib/mobilizon_web/templates/email/event_updated.text.eex:21
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:68
#: lib/mobilizon_web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:58
#: lib/mobilizon_web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48
#: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:54
msgid "Event has been cancelled"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:50
msgid "Event has been confirmed"
msgstr ""
#, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:52
msgid "Event status has been set as tentative"
msgstr ""

View File

@ -692,7 +692,7 @@ defmodule MobilizonWeb.Resolvers.EventResolverTest do
actor,
event,
new_event,
MapSet.new([:title, :begins_on, :ends_on])
MapSet.new([:title, :begins_on, :ends_on, :status])
)
)
@ -702,7 +702,7 @@ defmodule MobilizonWeb.Resolvers.EventResolverTest do
participant_actor,
event,
new_event,
MapSet.new([:title, :begins_on, :ends_on])
MapSet.new([:title, :begins_on, :ends_on, :status])
)
)
end