Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
25
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/i18n/en_US.json
View File

@ -13,6 +13,7 @@
"Add": "Add", "Add": "Add",
"Additional comments": "Additional comments", "Additional comments": "Additional comments",
"Administration": "Administration", "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", "Allow all comments": "Allow all comments",
"Approve": "Approve", "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.", "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 request…": "Cancel my participation request…",
"Cancel my participation…": "Cancel my participation…", "Cancel my participation…": "Cancel my participation…",
"Cancel": "Cancel", "Cancel": "Cancel",
"Cancelled: Won't happen": "Cancelled: Won't happen",
"Category": "Category", "Category": "Category",
"Change my identity…": "Change my identity…", "Change my identity…": "Change my identity…",
"Change my password": "Change my password", "Change my password": "Change my password",
@ -70,9 +72,11 @@
"Enter the link URL": "Enter the link URL", "Enter the link URL": "Enter the link URL",
"Error while validating account": "Error while validating account", "Error while validating account": "Error while validating account",
"Event already passed": "Event already passed", "Event already passed": "Event already passed",
"Event cancelled": "Event cancelled",
"Event creation": "Event creation", "Event creation": "Event creation",
"Event edition": "Event edition", "Event edition": "Event edition",
"Event list": "Event list", "Event list": "Event list",
"Event to be confirmed": "Event to be confirmed",
"Event {eventTitle} deleted": "Event {eventTitle} deleted", "Event {eventTitle} deleted": "Event {eventTitle} deleted",
"Event {eventTitle} reported": "Event {eventTitle} reported", "Event {eventTitle} reported": "Event {eventTitle} reported",
"Event": "Event", "Event": "Event",
@ -273,6 +277,5 @@
"{count} participants": "{count} participants", "{count} participants": "{count} participants",
"{count} requests waiting": "{count} requests waiting", "{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.", "{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", "© 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"
} }

7
js/src/i18n/fr_FR.json
View File

@ -15,6 +15,7 @@
"Add": "Ajouter", "Add": "Ajouter",
"Additional comments": "Commentaires additionnels", "Additional comments": "Commentaires additionnels",
"Administration": "Administration", "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", "Allow all comments": "Autoriser tous les commentaires",
"Approve": "Approuver", "Approve": "Approuver",
"Are you going to this event?": "Allez-vous à cet événement ?", "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 request…": "Annuler ma demande de participation…",
"Cancel my participation…": "Annuler ma participation…", "Cancel my participation…": "Annuler ma participation…",
"Cancel": "Annuler", "Cancel": "Annuler",
"Cancelled: Won't happen": "Annulé: N'aura pas lieu",
"Category": "Catégorie", "Category": "Catégorie",
"Change my identity…": "Changer mon identité…", "Change my identity…": "Changer mon identité…",
"Change my password": "Modifier mon mot de passe", "Change my password": "Modifier mon mot de passe",
@ -80,9 +82,11 @@
"Enter the link URL": "Entrez l'URL du lien", "Enter the link URL": "Entrez l'URL du lien",
"Error while validating account": "Erreur lors de la validation du compte", "Error while validating account": "Erreur lors de la validation du compte",
"Event already passed": "Événement déjà passé", "Event already passed": "Événement déjà passé",
"Event cancelled": "Événement annulé",
"Event creation": "Création d'événement", "Event creation": "Création d'événement",
"Event edition": "Édition d'événement", "Event edition": "Édition d'événement",
"Event list": "Liste d'événements", "Event list": "Liste d'événements",
"Event to be confirmed": "Événement à confirmer",
"Event {eventTitle} deleted": "Événement {eventTitle} supprimé", "Event {eventTitle} deleted": "Événement {eventTitle} supprimé",
"Event {eventTitle} reported": "Événement {eventTitle} signalé", "Event {eventTitle} reported": "Événement {eventTitle} signalé",
"Event": "Événement", "Event": "Événement",
@ -312,6 +316,5 @@
"{count} participants": "Un⋅e participant⋅e|{count} participant⋅e⋅s", "{count} participants": "Un⋅e participant⋅e|{count} participant⋅e⋅s",
"{count} requests waiting": "Un⋅e demande en attente|{count} demandes en attente", "{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.", "{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", "© 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"
} }

26
js/src/views/Event/Edit.vue
View File

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

9
js/src/views/Event/Event.vue
View File

@ -34,7 +34,7 @@
</div> </div>
<div class="event-participation has-text-right" v-if="new Date(endDate) > new Date()"> <div class="event-participation has-text-right" v-if="new Date(endDate) > new Date()">
<participation-button <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]" :participation="participations[0]"
:current-actor="currentActor" :current-actor="currentActor"
@joinEvent="joinEvent" @joinEvent="joinEvent"
@ -55,6 +55,10 @@
<div class="column is-three-quarters-desktop"> <div class="column is-three-quarters-desktop">
<p class="tags" v-if="event.tags.length > 0"> <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> <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"> <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.PUBLIC">{{ $t('Public event') }}</b-tag>
<b-tag type="is-info" v-if="event.visibility === EventVisibility.UNLISTED">{{ $t('Private 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 { EVENT_PERSON_PARTICIPATION, FETCH_EVENT, JOIN_EVENT, LEAVE_EVENT } from '@/graphql/event';
import { Component, Prop } from 'vue-property-decorator'; import { Component, Prop } from 'vue-property-decorator';
import { CURRENT_ACTOR_CLIENT } from '@/graphql/actor'; 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 { IPerson, Person } from '@/types/actor';
import { GRAPHQL_API_ENDPOINT } from '@/api/_entrypoint'; import { GRAPHQL_API_ENDPOINT } from '@/api/_entrypoint';
import DateCalendarIcon from '@/components/Event/DateCalendarIcon.vue'; import DateCalendarIcon from '@/components/Event/DateCalendarIcon.vue';
@ -299,6 +303,7 @@ export default class Event extends EventMixin {
isReportModalActive: boolean = false; isReportModalActive: boolean = false;
isJoinModalActive: boolean = false; isJoinModalActive: boolean = false;
EventVisibility = EventVisibility; EventVisibility = EventVisibility;
EventStatus = EventStatus;
RouteName = RouteName; RouteName = RouteName;
get eventTitle() { get eventTitle() {

14
lib/mobilizon_web/templates/email/event_updated.html.eex
View File

@ -42,6 +42,20 @@
<tr> <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;" > <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%"> <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 %> <%= if MapSet.member?(@changes, :title) do %>
<tr> <tr>
<td bgcolor="#ffffff" align="left"> <td bgcolor="#ffffff" align="left">

2
lib/service/events/tools.ex
View File

@ -9,7 +9,7 @@ defmodule Mobilizon.Service.Events.Tool do
alias MobilizonWeb.Email alias MobilizonWeb.Email
alias Mobilizon.Storage.Repo 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( def calculate_event_diff_and_send_notifications(
%Event{} = old_event, %Event{} = old_event,

25
priv/gettext/cs/LC_MESSAGES/default.po
View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58 #: 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" msgid "Go to event page"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70 #: 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 #: 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." msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr "" msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Ending of event"
msgstr "" msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Start of event"
msgstr "" msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48 #: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title" msgid "Title"
msgstr "" msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88 #: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning" msgid "Warning"
msgstr "" 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 ""

25
priv/gettext/de/LC_MESSAGES/default.po
View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58 #: 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" msgid "Go to event page"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70 #: 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 #: 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." msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr "" msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Ending of event"
msgstr "" msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Start of event"
msgstr "" msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48 #: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title" msgid "Title"
msgstr "" msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88 #: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning" msgid "Warning"
msgstr "" 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 ""

25
priv/gettext/default.pot
View File

@ -136,13 +136,13 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58 #: 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" msgid "Go to event page"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70 #: 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 #: 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." msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr "" msgstr ""
@ -221,7 +221,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Ending of event"
msgstr "" msgstr ""
@ -252,7 +252,7 @@ msgid "New title: %{title}"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Start of event"
msgstr "" msgstr ""
@ -267,7 +267,7 @@ msgid "The event %{title} was updated"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48 #: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title" msgid "Title"
msgstr "" msgstr ""
@ -306,3 +306,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88 #: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning" msgid "Warning"
msgstr "" 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 ""

59
priv/gettext/en/LC_MESSAGES/default.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"POT-Creation-Date: \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" "Last-Translator: Thomas Citharel <thomas.citharel@framasoft.org>\n"
"Language-Team: English <https://weblate.framasoft.org/projects/mobilizon/backend/en/>\n" "Language-Team: English <https://weblate.framasoft.org/projects/mobilizon/backend/en/>\n"
"Language: en\n" "Language: en\n"
@ -20,7 +20,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n" "Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Poedit 2.0.6\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." 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." 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" msgid "Feed for %{email} on Mobilizon"
msgstr "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." msgid "%{instance} is a Mobilizon server."
msgstr "%{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" msgid "Ask the community on Framacolibri"
msgstr "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" msgid "Comments"
msgstr "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" msgid "Event"
msgstr "Event" msgstr "Event"
@ -80,7 +84,8 @@ msgstr "Need some help? Something not working properly?"
msgid "New report on %{instance}" msgid "New report on %{instance}"
msgstr "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" msgid "Reason"
msgstr "Reason" msgstr "Reason"
@ -120,15 +125,18 @@ msgstr "Activate my account"
msgid "All good!" msgid "All good!"
msgstr "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!" 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!" 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" msgid "Go to event page"
msgstr "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 #: 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." 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." 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!" msgid "Sorry!"
msgstr "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." msgid "Unfortunately, the organizers rejected your participation."
msgstr "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}" msgid "You requested to participate in event %{title}"
msgstr "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 #: lib/mobilizon_web/templates/email/event_participation_rejected.text.eex:5
msgid "You requested to participate in event %{title}." msgid "You requested to participate in event %{title}."
msgstr "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" msgid "Your participation to event %{title} has been rejected"
msgstr "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" msgid "Ending of event"
msgstr "Ending of event" msgstr "Ending of event"
@ -198,7 +208,8 @@ msgstr "Ending of event"
msgid "Event %{title} has been updated" msgid "Event %{title} has been updated"
msgstr "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!" msgid "Event updated!"
msgstr "Event updated!" msgstr "Event updated!"
@ -214,7 +225,7 @@ msgstr "New date and time for start of event: %{begins_on}"
msgid "New title: %{title}" msgid "New title: %{title}"
msgstr "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" msgid "Start of event"
msgstr "Start of event" msgstr "Start of event"
@ -226,7 +237,7 @@ msgstr "The event %{title} was just updated"
msgid "The event %{title} was updated" msgid "The event %{title} was updated"
msgstr "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" msgid "Title"
msgstr "Title" msgstr "Title"
@ -234,7 +245,8 @@ msgstr "Title"
msgid "View the updated event on: %{link}" msgid "View the updated event on: %{link}"
msgstr "Your participation to event %{title} has been rejected" 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}." msgid "You requested a new password for your account on %{instance}."
msgstr "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 #: 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}." 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 "" 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}."
"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 #: lib/mobilizon_web/templates/email/email.html.eex:90
msgid "This is a demonstration site to test the beta version of Mobilizon." 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 #: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning" msgid "Warning"
msgstr "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"

25
priv/gettext/es/LC_MESSAGES/default.po
View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58 #: 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" msgid "Go to event page"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70 #: 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 #: 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." msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr "" msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Ending of event"
msgstr "" msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Start of event"
msgstr "" msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48 #: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title" msgid "Title"
msgstr "" msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88 #: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning" msgid "Warning"
msgstr "" 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 ""

24
priv/gettext/fr/LC_MESSAGES/default.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"POT-Creation-Date: \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" "Last-Translator: Quentin <quentinantonin@free.fr>\n"
"Language-Team: French <https://weblate.framasoft.org/projects/mobilizon/backend/fr/>\n" "Language-Team: French <https://weblate.framasoft.org/projects/mobilizon/backend/fr/>\n"
"Language: fr_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 !" 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_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" msgid "Go to event page"
msgstr "Aller à la page de l'événement" 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_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 #: 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." 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." 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" msgid "Your participation to event %{title} has been rejected"
msgstr "Votre participation à l'événement %{title} a été rejetée" 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" msgid "Ending of event"
msgstr "Fin de l'événement" 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}" msgid "New title: %{title}"
msgstr "Nouveau titre : %{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" msgid "Start of event"
msgstr "Début de l'événement" 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" msgid "The event %{title} was updated"
msgstr "L'événement %{title} a été mis à jour" 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" msgid "Title"
msgstr "Titre" 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 #: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning" msgid "Warning"
msgstr "Attention" 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 »"

25
priv/gettext/it/LC_MESSAGES/default.po
View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58 #: 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" msgid "Go to event page"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70 #: 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 #: 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." msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr "" msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Ending of event"
msgstr "" msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Start of event"
msgstr "" msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48 #: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title" msgid "Title"
msgstr "" msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88 #: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning" msgid "Warning"
msgstr "" 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 ""

25
priv/gettext/ja/LC_MESSAGES/default.po
View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58 #: 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" msgid "Go to event page"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70 #: 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 #: 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." msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr "" msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Ending of event"
msgstr "" msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Start of event"
msgstr "" msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48 #: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title" msgid "Title"
msgstr "" msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88 #: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning" msgid "Warning"
msgstr "" 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 ""

25
priv/gettext/nl/LC_MESSAGES/default.po
View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58 #: 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" msgid "Go to event page"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70 #: 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 #: 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." msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr "" msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Ending of event"
msgstr "" msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Start of event"
msgstr "" msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48 #: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title" msgid "Title"
msgstr "" msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88 #: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning" msgid "Warning"
msgstr "" 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 ""

25
priv/gettext/oc/LC_MESSAGES/default.po
View File

@ -153,13 +153,13 @@ msgstr "L’organizator ven d’aprovar vòstra participacion. Ara anatz a aques
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58 #: 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" msgid "Go to event page"
msgstr "Anar a la pagina de l’eveniment" msgstr "Anar a la pagina de l’eveniment"
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70 #: 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 #: 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." msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr "" msgstr ""
@ -240,7 +240,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr "Vòstra participacion a l’eveniment %{title} es estada regetada" msgstr "Vòstra participacion a l’eveniment %{title} es estada regetada"
#, elixir-format #, 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" msgid "Ending of event"
msgstr "Fin de l’eveniment" msgstr "Fin de l’eveniment"
@ -271,7 +271,7 @@ msgid "New title: %{title}"
msgstr "Títol novèl : %{title}" msgstr "Títol novèl : %{title}"
#, elixir-format #, 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" msgid "Start of event"
msgstr "Debuta de l’eveniment" msgstr "Debuta de l’eveniment"
@ -286,7 +286,7 @@ msgid "The event %{title} was updated"
msgstr "L’eveniment %{title} es estat actualizat" msgstr "L’eveniment %{title} es estat actualizat"
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48 #: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title" msgid "Title"
msgstr "Títol" msgstr "Títol"
@ -325,3 +325,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88 #: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning" msgid "Warning"
msgstr "" 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 ""

25
priv/gettext/pl/LC_MESSAGES/default.po
View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58 #: 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" msgid "Go to event page"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70 #: 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 #: 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." msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr "" msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Ending of event"
msgstr "" msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Start of event"
msgstr "" msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48 #: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title" msgid "Title"
msgstr "" msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88 #: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning" msgid "Warning"
msgstr "" 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 ""

25
priv/gettext/pt/LC_MESSAGES/default.po
View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58 #: 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" msgid "Go to event page"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70 #: 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 #: 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." msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr "" msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Ending of event"
msgstr "" msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Start of event"
msgstr "" msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48 #: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title" msgid "Title"
msgstr "" msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88 #: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning" msgid "Warning"
msgstr "" 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 ""

25
priv/gettext/ru/LC_MESSAGES/default.po
View File

@ -150,13 +150,13 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:58 #: 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" msgid "Go to event page"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_participation_approved.html.eex:70 #: 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 #: 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." msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr "" msgstr ""
@ -235,7 +235,7 @@ msgid "Your participation to event %{title} has been rejected"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Ending of event"
msgstr "" msgstr ""
@ -266,7 +266,7 @@ msgid "New title: %{title}"
msgstr "" msgstr ""
#, elixir-format #, 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" msgid "Start of event"
msgstr "" msgstr ""
@ -281,7 +281,7 @@ msgid "The event %{title} was updated"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/mobilizon_web/templates/email/event_updated.html.eex:48 #: lib/mobilizon_web/templates/email/event_updated.html.eex:62
msgid "Title" msgid "Title"
msgstr "" msgstr ""
@ -320,3 +320,18 @@ msgstr ""
#: lib/mobilizon_web/templates/email/email.html.eex:88 #: lib/mobilizon_web/templates/email/email.html.eex:88
msgid "Warning" msgid "Warning"
msgstr "" 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 ""

4
test/mobilizon_web/resolvers/event_resolver_test.exs
View File

@ -692,7 +692,7 @@ defmodule MobilizonWeb.Resolvers.EventResolverTest do
actor, actor,
event, event,
new_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, participant_actor,
event, event,
new_event, new_event,
MapSet.new([:title, :begins_on, :ends_on]) MapSet.new([:title, :begins_on, :ends_on, :status])
) )
) )
end end