diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json index 29ee401a..654f4114 100644 --- a/js/src/i18n/en_US.json +++ b/js/src/i18n/en_US.json @@ -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" } \ No newline at end of file diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json index 9a58e5ff..eaeb4b52 100644 --- a/js/src/i18n/fr_FR.json +++ b/js/src/i18n/fr_FR.json @@ -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" } \ No newline at end of file diff --git a/js/src/views/Event/Edit.vue b/js/src/views/Event/Edit.vue index 7a40c6a6..d5996d4f 100644 --- a/js/src/views/Event/Edit.vue +++ b/js/src/views/Event/Edit.vue @@ -140,21 +140,29 @@ {{ $t('Status') }} -
+ <%= if MapSet.member?(@changes, :status) do %>
+
+
+ <% end %>
<%= if MapSet.member?(@changes, :title) do %>
+ <%= 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 %>
+
+
diff --git a/lib/service/events/tools.ex b/lib/service/events/tools.ex
index 902e6ce5..6fd3934a 100644
--- a/lib/service/events/tools.ex
+++ b/lib/service/events/tools.ex
@@ -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,
diff --git a/priv/gettext/cs/LC_MESSAGES/default.po b/priv/gettext/cs/LC_MESSAGES/default.po
index 2af347ae..c7e80486 100644
--- a/priv/gettext/cs/LC_MESSAGES/default.po
+++ b/priv/gettext/cs/LC_MESSAGES/default.po
@@ -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 ""
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 2af3f49f..82ca48be 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -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 ""
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 7bd30ae1..083a2ee6 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -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 ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 294a2c26..230033aa 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -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