Merge remote-tracking branch 'origin/main'

.sobelow-skips

@@ -1,15 +1,15 @@
 
 155A1FB53DE39EC8EFCFD7FB94EA823D
 1C29EE70E90ECED01AF28EC58D2575B5
+26ED12A8E03D044BEDC08749BAA5E357
+2BB1D36656B423758A470021718FCB09
 31CE26BC979C57B9E3CC97B40C290CE5
 3529E7A4CECC24D02678820E6F521162
-37E854EA3BDF7275C6A7631F80804EC4
+3644C4E850300482AA409471EFE1EFB3
 4E7C044C59E0BCB76AA826789998F624
 53CBBEB6243FAF5C37249CBA17DE6F4C
 5BCE3651A03711295046DE48BDFE007E
-5C16A2AE6A24E4795F95DDE20EEC458E
 5C4CED447689F00D9D1ACEB9B895ED29
-630C0972985257251EDF89A7117DE423
 94ACF7B17C3FF42F64E57DD1DA936BD8
 A32E125003F1EDFAD95C487C6A969725
 ACF6272A1DBB3A2ABD96C0C120B5CA69

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 4.0.0-beta.2 (2023-12-01)
+
+* test: fix tests using verified routes ([5fcf3d5](https://framagit.org/framasoft/mobilizon/commits/5fcf3d5))
+* feat: add links to cancel anonymous participations in emails ([9e6b232](https://framagit.org/framasoft/mobilizon/commits/9e6b232))
+* feat(background): add a job to refresh participant stats ([11e42d6](https://framagit.org/framasoft/mobilizon/commits/11e42d6))
+* feat(front): add dedicated page and route for event announcements ([d831dff](https://framagit.org/framasoft/mobilizon/commits/d831dff))
+* chore(i18n): update backend translations ([6df16ef](https://framagit.org/framasoft/mobilizon/commits/6df16ef))
+* fix: fix creating participant stats ([3f2a88f](https://framagit.org/framasoft/mobilizon/commits/3f2a88f))
+* refactor: use Phoenix verified routes ([b315e1d](https://framagit.org/framasoft/mobilizon/commits/b315e1d))
+
 ## 4.0.0-beta.1 (2023-11-30)
 
 * fix: add a final fallback if we have default_language: nil in instance config ([cd53062](https://framagit.org/framasoft/mobilizon/commits/cd53062))

config/config.exs

@@ -325,6 +325,7 @@ config :mobilizon, Oban,
        {"@hourly", Mobilizon.Service.Workers.ExportCleanerWorker, queue: :background},
        {"@hourly", Mobilizon.Service.Workers.SendActivityRecapWorker, queue: :notifications},
        {"@daily", Mobilizon.Service.Workers.CleanOldActivityWorker, queue: :background},
+       {"@daily", Mobilizon.Service.Workers.RefreshParticipantStats, queue: :background},
        {"@hourly", Mobilizon.Service.Workers.CleanApplicationData,
         queue: :background, args: %{type: :application_token}},
        {"@hourly", Mobilizon.Service.Workers.CleanApplicationData,

lib/federation/web_finger/web_finger.ex

@@ -14,7 +14,7 @@ defmodule Mobilizon.Federation.WebFinger do
   alias Mobilizon.Federation.WebFinger.XmlBuilder
   alias Mobilizon.Service.HTTP.{HostMetaClient, WebfingerClient}
   alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   require Jason
   require Logger
   import SweetXml
@@ -85,7 +85,7 @@ defmodule Mobilizon.Federation.WebFinger do
         %{"rel" => "self", "type" => "application/activity+json", "href" => actor.url},
         %{
           "rel" => "http://ostatus.org/schema/1.0/subscribe",
-          "template" => "#{Routes.page_url(Endpoint, :interact, uri: nil)}{uri}"
+          "template" => "#{url(~p"/interact?#{[uri: nil]}")}{uri}"
         }
       ]
       |> maybe_add_avatar(actor)

lib/graphql/resolvers/participant.ex

@@ -176,7 +176,9 @@ defmodule Mobilizon.GraphQL.Resolvers.Participant do
 
         case Participations.leave(event, actor, %{local: false, cancellation_token: token}) do
           {:ok, _activity, %Participant{id: participant_id} = _participant} ->
-            {:ok, %{event: %{id: event_id}, actor: %{id: actor_id}, id: participant_id}}
+            {:ok, %Event{} = event} = Events.get_event_with_preload(event_id)
+            %Actor{} = actor = Actors.get_actor_with_preload!(actor_id)
+            {:ok, %{event: event, actor: actor, id: participant_id}}
 
           {:error, :is_only_organizer} ->
             {:error,
@@ -202,8 +204,11 @@ defmodule Mobilizon.GraphQL.Resolvers.Participant do
     with {:is_owned, %Actor{} = actor} <- User.owns_actor(user, actor_id),
          {:has_event, {:ok, %Event{} = event}} <-
            {:has_event, Events.get_event_with_preload(event_id)},
-         {:ok, _activity, _participant} <- Participations.leave(event, actor) do
-      {:ok, %{event: %{id: event_id}, actor: %{id: actor_id}}}
+         {:ok, _activity, %Participant{id: participant_id} = _participant} <-
+           Participations.leave(event, actor) do
+      {:ok, %Event{} = event} = Events.get_event_with_preload(event_id)
+      %Actor{} = actor = Actors.get_actor_with_preload!(actor_id)
+      {:ok, %{event: event, actor: actor, id: participant_id}}
     else
       {:has_event, _} ->
         {:error, "Event with this ID #{inspect(event_id)} doesn't exist"}

lib/graphql/schema/events/participant.ex

@@ -90,8 +90,8 @@ defmodule Mobilizon.GraphQL.Schema.Events.ParticipantType do
   object :deleted_participant do
     meta(:authorize, :all)
     field(:id, :id, description: "The participant ID")
-    field(:event, :deleted_object, description: "The participant's event")
-    field(:actor, :deleted_object, description: "The participant's actor")
+    field(:event, :event, description: "The participant's event")
+    field(:actor, :actor, description: "The participant's actor")
   end
 
   object :participant_mutations do

lib/mix/tasks/mobilizon/maintenance/detect_spam.ex

@@ -9,8 +9,7 @@ defmodule Mix.Tasks.Mobilizon.Maintenance.DetectSpam do
   alias Mobilizon.Service.AntiSpam
   import Mix.Tasks.Mobilizon.Common
   alias Mobilizon.Federation.ActivityPub.Actions
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
 
   @shortdoc "Scan all profiles and events against spam detector and report them"
 
@@ -163,9 +162,7 @@ defmodule Mix.Tasks.Mobilizon.Maintenance.DetectSpam do
   end
 
   defp handle_spam_event(event_id, event_title, event_uuid, organizer_actor_id, options) do
-    shell_info(
-      "Detected event #{event_title} as spam: #{Routes.page_url(Endpoint, :event, event_uuid)}"
-    )
+    shell_info("Detected event #{event_title} as spam: #{url(~p"/events/#{event_uuid}")}")
 
     unless dry_run?(options) do
       report_spam_event(event_id, event_title, organizer_actor_id, options)

lib/mobilizon/actors/actor.ex

@@ -19,6 +19,7 @@ defmodule Mobilizon.Actors.Actor do
 
   alias Mobilizon.Web.Endpoint
   alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   import Mobilizon.Web.Gettext, only: [dgettext: 2]
   import Mobilizon.Service.Guards, only: [is_valid_string: 1]
 
@@ -445,7 +446,7 @@ defmodule Mobilizon.Actors.Actor do
 
   # Relay has a special URI
   def build_url("relay", :page, _args),
-    do: Endpoint |> Routes.activity_pub_url(:relay) |> URI.decode()
+    do: ~p"/relay" |> url() |> URI.decode()
 
   def build_url(preferred_username, endpoint, args)
       when endpoint in [:page, :resources, :posts, :discussions, :events, :todos] do

lib/mobilizon/discussions/comment.ex

@@ -15,8 +15,7 @@ defmodule Mobilizon.Discussions.Comment do
   alias Mobilizon.Medias.Media
   alias Mobilizon.Mention
 
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
 
   @type t :: %__MODULE__{
           text: String.t(),
@@ -160,7 +159,7 @@ defmodule Mobilizon.Discussions.Comment do
   end
 
   @spec generate_url(String.t()) :: String.t()
-  defp generate_url(uuid), do: Routes.page_url(Endpoint, :comment, uuid)
+  defp generate_url(uuid), do: url(~p"/comments/#{uuid}")
 
   @spec put_tags(Ecto.Changeset.t(), map) :: Ecto.Changeset.t()
   defp put_tags(changeset, %{"tags" => tags}),

lib/mobilizon/discussions/discussion.ex

@@ -27,8 +27,7 @@ defmodule Mobilizon.Discussions.Discussion do
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Discussions.Comment
   alias Mobilizon.Discussions.Discussion.TitleSlug
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   import Mobilizon.Web.Gettext, only: [dgettext: 2]
 
   @type t :: %__MODULE__{
@@ -101,5 +100,5 @@ defmodule Mobilizon.Discussions.Discussion do
 
   @spec generate_url(String.t(), String.t()) :: String.t()
   defp generate_url(preferred_username, slug),
-    do: Routes.page_url(Endpoint, :discussion, preferred_username, slug)
+    do: url(~p"/@:#{preferred_username}/c/#{slug}")
 end

lib/mobilizon/events/event.ex

@@ -32,8 +32,7 @@ defmodule Mobilizon.Events.Event do
   alias Mobilizon.Medias.Media
   alias Mobilizon.Storage.Repo
 
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
 
   @type t :: %__MODULE__{
           id: integer(),
@@ -140,7 +139,7 @@ defmodule Mobilizon.Events.Event do
   @spec changeset(t | Ecto.Schema.t(), map) :: Changeset.t()
   def changeset(%__MODULE__{} = event, attrs) do
     attrs = Map.update(attrs, :uuid, Ecto.UUID.generate(), &(&1 || Ecto.UUID.generate()))
-    attrs = Map.update(attrs, :url, Routes.page_url(Endpoint, :event, attrs.uuid), & &1)
+    attrs = Map.update(attrs, :url, url(~p"/events/#{attrs.uuid}"), & &1)
 
     event
     |> cast(attrs, @attrs)

lib/mobilizon/events/events.ex

@@ -1105,7 +1105,7 @@ defmodule Mobilizon.Events do
   defp increase_participant_stats(participant_stats, nil), do: participant_stats
 
   defp increase_participant_stats(participant_stats, role),
-    do: Map.update(participant_stats, role, 0, &(&1 + 1))
+    do: Map.update(participant_stats, role, 1, &(&1 + 1))
 
   defp decrease_participant_stats(participant_stats, nil), do: participant_stats
 

lib/mobilizon/posts/post.ex

@@ -27,8 +27,7 @@ defmodule Mobilizon.Posts.Post do
   alias Mobilizon.Medias.Media
   alias Mobilizon.Posts.Post.TitleSlug
   alias Mobilizon.Posts.PostVisibility
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   import Mobilizon.Web.Gettext
 
   @type t :: %__MODULE__{
@@ -128,7 +127,7 @@ defmodule Mobilizon.Posts.Post do
 
   @spec generate_url(String.t()) :: String.t()
   defp generate_url(id_and_slug) when is_binary(id_and_slug),
-    do: Routes.page_url(Endpoint, :post, id_and_slug)
+    do: url(~p"/p/#{id_and_slug}")
 
   defp generate_url(_), do: nil
 

lib/service/activity/renderer/comment.ex

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Comment do
   alias Mobilizon.Activities.Activity
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Service.Activity.Renderer
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   import Mobilizon.Web.Gettext, only: [dgettext: 3]
 
   @behaviour Renderer
@@ -78,11 +77,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Comment do
   end
 
   defp event_url(activity) do
-    Routes.page_url(
-      Endpoint,
-      :event,
-      activity.subject_params["event_uuid"]
-    )
+    url(~p"/events/#{activity.subject_params["event_uuid"]}")
   end
 
   defp event_comment_url(activity) do

lib/service/activity/renderer/conversation.ex

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Conversation do
   alias Mobilizon.Activities.Activity
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Service.Activity.Renderer
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   import Mobilizon.Web.Gettext, only: [dgettext: 3]
 
   @behaviour Renderer
@@ -61,11 +60,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Conversation do
   end
 
   defp conversation_url(activity) do
-    Routes.page_url(
-      Endpoint,
-      :conversation,
-      activity.subject_params["conversation_id"]
-    )
+    url(~p"/conversations/#{activity.subject_params["conversation_id"]}")
   end
 
   defp profile(activity), do: Actor.display_name_and_username(activity.author)

lib/service/activity/renderer/discussion.ex

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Discussion do
   alias Mobilizon.Activities.Activity
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Service.Activity.Renderer
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   import Mobilizon.Web.Gettext, only: [dgettext: 3]
 
   @behaviour Renderer
@@ -113,12 +112,8 @@ defmodule Mobilizon.Service.Activity.Renderer.Discussion do
   end
 
   defp discussion_url(activity) do
-    Endpoint
-    |> Routes.page_url(
-      :discussion,
-      Actor.preferred_username_and_domain(activity.group),
-      activity.subject_params["discussion_slug"]
-    )
+    ~p"/@#{Actor.preferred_username_and_domain(activity.group)}/c/#{activity.subject_params["discussion_slug"]}"
+    |> url()
     |> URI.decode()
   end
 

lib/service/activity/renderer/event.ex

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Event do
   alias Mobilizon.Activities.Activity
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Service.Activity.Renderer
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   import Mobilizon.Web.Gettext, only: [dgettext: 3]
 
   @behaviour Renderer
@@ -81,11 +80,8 @@ defmodule Mobilizon.Service.Activity.Renderer.Event do
   end
 
   defp event_url(activity) do
-    Endpoint
-    |> Routes.page_url(
-      :event,
-      activity.subject_params["event_uuid"]
-    )
+    ~p"/events/#{activity.subject_params["event_uuid"]}"
+    |> url()
     |> URI.decode()
   end
 

lib/service/activity/renderer/group.ex

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Group do
   alias Mobilizon.Activities.Activity
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Service.Activity.Renderer
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   import Mobilizon.Web.Gettext, only: [dgettext: 3]
 
   @behaviour Renderer
@@ -30,8 +29,8 @@ defmodule Mobilizon.Service.Activity.Renderer.Group do
   end
 
   defp group_url(activity) do
-    Endpoint
-    |> Routes.page_url(:actor, Actor.preferred_username_and_domain(activity.group))
+    ~p"/@#{Actor.preferred_username_and_domain(activity.group)}"
+    |> url()
     |> URI.decode()
   end
 

lib/service/activity/renderer/member.ex

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Member do
   alias Mobilizon.Activities.Activity
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Service.Activity.Renderer
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   import Mobilizon.Web.Gettext, only: [dgettext: 3]
 
   @behaviour Renderer
@@ -81,12 +80,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Member do
 
   defp member_url(activity) do
     group_url =
-      Endpoint
-      |> Routes.page_url(
-        :actor,
-        Actor.preferred_username_and_domain(activity.group)
-      )
-      |> URI.decode()
+      ~p"/@#{Actor.preferred_username_and_domain(activity.group)}" |> url() |> URI.decode()
 
     "#{group_url}/settings/members"
   end

lib/service/activity/renderer/post.ex

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Post do
   alias Mobilizon.Activities.Activity
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Service.Activity.Renderer
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   import Mobilizon.Web.Gettext, only: [dgettext: 3]
 
   @behaviour Renderer
@@ -52,12 +51,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Post do
   end
 
   defp post_url(activity) do
-    Endpoint
-    |> Routes.page_url(
-      :post,
-      activity.subject_params["post_slug"]
-    )
-    |> URI.decode()
+    URI.decode(~p"/p/#{activity.subject_params["post_slug"]}")
   end
 
   defp profile(activity), do: Actor.display_name_and_username(activity.author)

lib/service/activity/renderer/resource.ex

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Resource do
   alias Mobilizon.Activities.Activity
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Service.Activity.Renderer
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   import Mobilizon.Web.Gettext, only: [dgettext: 3]
 
   @behaviour Renderer
@@ -73,8 +72,8 @@ defmodule Mobilizon.Service.Activity.Renderer.Resource do
   end
 
   defp resource_url(activity) do
-    Endpoint
-    |> Routes.page_url(:resource, activity.subject_params["resource_uuid"])
+    ~p"/resource/#{activity.subject_params["resource_uuid"]}"
+    |> url()
     |> URI.decode()
   end
 

lib/service/auth/applications.ex

@@ -8,7 +8,7 @@ defmodule Mobilizon.Service.Auth.Applications do
   alias Mobilizon.Service.Auth.Authenticator
   alias Mobilizon.Users.User
   alias Mobilizon.Web.Auth.Guardian
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   require Logger
 
   @app_access_tokens_ttl {8, :hour}
@@ -260,8 +260,7 @@ defmodule Mobilizon.Service.Auth.Applications do
     with {:app, %Application{scope: app_scope} = application} <-
            {:app, Applications.get_application_by_client_id(client_id)},
          {device_code, user_code, verification_uri} <-
-           {string_of_length(40), string_of_length(8),
-            Routes.page_url(Mobilizon.Web.Endpoint, :auth_device)},
+           {string_of_length(40), string_of_length(8), url(~p"/login/device")},
          {:scope_included, true} <- {:scope_included, request_scope_valid?(app_scope, scope)},
          {:ok, %ApplicationDeviceActivation{} = application_device_activation} <-
            Applications.create_application_device_activation(%{

lib/service/export/feed.ex

@@ -15,7 +15,7 @@ defmodule Mobilizon.Service.Export.Feed do
   alias Mobilizon.Users.User
 
   alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
 
   require Logger
 
@@ -104,10 +104,7 @@ defmodule Mobilizon.Service.Export.Feed do
   defp build_actor_feed(%Actor{} = actor, events, posts, public \\ true) do
     display_name = Actor.display_name(actor)
 
-    self_url =
-      Endpoint
-      |> Routes.feed_url(:actor, actor.preferred_username, "atom")
-      |> URI.decode()
+    self_url = ~p"/@#{actor.preferred_username}/feed/atom" |> url() |> URI.decode()
 
     title =
       if public,
@@ -215,7 +212,7 @@ defmodule Mobilizon.Service.Export.Feed do
   # Build an atom feed from actor and its public events
   @spec build_user_feed(list(Event.t()), User.t(), String.t()) :: String.t()
   defp build_user_feed(events, %User{email: email}, token) do
-    self_url = Endpoint |> Routes.feed_url(:going, token, "atom") |> URI.decode()
+    self_url = ~p"/events/going/#{token}/format" |> url() |> URI.decode()
 
     # Title uses default instance language
     self_url

lib/service/metadata/actor.ex

@@ -2,9 +2,8 @@ defimpl Mobilizon.Service.Metadata, for: Mobilizon.Actors.Actor do
   alias Phoenix.HTML
   alias Phoenix.HTML.Tag
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Web.Endpoint
   alias Mobilizon.Web.JsonLD.ObjectView
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
 
   import Mobilizon.Service.Metadata.Utils,
     only: [process_description: 2, default_description: 1, escape_text: 1]
@@ -25,13 +24,7 @@ defimpl Mobilizon.Service.Metadata, for: Mobilizon.Actors.Actor do
       Tag.tag(:meta, property: "og:title", content: actor_display_name_escaped(group)),
       Tag.tag(:meta,
         property: "og:url",
-        content:
-          Endpoint
-          |> Routes.page_url(
-            :actor,
-            Actor.preferred_username_and_domain(group)
-          )
-          |> URI.decode()
+        content: ~p"/@#{Actor.preferred_username_and_domain(group)}" |> url() |> URI.decode()
       ),
       Tag.tag(:meta, property: "og:description", content: group.summary),
       Tag.tag(:meta, property: "og:type", content: "profile"),
@@ -92,19 +85,14 @@ defimpl Mobilizon.Service.Metadata, for: Mobilizon.Actors.Actor do
           type: "application/atom+xml",
           title: gettext("%{name}'s feed", name: actor_display_name_escaped(group)) |> HTML.raw(),
           href:
-            Routes.feed_url(Endpoint, :actor, Actor.preferred_username_and_domain(group), :atom)
+            ~p"/@#{Actor.preferred_username_and_domain(group)}/feed/atom" |> url() |> URI.decode()
         ),
         Tag.tag(:link,
           rel: "alternate",
           type: "text/calendar",
           title: gettext("%{name}'s feed", name: actor_display_name_escaped(group)) |> HTML.raw(),
           href:
-            Routes.feed_url(
-              Endpoint,
-              :actor,
-              Actor.preferred_username_and_domain(group),
-              :ics
-            )
+            ~p"/@#{Actor.preferred_username_and_domain(group)}/feed/ics" |> url() |> URI.decode()
         ),
         Tag.tag(:link,
           rel: "alternate",

lib/service/metadata/event.ex

@@ -6,7 +6,7 @@ defimpl Mobilizon.Service.Metadata, for: Mobilizon.Events.Event do
   alias Mobilizon.Events.{Event, EventOptions}
   alias Mobilizon.Web.Endpoint
   alias Mobilizon.Web.JsonLD.ObjectView
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
 
   import Mobilizon.Service.Metadata.Utils,
     only: [
@@ -56,11 +56,8 @@ defimpl Mobilizon.Service.Metadata, for: Mobilizon.Events.Event do
                 "position" => 1,
                 "name" => event.attributed_to |> Actor.display_name() |> escape_text(),
                 "item" =>
-                  Endpoint
-                  |> Routes.page_url(
-                    :actor,
-                    Actor.preferred_username_and_domain(event.attributed_to)
-                  )
+                  ~p"/@#{Actor.preferred_username_and_domain(event.attributed_to)}"
+                  |> url()
                   |> URI.decode()
               },
               %{

lib/service/metadata/instance.ex

@@ -9,7 +9,7 @@ defmodule Mobilizon.Service.Metadata.Instance do
   alias Mobilizon.Config
   alias Mobilizon.Service.Metadata.Utils
   alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   import Mobilizon.Web.Gettext
 
   @doc """
@@ -58,13 +58,13 @@ defmodule Mobilizon.Service.Metadata.Instance do
         rel: "alternate",
         type: "application/atom+xml",
         title: gettext("%{name}'s feed", name: Config.instance_name()) |> HTML.raw(),
-        href: Routes.feed_url(Endpoint, :instance, :atom)
+        href: url(~p"/feed/instance/atom")
       ),
       Tag.tag(:link,
         rel: "alternate",
         type: "text/calendar",
         title: gettext("%{name}'s feed", name: Config.instance_name()) |> HTML.raw(),
-        href: Routes.feed_url(Endpoint, :instance, :ics)
+        href: url(~p"/feed/instance/ics")
       )
     ]
   end

lib/service/metadata/post.ex

@@ -4,9 +4,8 @@ defimpl Mobilizon.Service.Metadata, for: Mobilizon.Posts.Post do
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Medias.{File, Media}
   alias Mobilizon.Posts.Post
-  alias Mobilizon.Web.Endpoint
+  use Mobilizon.Web, :verified_routes
   alias Mobilizon.Web.JsonLD.ObjectView
-  alias Mobilizon.Web.Router.Helpers, as: Routes
 
   import Mobilizon.Service.Metadata.Utils,
     only: [process_description: 2, strip_tags: 1, escape_text: 1]
@@ -35,11 +34,8 @@ defimpl Mobilizon.Service.Metadata, for: Mobilizon.Posts.Post do
           "position" => 1,
           "name" => post.attributed_to |> Actor.display_name() |> escape_text,
           "item" =>
-            Endpoint
-            |> Routes.page_url(
-              :actor,
-              Actor.preferred_username_and_domain(post.attributed_to)
-            )
+            ~p"/@#{Actor.preferred_username_and_domain(post.attributed_to)}"
+            |> url()
             |> URI.decode()
         },
         %{

lib/service/site_map.ex

@@ -6,14 +6,14 @@ defmodule Mobilizon.Service.SiteMap do
   alias Mobilizon.{Actors, Events, Posts}
   alias Mobilizon.Storage.Repo
   alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
 
   @default_static_frequency :monthly
 
   @spec generate_sitemap :: {:ok, :ok}
   def generate_sitemap do
     static_routes = [
-      {Routes.page_url(Endpoint, :index, []), :daily},
+      {url(~p"/*path"), :daily},
       "#{Endpoint.url()}/search",
       "#{Endpoint.url()}/about/instance",
       "#{Endpoint.url()}/terms",

lib/service/workers/refresh_participant_stats.ex

@@ -0,0 +1,61 @@
+defmodule Mobilizon.Service.Workers.RefreshParticipantStats do
+  @moduledoc """
+  Worker to refresh the participant event stats based on participants data
+  """
+
+  use Oban.Worker, unique: [period: :infinity, keys: [:event_uuid, :action]]
+
+  alias Mobilizon.Events
+  alias Mobilizon.Events.{Event, Participant}
+  alias Mobilizon.Storage.Page
+  alias Oban.Job
+  require Logger
+
+  @impl Oban.Worker
+  @spec perform(Oban.Job.t()) :: :ok
+  def perform(%Job{}) do
+    refresh_participant_stats()
+  end
+
+  def refresh_participant_stats do
+    Logger.info("Launching RefreshParticipantStats job")
+    %Page{elements: future_events} = Events.list_events(1, 100_000_000)
+
+    updated_events_count =
+      Enum.reduce(future_events, 0, fn %Event{} = event, updated_events_count ->
+        participants = Events.list_all_participants_for_event(event.id)
+
+        participant_stats =
+          Enum.reduce(
+            participants,
+            %{
+              not_approved: 0,
+              not_confirmed: 0,
+              rejected: 0,
+              participant: 0,
+              moderator: 0,
+              administrator: 0,
+              creator: 0
+            },
+            fn %Participant{role: role}, acc ->
+              Map.update(acc, role, 1, &(&1 + 1))
+            end
+          )
+
+        if participant_stats != Map.from_struct(event.participant_stats) do
+          Logger.debug("Uupdating event #{event.id} because of wrong participant_stats")
+
+          Events.update_event(event, %{
+            participant_stats: participant_stats
+          })
+
+          updated_events_count + 1
+        else
+          Logger.debug("Skipped updating event #{event.id}")
+          updated_events_count
+        end
+      end)
+
+    Logger.info("Updated #{updated_events_count} events on #{length(future_events)}")
+  end
+end

lib/web/cache/activity_pub.ex

@@ -13,8 +13,7 @@ defmodule Mobilizon.Web.Cache.ActivityPub do
   alias Mobilizon.Posts.Post
   alias Mobilizon.Resources.Resource
   alias Mobilizon.Todos.{Todo, TodoList}
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
 
   @cache :activity_pub
 
@@ -73,7 +72,7 @@ defmodule Mobilizon.Web.Cache.ActivityPub do
           {:commit, event}
 
         nil ->
-          with url <- Routes.page_url(Endpoint, :event, uuid),
+          with url <- url(~p"/events/#{uuid}"),
                %Tombstone{} = tomstone <- Tombstone.find_tombstone(url) do
             tomstone
           else

lib/web/controllers/application_controller.ex

@@ -111,12 +111,7 @@ defmodule Mobilizon.Web.ApplicationController do
          is_binary(state) and is_binary(scope) do
       redirect(conn,
         to:
-          Routes.page_path(conn, :authorize,
-            client_id: client_id,
-            redirect_uri: redirect_uri,
-            scope: scope,
-            state: state
-          )
+          ~p"/oauth/autorize_approve?#{[client_id: client_id, redirect_uri: redirect_uri, scope: scope, state: state]}"
       )
     else
       if is_binary(redirect_uri) and valid_uri?(redirect_uri) do

lib/web/controllers/node_info_controller.ex

@@ -9,9 +9,6 @@ defmodule Mobilizon.Web.NodeInfoController do
   alias Mobilizon.Config
   alias Mobilizon.Service.Statistics
 
-  alias Mobilizon.Web.Endpoint
-  alias Mobilizon.Web.Router.Helpers, as: Routes
-
   @node_info_supported_versions ["2.0", "2.1"]
   @node_info_schema_uri "http://nodeinfo.diaspora.software/ns/schema/"
 
@@ -22,7 +19,7 @@ defmodule Mobilizon.Web.NodeInfoController do
       |> Enum.map(fn version ->
         %{
           rel: @node_info_schema_uri <> version,
-          href: Routes.node_info_url(Endpoint, :nodeinfo, version)
+          href: url(~p"/.well-known/nodeinfo/#{version}")
         }
       end)
 

lib/web/controllers/page_controller.ex

@@ -26,6 +26,8 @@ defmodule Mobilizon.Web.PageController do
   defdelegate moderation_report(conn, params), to: PageController, as: :index
   @spec participation_email_confirmation(Plug.Conn.t(), any) :: Plug.Conn.t()
   defdelegate participation_email_confirmation(conn, params), to: PageController, as: :index
+  @spec participation_email_cancellation(Plug.Conn.t(), any) :: Plug.Conn.t()
+  defdelegate participation_email_cancellation(conn, params), to: PageController, as: :index
   @spec user_email_validation(Plug.Conn.t(), any) :: Plug.Conn.t()
   defdelegate user_email_validation(conn, params), to: PageController, as: :index
   @spec my_groups(Plug.Conn.t(), any) :: Plug.Conn.t()

lib/web/email/participation.ex

@@ -99,6 +99,7 @@ defmodule Mobilizon.Web.Email.Participation do
       locale: locale,
       event: event,
       jsonLDMetadata: json_ld(participant),
+      participant: participant,
       subject: subject
     })
   end
@@ -123,6 +124,7 @@ defmodule Mobilizon.Web.Email.Participation do
       locale: locale,
       event: event,
       jsonLDMetadata: json_ld(participant),
+      participant: participant,
       subject: subject
     })
   end

lib/web/router.ex

@@ -195,6 +195,12 @@ defmodule Mobilizon.Web.Router do
 
     get("/participation/email/confirm/:token", PageController, :participation_email_confirmation)
 
+    get(
+      "/participation/email/cancel/:uuid/:token",
+      PageController,
+      :participation_email_cancellation
+    )
+
     get("/validate/email/:token", PageController, :user_email_validation)
 
     get("/groups/me", PageController, :my_groups)

lib/web/templates/email/activity/_comment_activity_item.html.heex

@@ -3,9 +3,7 @@
     <%= dgettext("activity", "%{profile} mentionned you in a comment under event %{event}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       event:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-        :event,
-        @activity.subject_params["event_uuid"]) |> URI.decode()}\">
+        "<a href=\"#{~p"/events/#{@activity.subject_params["event_uuid"]}" |> url() |> URI.decode()}\">
                             #{escape_html(@activity.subject_params["event_title"])}
                         </a>"
     })
@@ -14,9 +12,7 @@
     <%= dgettext("activity", "%{profile} has posted an announcement under event %{event}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       event:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-        :event,
-        @activity.subject_params["event_uuid"]) |> URI.decode()}\">
+        "<a href=\"#{~p"/events/#{@activity.subject_params["event_uuid"]}" |> url() |> URI.decode()}\">
                             #{escape_html(@activity.subject_params["event_title"])}
                         </a>"
     })
@@ -26,9 +22,7 @@
       <%= dgettext("activity", "%{profile} has posted a new reply under your event %{event}.", %{
         profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
         event:
-          "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-          :event,
-          @activity.subject_params["event_uuid"]) |> URI.decode()}#comment-#{@activity.subject_params["comment_reply_to_uuid"]}-#{@activity.subject_params["comment_uuid"]}\">
+          "<a href=\"#{~p"/events/#{@activity.subject_params["event_uuid"]}" |> url() |> URI.decode()}#comment-#{@activity.subject_params["comment_reply_to_uuid"]}-#{@activity.subject_params["comment_uuid"]}\">
                                 #{escape_html(@activity.subject_params["event_title"])}
                             </a>"
       })
@@ -40,9 +34,7 @@
         %{
           profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
           event:
-            "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-            :event,
-            @activity.subject_params["event_uuid"]) |> URI.decode()}#comment-#{@activity.subject_params["comment_uuid"]}\">
+            "<a href=\"#{~p"/events/#{@activity.subject_params["event_uuid"]}" |> url() |> URI.decode()}#comment-#{@activity.subject_params["comment_uuid"]}\">
                                 #{escape_html(@activity.subject_params["event_title"])}
                             </a>"
         }

lib/web/templates/email/activity/_comment_activity_item.text.eex

@@ -4,22 +4,22 @@
         event: @activity.subject_params["event_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @activity.subject_params["event_uuid"]) |> URI.decode() %><% :participation_event_comment -> %><%= dgettext("activity", "%{profile} has posted an announcement under event %{event}.",
+<%= url(~p"/events/#{@activity.subject_params["event_uuid"]}") |> URI.decode() %><% :participation_event_comment -> %><%= dgettext("activity", "%{profile} has posted an announcement under event %{event}.",
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         event: @activity.subject_params["event_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @activity.subject_params["event_uuid"]) |> URI.decode() %><% :event_new_comment -> %><%= if @activity.subject_params["comment_reply_to"] do %><%=dgettext("activity", "%{profile} has posted a new reply under your event %{event}.",
+<%= url(~p"/events/#{@activity.subject_params["event_uuid"]}") |> URI.decode() %><% :event_new_comment -> %><%= if @activity.subject_params["comment_reply_to"] do %><%=dgettext("activity", "%{profile} has posted a new reply under your event %{event}.",
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         event: @activity.subject_params["event_title"]
     }
 ) %>
-<%= "#{Routes.page_url(Mobilizon.Web.Endpoint, :event, @activity.subject_params["event_uuid"]) |> URI.decode()}#comment-#{@activity.subject_params["comment_reply_to_uuid"]}-#{@activity.subject_params["comment_uuid"]}" %><% else %><%= dgettext("activity", "%{profile} has posted a new comment under your event %{event}.", 
+<%= "#{url(~p"/events/#{@activity.subject_params["event_uuid"]}") |> URI.decode()}#comment-#{@activity.subject_params["comment_reply_to_uuid"]}-#{@activity.subject_params["comment_uuid"]}" %><% else %><%= dgettext("activity", "%{profile} has posted a new comment under your event %{event}.", 
 %{
     profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
     event: @activity.subject_params["event_title"]
 }
 ) %>
-<%= "#{Routes.page_url(Mobilizon.Web.Endpoint, :event, @activity.subject_params["event_uuid"]) |> URI.decode()}#comment-#{@activity.subject_params["comment_uuid"]}"%><% end %><% end %>
+<%= "#{url(~p"/events/#{@activity.subject_params["event_uuid"]}") |> URI.decode()}#comment-#{@activity.subject_params["comment_uuid"]}"%><% end %><% end %>

lib/web/templates/email/activity/_conversation_activity_item.html.heex

@@ -3,18 +3,14 @@
     <%= dgettext("activity", "%{profile} mentionned you in a %{conversation}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       conversation:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-        :conversation,
-        @activity.subject_params["conversation_participant_id"]) |> URI.decode()}\">conversation</a>"
+        "<a href=\"#{~p"/conversations/#{@activity.subject_params["conversation_participant_id"]}" |> url() |> URI.decode()}\">conversation</a>"
     })
     |> raw %>
   <% :conversation_replied -> %>
     <%= dgettext("activity", "%{profile} replied you in a %{conversation}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       conversation:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-        :conversation,
-        @activity.subject_params["conversation_participant_id"]) |> URI.decode()}\">conversation</a>"
+        "<a href=\"#{~p"/conversations/#{@activity.subject_params["conversation_participant_id"]}" |> url() |> URI.decode()}\">conversation</a>"
     })
     |> raw %>
 <% end %>

lib/web/templates/email/activity/_conversation_activity_item.text.eex

@@ -3,9 +3,9 @@
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :conversation, @activity.subject_params["conversation_participant_id"]) |> URI.decode() %><% :conversation_replied -> %><%= dgettext("activity", "%{profile} replied you in a conversation.",
+<%= url(~p"/conversations/#{@activity.subject_params["conversation_participant_id"]}") |> URI.decode() %><% :conversation_replied -> %><%= dgettext("activity", "%{profile} replied you in a conversation.",
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :conversation, @activity.subject_params["conversation_participant_id"]) |> URI.decode() %><% end %>
+<%= url(~p"/conversations/#{@activity.subject_params["conversation_participant_id"]}") |> URI.decode() %><% end %>

lib/web/templates/email/activity/_discussion_activity_item.html.heex

@@ -3,7 +3,7 @@
     <%= dgettext("activity", "%{profile} created the discussion %{discussion}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       discussion:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint, :discussion, Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group), @activity.subject_params["discussion_slug"]) |> URI.decode()}\">
+        "<a href=\"#{~p"/#{Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group)}/c/#{@activity.subject_params["discussion_slug"]}" |> url() |> URI.decode()}\">
                             #{escape_html(@activity.subject_params["discussion_title"])}</a>"
     })
     |> raw %>
@@ -11,7 +11,7 @@
     <%= dgettext("activity", "%{profile} replied to the discussion %{discussion}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       discussion:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint, :discussion, Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group), @activity.subject_params["discussion_slug"]) |> URI.decode()}\">
+        "<a href=\"#{~p"/#{Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group)}/c/#{@activity.subject_params["discussion_slug"]}" |> url() |> URI.decode()}\">
                             #{escape_html(@activity.subject_params["discussion_title"])}</a>"
     })
     |> raw %>
@@ -19,7 +19,7 @@
     <%= dgettext("activity", "%{profile} renamed the discussion %{discussion}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       discussion:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint, :discussion, Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group), @activity.subject_params["discussion_slug"]) |> URI.decode()}\">
+        "<a href=\"#{~p"/#{Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group)}/c/#{@activity.subject_params["discussion_slug"]}" |> url() |> URI.decode()}\">
                             #{escape_html(@activity.subject_params["discussion_title"])}</a>"
     })
     |> raw %>
@@ -27,7 +27,7 @@
     <%= dgettext("activity", "%{profile} archived the discussion %{discussion}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       discussion:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint, :discussion, Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group), @activity.subject_params["discussion_slug"]) |> URI.decode()}\">
+        "<a href=\"#{~p"/#{Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group)}/c/#{@activity.subject_params["discussion_slug"]}" |> url() |> URI.decode()}\">
                             #{escape_html(@activity.subject_params["discussion_title"])}</a>"
     })
     |> raw %>

lib/web/templates/email/activity/_discussion_activity_item.text.eex

@@ -4,25 +4,25 @@
         discussion: @activity.subject_params["discussion_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :discussion, Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group), @activity.subject_params["discussion_slug"]) |> URI.decode() %><% :discussion_replied -> %><%= dgettext("activity", "%{profile} replied to the discussion %{discussion}.", 
+<%= ~p"/#{Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group)}/c/#{@activity.subject_params["discussion_slug"]}" |> url() |> URI.decode() %><% :discussion_replied -> %><%= dgettext("activity", "%{profile} replied to the discussion %{discussion}.", 
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         discussion: @activity.subject_params["discussion_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :discussion, Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group), @activity.subject_params["discussion_slug"]) |> URI.decode() %><% :discussion_renamed -> %><%= dgettext("activity", "%{profile} renamed the discussion %{discussion}.", 
+<%= ~p"/#{Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group)}/c/#{@activity.subject_params["discussion_slug"]}" |> url() |> URI.decode() %><% :discussion_renamed -> %><%= dgettext("activity", "%{profile} renamed the discussion %{discussion}.", 
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         discussion: @activity.subject_params["discussion_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :discussion, Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group), @activity.subject_params["discussion_slug"]) |> URI.decode() %><% :discussion_archived -> %><%= dgettext("activity", "%{profile} archived the discussion %{discussion}.", 
+<%= ~p"/#{Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group)}/c/#{@activity.subject_params["discussion_slug"]}" |> url() |> URI.decode() %><% :discussion_archived -> %><%= dgettext("activity", "%{profile} archived the discussion %{discussion}.", 
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         discussion: @activity.subject_params["discussion_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :discussion, Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group), @activity.subject_params["discussion_slug"]) |> URI.decode() %><% :discussion_deleted -> %><%= dgettext("activity", "%{profile} deleted the discussion %{discussion}.", 
+<%= ~p"/#{Mobilizon.Actors.Actor.preferred_username_and_domain(@activity.group)}/c/#{@activity.subject_params["discussion_slug"]}" |> url() |> URI.decode() %><% :discussion_deleted -> %><%= dgettext("activity", "%{profile} deleted the discussion %{discussion}.", 
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         discussion: @activity.subject_params["discussion_title"]

lib/web/templates/email/activity/_event_activity_item.html.heex

@@ -3,9 +3,7 @@
     <%= dgettext("activity", "The event %{event} was created by %{profile}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       event:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-        :event,
-        @activity.subject_params["event_uuid"]) |> URI.decode()}\">
+        "<a href=\"#{~p"/events/#{@activity.subject_params["event_uuid"]}" |> url() |> URI.decode()}\">
                             #{escape_html(@activity.subject_params["event_title"])}
                         </a>"
     })
@@ -14,9 +12,7 @@
     <%= dgettext("activity", "The event %{event} was updated by %{profile}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       event:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-        :event,
-        @activity.subject_params["event_uuid"]) |> URI.decode()}\">
+        "<a href=\"#{~p"/events/#{@activity.subject_params["event_uuid"]}" |> url() |> URI.decode()}\">
                             #{escape_html(@activity.subject_params["event_title"])}
                         </a>"
     })
@@ -32,9 +28,7 @@
       <%= dgettext("activity", "%{profile} replied to a comment on the event %{event}.", %{
         profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
         event:
-          "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-          :event,
-          @activity.subject_params["event_uuid"]) |> URI.decode()}\">
+          "<a href=\"#{~p"/events/#{@activity.subject_params["event_uuid"]}" |> url() |> URI.decode()}\">
                             #{escape_html(@activity.subject_params["event_title"])}
                         </a>"
       })
@@ -43,9 +37,7 @@
       <%= dgettext("activity", "%{profile} posted a comment on the event %{event}.", %{
         profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
         event:
-          "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-          :event,
-          @activity.subject_params["event_uuid"]) |> URI.decode()}\">
+          "<a href=\"#{~p"/events/#{@activity.subject_params["event_uuid"]}" |> url() |> URI.decode()}\">
                             #{escape_html(@activity.subject_params["event_title"])}
                         </a>"
       })
@@ -55,9 +47,7 @@
     <%= dgettext("activity", "%{profile} joined your event %{event}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       event:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-        :event,
-        @activity.subject_params["event_uuid"]) |> URI.decode()}\">#{escape_html(@activity.subject_params["event_title"])}</a>"
+        "<a href=\"#{~p"/events/#{@activity.subject_params["event_uuid"]}" |> url() |> URI.decode()}\">#{escape_html(@activity.subject_params["event_title"])}</a>"
     })
     |> raw %>
 <% end %>

lib/web/templates/email/activity/_event_activity_item.text.eex

@@ -4,13 +4,13 @@
         event: @activity.subject_params["event_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @activity.subject_params["event_uuid"]) |> URI.decode() %><% :event_updated -> %><%= dgettext("activity", "The event %{event} was updated by %{profile}.", 
+<%= url(~p"/events/#{@activity.subject_params["event_uuid"]}") |> URI.decode() %><% :event_updated -> %><%= dgettext("activity", "The event %{event} was updated by %{profile}.", 
     %{
         profile: display_name_and_username(@activity.author),
         event: @activity.subject_params["event_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @activity.subject_params["event_uuid"]) |> URI.decode() %><% :event_deleted -> %><%= dgettext("activity", "The event %{event} was deleted by %{profile}.", 
+<%= url(~p"/events/#{@activity.subject_params["event_uuid"]}") |> URI.decode() %><% :event_deleted -> %><%= dgettext("activity", "The event %{event} was deleted by %{profile}.", 
     %{
         profile: display_name_and_username(@activity.author),
         event: @activity.subject_params["event_title"]
@@ -22,16 +22,16 @@
         event: @activity.subject_params["event_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @activity.subject_params["event_uuid"]) |> URI.decode() %><% else %><%= dgettext("activity", "%{profile} posted a comment on the event %{event}.", 
+<%= url(~p"/events/#{@activity.subject_params["event_uuid"]}") |> URI.decode() %><% else %><%= dgettext("activity", "%{profile} posted a comment on the event %{event}.", 
     %{
         profile: display_name_and_username(@activity.author),
         event: @activity.subject_params["event_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @activity.subject_params["event_uuid"]) |> URI.decode() %><% end %><% :event_new_participation -> %><%= dgettext("activity", "%{profile} joined your event %{event}.",
+<%= url(~p"/events/#{@activity.subject_params["event_uuid"]}") |> URI.decode() %><% end %><% :event_new_participation -> %><%= dgettext("activity", "%{profile} joined your event %{event}.",
     %{
         profile: display_name_and_username(@activity.author),
         event: @activity.subject_params["event_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @activity.subject_params["event_uuid"]) |> URI.decode() %><% end %>
+<%= url(~p"/events/#{@activity.subject_params["event_uuid"]}") |> URI.decode() %><% end %>

lib/web/templates/email/activity/_group_activity_item.html.heex

@@ -3,9 +3,7 @@
     <%= dgettext("activity", "%{profile} created the group %{group}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       group:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-        :actor,
-        @activity.subject_params["group_federated_username"]) |> URI.decode()}\">
+        "<a href=\"#{~p"/@#{@activity.subject_params["group_federated_username"]}" |> url() |> URI.decode()}\">
                             #{escape_html(@activity.subject_params["group_name"])}
                         </a>"
     })
@@ -14,9 +12,7 @@
     <%= dgettext("activity", "%{profile} updated the group %{group}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       group:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-        :actor,
-        @activity.subject_params["group_federated_username"]) |> URI.decode()}\">
+        "<a href=\"#{~p"/@#{@activity.subject_params["group_federated_username"]}" |> url() |> URI.decode()}\">
                             #{escape_html(@activity.subject_params["group_name"])}
                         </a>"
     })

lib/web/templates/email/activity/_group_activity_item.text.eex

@@ -4,10 +4,10 @@
         group: @activity.subject_params["group_name"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :actor, @activity.subject_params["group_federated_username"]) |> URI.decode() %><% :group_updated -> %><%= dgettext("activity", "%{profile} updated the group %{group}.", 
+<%= ~p"/@#{@activity.subject_params["group_federated_username"]}" |> url() |> URI.decode() %><% :group_updated -> %><%= dgettext("activity", "%{profile} updated the group %{group}.", 
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         group: @activity.subject_params["group_name"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :actor, @activity.subject_params["group_federated_username"]) |> URI.decode() %><% end %>
+<%= ~p"/@#{@activity.subject_params["group_federated_username"]}" |> url() |> URI.decode() %><% end %>

lib/web/templates/email/activity/_post_activity_item.html.heex

@@ -3,9 +3,7 @@
     <%= dgettext("activity", "The post %{post} was created by %{profile}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       post:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-        :post,
-        @activity.subject_params["post_slug"]) |> URI.decode()}\">
+        "<a href=\"#{~p"/p/#{@activity.subject_params["post_slug"]}" |> url() |> URI.decode()}\">
                             #{escape_html(@activity.subject_params["post_title"])}
                         </a>"
     })
@@ -14,9 +12,7 @@
     <%= dgettext("activity", "The post %{post} was updated by %{profile}.", %{
       profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
       post:
-        "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-        :post,
-        @activity.subject_params["post_slug"]) |> URI.decode()}\">
+        "<a href=\"#{~p"/p/#{@activity.subject_params["post_slug"]}" |> url() |> URI.decode()}\">
                             #{escape_html(@activity.subject_params["post_title"])}
                         </a>"
     })

lib/web/templates/email/activity/_post_activity_item.text.eex

@@ -4,13 +4,13 @@
         post: @activity.subject_params["post_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :post, @activity.subject_params["post_slug"]) |> URI.decode() %><% :post_updated -> %><%= dgettext("activity", "The post %{post} was updated by %{profile}.", 
+<%= url(~p"/p/#{@activity.subject_params["post_slug"]}") |> URI.decode() %><% :post_updated -> %><%= dgettext("activity", "The post %{post} was updated by %{profile}.", 
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         post: @activity.subject_params["post_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :post, @activity.subject_params["post_slug"]) |> URI.decode() %><% :post_deleted -> %><%= dgettext("activity", "The post %{post} was deleted by %{profile}.", 
+<%= url(~p"/p/#{@activity.subject_params["post_slug"]}") |> URI.decode() %><% :post_deleted -> %><%= dgettext("activity", "The post %{post} was deleted by %{profile}.", 
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         post: @activity.subject_params["post_title"]

lib/web/templates/email/activity/_resource_activity_item.html.heex

@@ -4,9 +4,7 @@
       <%= dgettext("activity", "%{profile} created the folder %{resource}.", %{
         profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
         resource:
-          "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-          :resource,
-          @activity.subject_params["resource_uuid"]) |> URI.decode()}\">
+          "<a href=\"#{~p"/resource/#{@activity.subject_params["resource_uuid"]}" |> url() |> URI.decode()}\">
                                 #{escape_html(@activity.subject_params["resource_title"])}
                             </a>"
       })
@@ -15,9 +13,7 @@
       <%= dgettext("activity", "%{profile} created the resource %{resource}.", %{
         profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
         resource:
-          "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-          :resource,
-          @activity.subject_params["resource_uuid"]) |> URI.decode()}\">
+          "<a href=\"#{~p"/resource/#{@activity.subject_params["resource_uuid"]}" |> url() |> URI.decode()}\">
                                 #{escape_html(@activity.subject_params["resource_title"])}
                             </a>"
       })
@@ -31,9 +27,7 @@
         %{
           profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
           resource:
-            "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-            :resource,
-            @activity.subject_params["resource_uuid"]) |> URI.decode()}\">
+            "<a href=\"#{~p"/resource/#{@activity.subject_params["resource_uuid"]}" |> url() |> URI.decode()}\">
                                 #{escape_html(@activity.subject_params["resource_title"])}
                             </a>",
           old_resource_title:
@@ -48,9 +42,7 @@
         %{
           profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
           resource:
-            "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-            :resource,
-            @activity.subject_params["resource_uuid"]) |> URI.decode()}\">
+            "<a href=\"#{~p"/resource/#{@activity.subject_params["resource_uuid"]}" |> url() |> URI.decode()}\">
                                 #{escape_html(@activity.subject_params["resource_title"])}
                             </a>",
           old_resource_title:
@@ -64,9 +56,7 @@
       <%= dgettext("activity", "%{profile} moved the folder %{resource}.", %{
         profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
         resource:
-          "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-          :resource,
-          @activity.subject_params["resource_uuid"]) |> URI.decode()}\">
+          "<a href=\"#{~p"/resource/#{@activity.subject_params["resource_uuid"]}" |> url() |> URI.decode()}\">
                                 #{escape_html(@activity.subject_params["resource_title"])}
                             </a>"
       })
@@ -75,9 +65,7 @@
       <%= dgettext("activity", "%{profile} moved the resource %{resource}.", %{
         profile: "<b>#{escaped_display_name_and_username(@activity.author)}</b>",
         resource:
-          "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-          :resource,
-          @activity.subject_params["resource_uuid"]) |> URI.decode()}\">
+          "<a href=\"#{~p"/resource/#{@activity.subject_params["resource_uuid"]}" |> url() |> URI.decode()}\">
                                 #{escape_html(@activity.subject_params["resource_title"])}
                             </a>"
       })

lib/web/templates/email/activity/_resource_activity_item.text.eex

@@ -5,39 +5,39 @@
         resource: @activity.subject_params["resource_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :resource, @activity.subject_params["resource_uuid"]) |> URI.decode() %><% else %><%= dgettext("activity", "%{profile} created the resource %{resource}.", 
+<%= url(~p"/resource/#{@activity.subject_params["resource_uuid"]}") |> URI.decode() %><% else %><%= dgettext("activity", "%{profile} created the resource %{resource}.", 
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         resource: @activity.subject_params["resource_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :resource, @activity.subject_params["resource_uuid"]) |> URI.decode() %><% end %><% :resource_renamed -> %><%= if @activity.subject_params["is_folder"] do %><%= dgettext("activity", "%{profile} renamed the folder from %{old_resource_title} to %{resource}.", 
+<%= url(~p"/resource/#{@activity.subject_params["resource_uuid"]}") |> URI.decode() %><% end %><% :resource_renamed -> %><%= if @activity.subject_params["is_folder"] do %><%= dgettext("activity", "%{profile} renamed the folder from %{old_resource_title} to %{resource}.", 
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         resource: @activity.subject_params["resource_title"],
         old_resource_title: @activity.subject_params["old_resource_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :resource, @activity.subject_params["resource_uuid"]) |> URI.decode() %><% else %><%= dgettext("activity", "%{profile} renamed the resource from %{old_resource_title} to %{resource}.", 
+<%= url(~p"/resource/#{@activity.subject_params["resource_uuid"]}") |> URI.decode() %><% else %><%= dgettext("activity", "%{profile} renamed the resource from %{old_resource_title} to %{resource}.", 
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         resource: @activity.subject_params["resource_title"],
         old_resource_title: @activity.subject_params["old_resource_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :resource, @activity.subject_params["resource_uuid"]) |> URI.decode() %><% end %><% :resource_moved -> %><%= if @activity.subject_params["is_folder"] do %><%= dgettext("activity", "%{profile} moved the folder %{resource}.", 
+<%= url(~p"/resource/#{@activity.subject_params["resource_uuid"]}") |> URI.decode() %><% end %><% :resource_moved -> %><%= if @activity.subject_params["is_folder"] do %><%= dgettext("activity", "%{profile} moved the folder %{resource}.", 
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         resource: @activity.subject_params["resource_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :resource, @activity.subject_params["resource_uuid"]) |> URI.decode() %><% else %><%= dgettext("activity", "%{profile} moved the resource %{resource}.", 
+<%= url(~p"/resource/#{@activity.subject_params["resource_uuid"]}") |> URI.decode() %><% else %><%= dgettext("activity", "%{profile} moved the resource %{resource}.", 
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         resource: @activity.subject_params["resource_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :resource, @activity.subject_params["resource_uuid"]) |> URI.decode() %><% end %><% :resource_deleted -> %><%= if @activity.subject_params["is_folder"] do %><%= dgettext("activity", "%{profile} deleted the folder %{resource}.", 
+<%= url(~p"/resource/#{@activity.subject_params["resource_uuid"]}") |> URI.decode() %><% end %><% :resource_deleted -> %><%= if @activity.subject_params["is_folder"] do %><%= dgettext("activity", "%{profile} deleted the folder %{resource}.", 
     %{
         profile: Mobilizon.Actors.Actor.display_name_and_username(@activity.author),
         resource: @activity.subject_params["resource_title"]

lib/web/templates/email/anonymous_participation_confirmation.html.heex

@@ -63,7 +63,9 @@
                     <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
                       <a
                         href={
-                          "#{Routes.page_url(Mobilizon.Web.Endpoint, :participation_email_confirmation, @participant.metadata.confirmation_token)}"
+                          ~p"/participation/email/confirm/#{@participant.metadata.confirmation_token}"
+                          |> url()
+                          |> URI.decode()
                         }
                         target="_blank"
                         style="font-size: 20px; font-family: 'Roboto', Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"
@@ -85,14 +87,39 @@
           style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;"
         >
           <p style="margin: 0">
-            <%= ngettext(
-              "Would you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button.",
-              "Would you wish to cancel your attendance to one or several events, visit the event pages through the links above and click the « Attending » button.",
-              1
+            <%= gettext(
+              "If you wish to cancel your participation, simply click on the link below."
             ) %>
           </p>
         </td>
       </tr>
+      <tr>
+        <td bgcolor="#ffffff" align="left">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td bgcolor="#ffffff" align="center" style="padding: 20px 30px 60px 30px;">
+                <table border="0" cellspacing="0" cellpadding="0">
+                  <tr>
+                    <td align="center" style="border-radius: 3px;">
+                      <a
+                        href={
+                          ~p"/participation/email/cancel/#{@event.uuid}/#{@participant.metadata.cancellation_token}"
+                          |> url()
+                          |> URI.decode()
+                        }
+                        target="_blank"
+                        style="font-size: 20px; font-family: 'Roboto', Helvetica, Arial, sans-serif; color: #3C376E; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"
+                      >
+                        <%= gettext("Cancel my attendance") %>
+                      </a>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
       <tr>
         <td
           bgcolor="#ffffff"

lib/web/templates/email/anonymous_participation_confirmation.text.eex

@@ -2,5 +2,5 @@
 ==
 <%= gettext "Hi there! You just registered to join this event: « %{title} ». Please confirm the e-mail address you provided:", title: @participant.event.title %>
 <%= gettext "If you didn't trigger this email, you may safely ignore it." %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :participation_email_confirmation, @participant.metadata.confirmation_token) %>
+<%= url(~p"/participation/email/confirm/#{@participant.metadata.confirmation_token}") %>
 <%= ngettext "Would you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button.", "Would you wish to cancel your attendance to one or several events, visit the event pages through the links above and click the « Attending » button.", 1 %>

lib/web/templates/email/before_event_notification.html.heex

@@ -58,9 +58,7 @@
                   <tr>
                     <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
                       <a
-                        href={
-                          "#{Routes.page_url(Mobilizon.Web.Endpoint, :event, @participant.event.uuid)}"
-                        }
+                        href={~p"/events/#{@participant.event.uuid}" |> url() |> URI.decode()}
                         target="_blank"
                         style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"
                       >

lib/web/templates/email/before_event_notification.text.eex

@@ -2,5 +2,5 @@
 ==
 <%= gettext "Get ready for %{title}", title: @participant.event.title %>
 <%= gettext "Go to event page" %>
-<%= gettext "View the event on: %{link}", link: Routes.page_url(Mobilizon.Web.Endpoint, :event, @participant.event.uuid) %>
+<%= gettext "View the event on: %{link}", link: url(~p"/events/#{@participant.event.uuid}") %>
 <%= gettext "If you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button." %>

lib/web/templates/email/email_anonymous_activity.html.heex

@@ -54,9 +54,7 @@
                         profile:
                           "<b>#{escape_html(display_name_and_username(@activity.author))}</b>",
                         event:
-                          "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-                          :event,
-                          @activity.subject_params["event_uuid"]) |> URI.decode()}\">
+                          "<a href=\"#{~p"/events/#{@activity.subject_params["event_uuid"]}" |> url() |> URI.decode()}\">
                                 #{escape_html(@activity.subject_params["event_title"])}
                             </a>"
                       }
@@ -77,8 +75,10 @@
                         <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
                           <a
                             href={
-                          "#{Routes.page_url(Mobilizon.Web.Endpoint, :event, @activity.subject_params["event_uuid"])}"
-                        }
+                              ~p"/events/#{@activity.subject_params["event_uuid"]}"
+                              |> url()
+                              |> URI.decode()
+                            }
                             target="_blank"
                             style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"
                           >
@@ -111,9 +111,7 @@
                         profile:
                           "<b>#{escape_html(display_name_and_username(@activity.author))}</b>",
                         event:
-                          "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint,
-                          :event,
-                          @activity.subject_params["conversation_event_uuid"]) |> URI.decode()}\">#{escape_html(@activity.subject_params["conversation_event_title"])}</a>"
+                          "<a href=\"#{~p"/events/#{@activity.subject_params["conversation_event_uuid"]}" |> url() |> URI.decode()}\">#{escape_html(@activity.subject_params["conversation_event_title"])}</a>"
                       }
                     )
                     |> raw %>
@@ -174,8 +172,10 @@
                         <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
                           <a
                             href={
-                          "#{Routes.page_url(Mobilizon.Web.Endpoint, :event, @activity.subject_params["conversation_event_uuid"])}"
-                        }
+                              ~p"/events/#{@activity.subject_params["conversation_event_uuid"]}"
+                              |> url()
+                              |> URI.decode()
+                            }
                             target="_blank"
                             style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"
                           >

lib/web/templates/email/email_anonymous_activity.text.eex

@@ -9,7 +9,7 @@
         event: @activity.subject_params["event_title"]
     }
 ) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @activity.subject_params["event_uuid"]) |> URI.decode() %>
+<%= ~p"/events/#{@activity.subject_params["event_uuid"]}" |> url() |> URI.decode() %>
 <% :conversation -> %>
 <%= dgettext("activity", "%{profile} has posted a private announcement about event %{event}.",
     %{
@@ -26,5 +26,5 @@
 --
 
 <%= dgettext("activity", "This information is sent privately to you as a person who registered for this event. Share the informations above with other people with caution.") %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @activity.subject_params["conversation_event_uuid"]) |> URI.decode() %>
+<%= ~p"/events/#{@activity.subject_params["conversation_event_uuid"]}" |> url() |> URI.decode() %>
 <% end %>

lib/web/templates/email/email_changed_new.html.heex

@@ -61,9 +61,7 @@
                   <tr>
                     <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
                       <a
-                        href={
-                          "#{Routes.page_url(Mobilizon.Web.Endpoint, :user_email_validation, @token)}"
-                        }
+                        href={~p"/validate/email/#{@token}" |> url() |> URI.decode()}
                         target="_blank"
                         style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"
                       >

lib/web/templates/email/email_changed_new.text.eex

@@ -1,5 +1,5 @@
 <%= gettext "Confirm new email" %>
 ==
 <%= gettext "Hi there! It seems like you wanted to change the email address linked to your account on %{instance}. If you still wish to do so, please click the button below to confirm the change. You will then be able to log in to %{instance} with this new email address.", %{instance: @instance_name} %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :user_email_validation, @token) %>
+<%= url(~p"/validate/email/#{@token}") %>
 <%= gettext "If you didn't trigger the change yourself, please ignore this message." %>

lib/web/templates/email/email_direct_activity.html.heex

@@ -94,7 +94,9 @@
                                     <td width="85">
                                       <a
                                         href={
-                                          "#{Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(hd(group_activities).group)) |> URI.decode()}"
+                                          ~p"/@#{Mobilizon.Actors.Actor.preferred_username_and_domain(hd(group_activities).group)}"
+                                          |> url()
+                                          |> URI.decode()
                                         }
                                         target="_blank"
                                         style="text-decoration: none;"
@@ -123,7 +125,9 @@
                                         <td align="left">
                                           <a
                                             href={
-                                              "#{Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(hd(group_activities).group)) |> URI.decode()}"
+                                              ~p"/@#{Mobilizon.Actors.Actor.preferred_username_and_domain(hd(group_activities).group)}"
+                                              |> url()
+                                              |> URI.decode()
                                             }
                                             target="_blank"
                                             style="text-decoration: none;color: #474467;font-family: 'Roboto', Helvetica, Arial, sans-serif;font-size: 18px;font-weight: bold;line-height: 25px;"
@@ -138,7 +142,9 @@
                                           <td align="left">
                                             <a
                                               href={
-                                                "#{Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(hd(group_activities).group)) |> URI.decode()}"
+                                                ~p"/@#{Mobilizon.Actors.Actor.preferred_username_and_domain(hd(group_activities).group)}"
+                                                |> url()
+                                                |> URI.decode()
                                               }
                                               target="_blank"
                                               style="text-decoration: none;display: block;color: #7a7a7a;font-family: 'Roboto', Helvetica, Arial, sans-serif;font-size: 16px;font-weight: 400;line-height: 25px;"
@@ -214,7 +220,9 @@
                                   <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
                                     <a
                                       href={
-                                        "#{Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(hd(group_activities).group)) |> URI.decode()}/timeline"
+                                        ~p"/@#{Mobilizon.Actors.Actor.preferred_username_and_domain(hd(group_activities).group)}/timeline"
+                                        |> url()
+                                        |> URI.decode()
                                       }
                                       target="_blank"
                                       style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"

lib/web/templates/email/email_direct_activity.text.eex

@@ -21,7 +21,7 @@
 <% end %>
 <%= if length(group_activities) > 5 do %>
 <%= dngettext "activity", "View one more activity", "View %{count} more activities", length(group_activities) - 5, %{count: length(group_activities) - 5} %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(hd(group_activities).group)) |> URI.decode() %>/timeline
+<%= ~p"/@#{Mobilizon.Actors.Actor.preferred_username_and_domain(hd(group_activities).group)}" |> url() |> URI.decode() %>/timeline
 <% end %>
 <% end %>
 <%= dgettext("activity", "Don't want to receive activity notifications? You may change frequency or disable them in your settings.") %>

lib/web/templates/email/event_participation_approved.html.heex

@@ -74,7 +74,7 @@
                   <tr>
                     <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
                       <a
-                        href={"#{Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid)}"}
+                        href={~p"/events/#{@event.uuid}" |> url() |> URI.decode()}
                         target="_blank"
                         style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"
                       >

lib/web/templates/email/event_participation_approved.text.eex

@@ -6,6 +6,6 @@
 
 <%= gettext "Good news: one of the event organizers just approved your request. Update your calendar, because you're on the guest list now!" %>
 
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid) %>
+<%= ~p"/events/#{@event.uuid}" |> url() |> URI.decode() %>
 
 <%= gettext "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button." %>

lib/web/templates/email/event_participation_confirmed.html.heex

@@ -74,7 +74,7 @@
                   <tr>
                     <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
                       <a
-                        href={"#{Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid)}"}
+                        href={"#{url(~p"/events/#{@event.uuid}")}"}
                         target="_blank"
                         style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"
                       >
@@ -88,19 +88,62 @@
           </table>
         </td>
       </tr>
-      <tr>
-        <td
-          bgcolor="#ffffff"
-          align="left"
-          style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;"
-        >
-          <p style="margin: 0">
-            <%= gettext(
-              "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
-            ) %>
-          </p>
-        </td>
-      </tr>
+      <%= if @participant.metadata.cancellation_token do %>
+        <tr>
+          <td
+            bgcolor="#ffffff"
+            align="left"
+            style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;"
+          >
+            <p style="margin: 0">
+              <%= gettext(
+                "If you wish to cancel your participation, simply click on the link below."
+              ) %>
+            </p>
+          </td>
+        </tr>
+        <tr>
+          <td bgcolor="#ffffff" align="left">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0">
+              <tr>
+                <td bgcolor="#ffffff" align="center" style="padding: 20px 30px 60px 30px;">
+                  <table border="0" cellspacing="0" cellpadding="0">
+                    <tr>
+                      <td align="center" style="border-radius: 3px;">
+                        <a
+                          href={
+                            ~p"/participation/email/cancel/#{@event.uuid}/#{@participant.metadata.cancellation_token}"
+                            |> url()
+                            |> URI.decode()
+                          }
+                          target="_blank"
+                          style="font-size: 20px; font-family: 'Roboto', Helvetica, Arial, sans-serif; color: #3C376E; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"
+                        >
+                          <%= gettext("Cancel my attendance") %>
+                        </a>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      <% else %>
+        <tr>
+          <td
+            bgcolor="#ffffff"
+            align="left"
+            style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;"
+          >
+            <p style="margin: 0">
+              <%= gettext(
+                "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
+              ) %>
+            </p>
+          </td>
+        </tr>
+      <% end %>
     </table>
     <!--[if (gte mso 9)|(IE)]>
     </td>

lib/web/templates/email/event_participation_confirmed.text.eex

@@ -2,5 +2,5 @@
 ==
 <%= gettext "You recently requested to attend %{title}.", title: @event.title %>
 <%= gettext "You have confirmed your participation. Update your calendar, because you're on the guest list now!" %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid) %>
+<%= url(~p"/events/#{@event.uuid}") %>
 <%= gettext "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button." %>

lib/web/templates/email/event_updated.html.heex

@@ -148,7 +148,7 @@
                   <tr>
                     <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
                       <a
-                        href={"#{Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid)}"}
+                        href={"#{url(~p"/events/#{@event.uuid}")}"}
                         target="_blank"
                         style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"
                       >

lib/web/templates/email/event_updated.text.eex

@@ -9,6 +9,6 @@
 <%= gettext "New end date:" %> <%= render("date/event_tz_date.text", event: @event, date: @event.ends_on, timezone: @timezone, locale: @locale) %><% end %><%= if MapSet.member?(@changes, :physical_address) do %>
 <%= gettext "New location:" %> <%= Mobilizon.Addresses.Address.representation(@event.physical_address) %><% end %>
 
-<%= gettext "Visit the updated event page: %{link}", link: Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid) %>
+<%= gettext "Visit the updated event page: %{link}", link: url(~p"/events/#{@event.uuid}") %>
 
 <%= ngettext "Would you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button.", "Would you wish to cancel your attendance to one or several events, visit the event pages through the links above and click the « Attending » button.", 1 %>

lib/web/templates/email/group_invite.html.heex

@@ -76,7 +76,7 @@
                   <tr>
                     <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
                       <a
-                        href={"#{Routes.page_url(Mobilizon.Web.Endpoint, :my_groups)}"}
+                        href={"#{url(~p"/groups/me")}"}
                         target="_blank"
                         style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"
                       >

lib/web/templates/email/group_invite.text.eex

@@ -3,4 +3,4 @@
 <%= gettext "%{inviter} just invited you to join their group %{group}", group: @group.name, inviter: @inviter.name %>
 <%= @group.url %>
 <%= gettext "To accept this invitation, head over to your groups." %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :my_groups) %>
+<%= url(~p"/groups/me") %>

lib/web/templates/email/group_membership_approval.html.heex

@@ -48,7 +48,7 @@
               "Your membership request for group %{link_start}<b>%{group}</b>%{link_end} has been approved.",
               group: escape_html(display_name(@group)),
               link_start:
-                "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint, :actor, preferred_username_and_domain(@group)) |> URI.decode()}\">",
+                "<a href=\"#{~p"/@#{preferred_username_and_domain(@group)}" |> url() |> URI.decode()}\">",
               link_end: "</a>"
             )
             |> raw %>
@@ -66,7 +66,9 @@
                     <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
                       <a
                         href={
-                          "#{Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(@group)) |> URI.decode()}"
+                          ~p"/@#{Mobilizon.Actors.Actor.preferred_username_and_domain(@group)}"
+                          |> url()
+                          |> URI.decode()
                         }
                         target="_blank"
                         style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"

lib/web/templates/email/group_membership_approval.text.eex

@@ -2,4 +2,4 @@
 ==
 <%= gettext "Your membership request for group %{group} has been approved.", group: Mobilizon.Actors.Actor.display_name(@group) %>
 
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(@group)) |> URI.decode() %>
+<%= ~p"/@#{Mobilizon.Actors.Actor.preferred_username_and_domain(@group)}" |> url() |> URI.decode() %>

lib/web/templates/email/group_membership_rejection.html.heex

@@ -48,7 +48,7 @@
               "Your membership request for group %{link_start}<b>%{group}</b>%{link_end} has been rejected.",
               group: escape_html(display_name(@group)),
               link_start:
-                "<a href=\"#{Routes.page_url(Mobilizon.Web.Endpoint, :actor, preferred_username_and_domain(@group)) |> URI.decode()}\">",
+                "<a href=\"#{~p"/@#{preferred_username_and_domain(@group)}" |> url() |> URI.decode()}\">",
               link_end: "</a>"
             )
             |> raw %>

lib/web/templates/email/group_membership_rejection.text.eex

@@ -2,4 +2,4 @@
 ==
 <%= gettext "Your membership request for group %{group} has been rejected.", group: Mobilizon.Actors.Actor.display_name(@group) %>
 
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(@group)) |> URI.decode() %>
+<%= ~p"/@#{Mobilizon.Actors.Actor.preferred_username_and_domain(@group)}" |> url() |> URI.decode() %>

lib/web/templates/email/notification_each_week.text.eex

@@ -3,9 +3,9 @@
 <%= ngettext "You have one event this week:", "You have %{total} events this week:", @total, total: @total %>
 <%= if @total > 1 do %>
   <%= for participation <- @participations do %>
-    - <%= render("date/event_tz_date.text", event: participation.event, date: participation.event.begins_on, timezone: @timezone, locale: @locale) %> - <%= participation.event.title %> <%= Routes.page_url(Mobilizon.Web.Endpoint, :event, participation.event.uuid) %>
+    - <%= render("date/event_tz_date.text", event: participation.event, date: participation.event.begins_on, timezone: @timezone, locale: @locale) %> - <%= participation.event.title %> <%= url(~p"/events/#{participation.event.uuid}") %>
   <% end %>
 <% else %>
-  <%= render("date/event_tz_date.text", event: @participation.event, date: @participation.event.begins_on, timezone: @timezone, locale: @locale) %> - <%= @participation.event.title %> <%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @participation.event.uuid) %>
+  <%= render("date/event_tz_date.text", event: @participation.event, date: @participation.event.begins_on, timezone: @timezone, locale: @locale) %> - <%= @participation.event.title %> <%= url(~p"/events/#{@participation.event.uuid}") %>
 <% end %>
 <%= ngettext "Would you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button.", "Would you wish to cancel your attendance to one or several events, visit the event pages through the links above and click the « Attending » button.", @total %>

lib/web/templates/email/on_day_notification.text.eex

@@ -3,9 +3,9 @@
 <%= ngettext "You have one event today:", "You have %{total} events today:", @total, total: @total %>
 <%= if @total > 1 do %>
   <%= for participation <- @participations do %>
-    - <%= render("date/event_tz_date.text", event: participation.event, date: participation.event.begins_on, timezone: @timezone, locale: @locale) %> - <%= participation.event.title %> <%= Routes.page_url(Mobilizon.Web.Endpoint, :event, participation.event.uuid) %>
+    - <%= render("date/event_tz_date.text", event: participation.event, date: participation.event.begins_on, timezone: @timezone, locale: @locale) %> - <%= participation.event.title %> <%= url(~p"/events/#{participation.event.uuid}") %>
   <% end %>
 <% else %>
-  <%= render("date/event_tz_date.text", event: @participation.event, date: @participation.event.begins_on, timezone: @timezone, locale: @locale) %> - <%= @participation.event.title %> <%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @participation.event.uuid) %>
+  <%= render("date/event_tz_date.text", event: @participation.event, date: @participation.event.begins_on, timezone: @timezone, locale: @locale) %> - <%= @participation.event.title %> <%= url(~p"/events/#{@participation.event.uuid}") %>
 <% end %>
 <%= ngettext "Would you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button.", "Would you wish to cancel your attendance to one or several events, visit the event pages through the links above and click the « Attending » button.", @total %>

lib/web/templates/email/participation/card/_picture.html.heex

@@ -7,7 +7,7 @@
         align="left"
       >
         <a
-          href={Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid)}
+          href={url(~p"/events/#{@event.uuid}")}
           style="color: rgb(87,100,108); font-family: Helvetica,Arial,sans-serif; font-weight: normal; text-align: left; line-height: 1.3; text-decoration: none; vertical-align: baseline; margin: 0; padding: 0; border: 0;"
           target="_blank"
         >

lib/web/templates/email/participation/card/_title.html.heex

@@ -7,7 +7,7 @@
         align="left"
       >
         <a
-          href={Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid)}
+          href={url(~p"/events/#{@event.uuid}")}
           style="color: rgb(66,81,90); font-family: Helvetica,Arial,sans-serif; font-weight: 700; text-align: left; line-height: 1.4; text-decoration: none; vertical-align: baseline; font-size: 22px; letter-spacing: 0.2px; margin: 0 0 30px; padding: 0; border: 0;"
           target="_blank"
         >
@@ -35,12 +35,11 @@
               <%= if @event.attributed_to do %>
                 <a
                   href={
-                    Routes.page_url(
-                      Mobilizon.Web.Endpoint,
-                      :actor,
-                      Mobilizon.Actors.Actor.preferred_username_and_domain(@event.attributed_to)
+                    URI.decode(
+                      url(
+                        ~p"/@#{Mobilizon.Actors.Actor.preferred_username_and_domain(@event.attributed_to)}"
+                      )
                     )
-                    |> URI.decode()
                   }
                   style="color: rgb(254,56,89); font-family: Helvetica,Arial,sans-serif; font-weight: normal; text-align: left; line-height: 1.3; text-decoration: none; vertical-align: baseline; margin: 0; padding: 0; border: 0;"
                   target="_blank"

lib/web/templates/email/participation/card/_title.text.eex

@@ -1,3 +1,3 @@
 <%= gettext("Title: %{title}", title: @event.title) %>
 
-<%= if @event.attributed_to do %><%= gettext("Organizer: %{organizer}", organizer: @event.attributed_to.name || @event.attributed_to.preferred_username) %> <%= Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(@event.attributed_to)) |> URI.decode() %><% else %><%= gettext("Organizer: %{organizer}", organizer: @event.organizer_actor.name || @event.organizer_actor.preferred_username) %><% end %>
+<%= if @event.attributed_to do %><%= gettext("Organizer: %{organizer}", organizer: @event.attributed_to.name || @event.attributed_to.preferred_username) %> <%= ~p"/@#{Mobilizon.Actors.Actor.preferred_username_and_domain(@event.attributed_to)}" |> url() |> URI.decode() %><% else %><%= gettext("Organizer: %{organizer}", organizer: @event.organizer_actor.name || @event.organizer_actor.preferred_username) %><% end %>

lib/web/templates/email/participation/event_card.html.heex

@@ -40,7 +40,7 @@
                       align="center"
                     >
                       <a
-                        href={Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid)}
+                        href={url(~p"/events/#{@event.uuid}")}
                         style="color: rgb(255,255,255); font-family: Helvetica,Arial,sans-serif; text-align: left; line-height: 14px; text-decoration: none; vertical-align: baseline; font-size: 20px; display: inline-block; border: 1px solid #3C376E; border-radius: 15px; white-space: nowrap; margin: 0; padding: 15px 25px; border: none;"
                         target="_blank"
                       >
@@ -84,7 +84,7 @@
                       align="center"
                     >
                       <a
-                        href={Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid)}
+                        href={url(~p"/events/#{@event.uuid}")}
                         style="color: rgb(255,255,255); font-family: Helvetica,Arial,sans-serif; text-align: left; line-height: 14px; text-decoration: none; vertical-align: baseline; font-size: 20px; display: inline-block; border: 1px solid #3C376E; border-radius: 15px; white-space: nowrap; margin: 0; padding: 15px 25px; border: none;"
                         target="_blank"
                       >
@@ -125,7 +125,7 @@
         align="left"
       >
         <a
-          href={Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid)}
+          href={url(~p"/events/#{@event.uuid}")}
           style="color: rgb(254,56,89); font-family: Helvetica,Arial,sans-serif; font-weight: 400; text-align: left; line-height: 1.5; text-decoration: none; vertical-align: baseline; font-size: 16px; margin: 0; padding: 0; border: 0;"
           target="_blank"
         >

lib/web/templates/email/participation/event_card.text.eex

@@ -2,8 +2,8 @@
 
 <%= render("participation/card/_metadata.text", event: @event, timezone: @timezone, locale: @locale, action: @action) %>
 
-<%= case @action do %><% "participation" -> %><%= gettext("Manage your participation:") %> <%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid) %><% "event" -> %><%= gettext("Participate:") %> <%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid) %><% nil -> %><% end %>
+<%= case @action do %><% "participation" -> %><%= gettext("Manage your participation:") %> <%= url(~p"/events/#{@event.uuid}") %><% "event" -> %><%= gettext("Participate:") %> <%= url(~p"/events/#{@event.uuid}") %><% nil -> %><% end %>
 
 <%= if @event.description do %><%= gettext("Details:") %>
 <%= process_description(@event.description) %>
-<%= if String.length(@event.description) > 200 do %><%= gettext("Read more: %{url}", url: Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid)) %><% end %><% end %>
+<%= if String.length(@event.description) > 200 do %><%= gettext("Read more: %{url}", url: url(~p"/events/#{@event.uuid}")) %><% end %><% end %>

lib/web/templates/email/pending_participation_notification.html.heex

@@ -81,7 +81,7 @@
                     <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
                       <a
                         href={
-                          "#{Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid) <> "/participations"}"
+                          "#{url(~p"/events/#{@event.uuid}") <> "/participations"}"
                         }
                         target="_blank"
                         style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"

lib/web/templates/email/pending_participation_notification.text.eex

@@ -5,6 +5,6 @@
 
 <%= render("participation/event_card.text", event: @event, timezone: @timezone, locale: @locale, action: nil) %>
 
-<%= gettext "Manage pending requests" %> <%= Routes.page_url(Mobilizon.Web.Endpoint, :event, @event.uuid) <> "/participations" %>
+<%= gettext "Manage pending requests" %> <%= url(~p"/events/#{@event.uuid}") <> "/participations" %>
 
 <%= gettext "You are receiving this email because you chose to get notifications for pending attendance requests to your events. You can disable or change your notification settings in your user account settings under « Notifications »." %>s

lib/web/templates/email/report.html.heex

@@ -227,7 +227,7 @@
                     <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
                       <a
                         href={
-                          "#{Routes.page_url(Mobilizon.Web.Endpoint, :moderation_report, @report.id)}"
+                          "#{url(~p"/moderation/report/#{@report.id}")}"
                         }
                         target="_blank"
                         style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"

lib/web/templates/email/report.text.eex

@@ -23,4 +23,4 @@
   <%= gettext "Reason" %>
   <%= @report.content %>
 <% end %>
-<%= gettext "View report:" %> <%= Routes.page_url(Mobilizon.Web.Endpoint, :moderation_report, @report.id) %>
+<%= gettext "View report:" %> <%= url(~p"/moderation/report/#{@report.id}") %>

lib/web/views/email_view.ex

@@ -8,7 +8,7 @@ defmodule Mobilizon.Web.EmailView do
   alias Mobilizon.Service.Address
   alias Mobilizon.Service.DateTime, as: DateTimeRenderer
   alias Mobilizon.Service.Formatter.{HTML, Text}
-  alias Mobilizon.Web.Router.Helpers, as: Routes
+  use Mobilizon.Web, :verified_routes
   import Mobilizon.Web.Gettext
   import Mobilizon.Service.Metadata.Utils, only: [process_description: 1]
   import Phoenix.HTML, only: [raw: 1, html_escape: 1, safe_to_string: 1]

lib/web/views/json_ld/object_view.ex

@@ -7,7 +7,6 @@ defmodule Mobilizon.Web.JsonLD.ObjectView do
   alias Mobilizon.Posts.Post
   alias Mobilizon.Web.Endpoint
   alias Mobilizon.Web.JsonLD.ObjectView
-  alias Mobilizon.Web.Router.Helpers, as: Routes
 
   import Mobilizon.Service.Metadata.Utils,
     only: [process_description: 3]
@@ -123,13 +122,7 @@ defmodule Mobilizon.Web.JsonLD.ObjectView do
       "author" => %{
         "@type" => "Organization",
         "name" => Actor.display_name(post.attributed_to),
-        "url" =>
-          Endpoint
-          |> Routes.page_url(
-            :actor,
-            Actor.preferred_username_and_domain(post.attributed_to)
-          )
-          |> URI.decode()
+        "url" => URI.decode(url(~p"/@#{Actor.preferred_username_and_domain(post.attributed_to)}"))
       },
       "datePublished" => post.publish_at,
       "dateModified" => post.updated_at,
@@ -156,7 +149,7 @@ defmodule Mobilizon.Web.JsonLD.ObjectView do
       "reservationFor" => render("event.json", %{event: participant.event}),
       "reservationStatus" => reservation_status(participant.role),
       "modifiedTime" => participant.updated_at,
-      "modifyReservationUrl" => Routes.page_url(Endpoint, :event, participant.event.uuid)
+      "modifyReservationUrl" => url(~p"/events/#{participant.event.uuid}")
     }
 
     if participant.code do

mix.exs

@@ -1,7 +1,7 @@
 defmodule Mobilizon.Mixfile do
   use Mix.Project
 
-  @version "4.0.0-beta.1"
+  @version "4.0.0-beta.2"
 
   def project do
     [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobilizon",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.2",
   "private": true,
   "scripts": {
     "dev": "vite",

priv/gettext/activity.pot

@@ -64,7 +64,7 @@ msgstr ""
 msgid "%{profile} created the group %{group}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:15
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:13
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:8
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the resource %{resource}."
@@ -76,13 +76,13 @@ msgstr ""
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:88
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:76
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:40
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the folder %{resource}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:94
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:82
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:45
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the resource %{resource}."
@@ -94,13 +94,13 @@ msgstr ""
 msgid "%{profile} excluded member %{member}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:64
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:56
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:28
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the folder %{resource}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:75
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:65
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:34
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the resource %{resource}."
@@ -118,13 +118,13 @@ msgstr ""
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:28
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:24
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:14
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:45
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:39
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:21
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}."
@@ -136,7 +136,7 @@ msgstr ""
 msgid "%{profile} replied to the discussion %{discussion}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_group_activity_item.html.heex:14
+#: lib/web/templates/email/activity/_group_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_group_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "%{profile} updated the group %{group}."
@@ -148,22 +148,22 @@ msgstr ""
 msgid "%{profile} updated the member %{member}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:23
+#: lib/service/activity/renderer/event.ex:22
 #: lib/web/templates/email/activity/_event_activity_item.html.heex:3
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:1
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was created by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:43
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:25
+#: lib/service/activity/renderer/event.ex:42
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:21
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was deleted by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:33
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:14
+#: lib/service/activity/renderer/event.ex:32
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was updated by %{profile}."
@@ -175,13 +175,13 @@ msgstr ""
 msgid "The post %{post} was created by %{profile}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_post_activity_item.html.heex:25
+#: lib/web/templates/email/activity/_post_activity_item.html.heex:21
 #: lib/web/templates/email/activity/_post_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "The post %{post} was deleted by %{profile}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_post_activity_item.html.heex:14
+#: lib/web/templates/email/activity/_post_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_post_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "The post %{post} was updated by %{profile}."
@@ -193,15 +193,15 @@ msgstr ""
 msgid "%{member} joined the group."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:63
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:43
+#: lib/service/activity/renderer/event.ex:62
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:37
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:25
 #, elixir-autogen, elixir-format
 msgid "%{profile} posted a comment on the event %{event}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:54
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:32
+#: lib/service/activity/renderer/event.ex:53
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:28
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:19
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to a comment on the event %{event}."
@@ -212,7 +212,7 @@ msgstr ""
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
-#: lib/web/templates/email/email_direct_activity.html.heex:222
+#: lib/web/templates/email/email_direct_activity.html.heex:230
 #: lib/web/templates/email/email_direct_activity.text.eex:23
 #, elixir-format
 msgid "View one more activity"
@@ -235,21 +235,21 @@ msgstr[1] ""
 msgid "Activity on %{instance}"
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:38
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:14
+#: lib/service/activity/renderer/comment.ex:37
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted an announcement under event %{event}."
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:24
+#: lib/service/activity/renderer/comment.ex:23
 #: lib/web/templates/email/activity/_comment_activity_item.html.heex:3
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:1
 #, elixir-autogen, elixir-format
 msgid "%{profile} mentionned you in a comment under event %{event}."
 msgstr ""
 
-#: lib/web/templates/email/email_direct_activity.html.heex:252
+#: lib/web/templates/email/email_direct_activity.html.heex:260
 #, elixir-autogen, elixir-format
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}."
 msgstr ""
@@ -260,13 +260,13 @@ msgstr ""
 msgid "Here's your weekly activity recap"
 msgstr ""
 
-#: lib/web/email/activity.ex:154
-#: lib/web/email/activity.ex:175
+#: lib/web/email/activity.ex:151
+#: lib/web/email/activity.ex:172
 #, elixir-autogen, elixir-format
 msgid "Activity notification for %{instance}"
 msgstr ""
 
-#: lib/web/email/activity.ex:161
+#: lib/web/email/activity.ex:158
 #, elixir-autogen, elixir-format
 msgid "Daily activity recap for %{instance}"
 msgstr ""
@@ -277,171 +277,171 @@ msgstr ""
 msgid "Here's your daily activity recap"
 msgstr ""
 
-#: lib/web/email/activity.ex:168
+#: lib/web/email/activity.ex:165
 #, elixir-autogen, elixir-format
 msgid "Weekly activity recap for %{instance}"
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:66
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:37
+#: lib/service/activity/renderer/comment.ex:65
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:31
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:19
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted a new comment under your event %{event}."
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:53
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:26
+#: lib/service/activity/renderer/comment.ex:52
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:22
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted a new reply under your event %{event}."
 msgstr ""
 
-#: lib/web/email/activity.ex:77
+#: lib/web/email/activity.ex:74
 #, elixir-autogen, elixir-format
 msgid "Announcement for your event %{event}"
 msgstr ""
 
-#: lib/service/activity/renderer/group.ex:23
+#: lib/service/activity/renderer/group.ex:22
 #, elixir-autogen, elixir-format
 msgid "The group %{group} was updated by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/post.ex:47
+#: lib/service/activity/renderer/post.ex:46
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was deleted by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/post.ex:31
+#: lib/service/activity/renderer/post.ex:30
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was published by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/post.ex:39
+#: lib/service/activity/renderer/post.ex:38
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was updated by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:39
+#: lib/service/activity/renderer/member.ex:38
 #, elixir-autogen, elixir-format
 msgid "%{member} accepted the invitation to join the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:47
+#: lib/service/activity/renderer/member.ex:46
 #, elixir-autogen, elixir-format
 msgid "%{member} joined the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:42
 #, elixir-autogen, elixir-format
 msgid "%{member} rejected the invitation to join the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:31
+#: lib/service/activity/renderer/member.ex:30
 #, elixir-autogen, elixir-format
 msgid "%{member} requested to join the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:35
+#: lib/service/activity/renderer/member.ex:34
 #, elixir-autogen, elixir-format
 msgid "%{member} was invited by %{profile} to group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:51
+#: lib/service/activity/renderer/member.ex:50
 #, elixir-autogen, elixir-format
 msgid "%{profile} added the member %{member} to group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:55
+#: lib/service/activity/renderer/member.ex:54
 #, elixir-autogen, elixir-format
 msgid "%{profile} approved the membership request from %{member} for group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:33
+#: lib/service/activity/renderer/resource.ex:32
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the folder %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:69
+#: lib/service/activity/renderer/resource.ex:68
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the folder %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:71
+#: lib/service/activity/renderer/resource.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the resource %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:75
+#: lib/service/activity/renderer/member.ex:74
 #, elixir-autogen, elixir-format
 msgid "%{profile} excluded member %{member} from the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:61
+#: lib/service/activity/renderer/resource.ex:60
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the folder %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:63
+#: lib/service/activity/renderer/resource.ex:62
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the resource %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:79
+#: lib/service/activity/renderer/member.ex:78
 #, elixir-autogen, elixir-format
 msgid "%{profile} quit the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:62
 #, elixir-autogen, elixir-format
 msgid "%{profile} rejected the membership request from %{member} for group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:45
+#: lib/service/activity/renderer/resource.ex:44
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:51
+#: lib/service/activity/renderer/resource.ex:50
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:71
+#: lib/service/activity/renderer/member.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} updated the member %{member} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:35
+#: lib/service/activity/renderer/resource.ex:34
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the resource %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:86
+#: lib/service/activity/renderer/discussion.ex:85
 #, elixir-autogen, elixir-format
 msgid "%{profile} archived the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:26
+#: lib/service/activity/renderer/discussion.ex:25
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:101
+#: lib/service/activity/renderer/discussion.ex:100
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:56
+#: lib/service/activity/renderer/discussion.ex:55
 #, elixir-autogen, elixir-format
 msgid "%{profile} mentionned you in the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:71
+#: lib/service/activity/renderer/discussion.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:41
+#: lib/service/activity/renderer/discussion.ex:40
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to the discussion %{discussion} in group %{group}."
 msgstr ""
@@ -452,8 +452,8 @@ msgstr ""
 msgid "%{profile} approved the member %{member}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:74
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:55
+#: lib/service/activity/renderer/event.ex:73
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:47
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:31
 #, elixir-autogen, elixir-format
 msgid "%{profile} joined your event %{event}."
@@ -486,12 +486,12 @@ msgstr ""
 msgid "%{profile} mentionned you in a conversation."
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:37
+#: lib/service/activity/renderer/conversation.ex:36
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to your message"
 msgstr ""
 
-#: lib/web/templates/email/activity/_conversation_activity_item.html.heex:12
+#: lib/web/templates/email/activity/_conversation_activity_item.html.heex:10
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied you in a %{conversation}."
 msgstr ""
@@ -501,28 +501,28 @@ msgstr ""
 msgid "%{profile} replied you in a conversation."
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:50
+#: lib/service/activity/renderer/conversation.ex:49
 #, elixir-autogen, elixir-format
 msgid "%{profile} sent a private message about event %{event}"
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:24
+#: lib/service/activity/renderer/conversation.ex:23
 #, elixir-autogen, elixir-format
 msgid "%{profile} sent you a message"
 msgstr ""
 
-#: lib/web/email/activity.ex:51
+#: lib/web/email/activity.ex:52
 #, elixir-autogen, elixir-format
 msgid "Informations about your event %{event}"
 msgstr ""
 
-#: lib/web/templates/email/email_anonymous_activity.html.heex:122
+#: lib/web/templates/email/email_anonymous_activity.html.heex:118
 #: lib/web/templates/email/email_anonymous_activity.text.eex:20
 #, elixir-autogen, elixir-format
 msgid "It might give details on how to join the event, so make sure to read it appropriately."
 msgstr ""
 
-#: lib/web/templates/email/email_anonymous_activity.html.heex:160
+#: lib/web/templates/email/email_anonymous_activity.html.heex:156
 #: lib/web/templates/email/email_anonymous_activity.text.eex:28
 #, elixir-autogen, elixir-format
 msgid "This information is sent privately to you as a person who registered for this event. Share the informations above with other people with caution."

priv/gettext/ar/LC_MESSAGES/activity.po

@@ -66,7 +66,7 @@ msgstr ""
 msgid "%{profile} created the group %{group}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:15
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:13
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:8
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the resource %{resource}."
@@ -78,13 +78,13 @@ msgstr ""
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:88
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:76
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:40
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the folder %{resource}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:94
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:82
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:45
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the resource %{resource}."
@@ -96,13 +96,13 @@ msgstr ""
 msgid "%{profile} excluded member %{member}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:64
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:56
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:28
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the folder %{resource}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:75
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:65
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:34
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the resource %{resource}."
@@ -120,13 +120,13 @@ msgstr ""
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:28
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:24
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:14
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:45
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:39
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:21
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}."
@@ -138,7 +138,7 @@ msgstr ""
 msgid "%{profile} replied to the discussion %{discussion}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_group_activity_item.html.heex:14
+#: lib/web/templates/email/activity/_group_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_group_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "%{profile} updated the group %{group}."
@@ -150,22 +150,22 @@ msgstr ""
 msgid "%{profile} updated the member %{member}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:23
+#: lib/service/activity/renderer/event.ex:22
 #: lib/web/templates/email/activity/_event_activity_item.html.heex:3
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:1
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was created by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:43
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:25
+#: lib/service/activity/renderer/event.ex:42
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:21
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was deleted by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:33
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:14
+#: lib/service/activity/renderer/event.ex:32
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was updated by %{profile}."
@@ -177,13 +177,13 @@ msgstr ""
 msgid "The post %{post} was created by %{profile}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_post_activity_item.html.heex:25
+#: lib/web/templates/email/activity/_post_activity_item.html.heex:21
 #: lib/web/templates/email/activity/_post_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "The post %{post} was deleted by %{profile}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_post_activity_item.html.heex:14
+#: lib/web/templates/email/activity/_post_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_post_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "The post %{post} was updated by %{profile}."
@@ -195,15 +195,15 @@ msgstr ""
 msgid "%{member} joined the group."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:63
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:43
+#: lib/service/activity/renderer/event.ex:62
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:37
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:25
 #, elixir-autogen, elixir-format
 msgid "%{profile} posted a comment on the event %{event}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:54
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:32
+#: lib/service/activity/renderer/event.ex:53
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:28
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:19
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to a comment on the event %{event}."
@@ -214,7 +214,7 @@ msgstr ""
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
-#: lib/web/templates/email/email_direct_activity.html.heex:222
+#: lib/web/templates/email/email_direct_activity.html.heex:230
 #: lib/web/templates/email/email_direct_activity.text.eex:23
 #, elixir-format
 msgid "View one more activity"
@@ -245,21 +245,21 @@ msgstr[5] ""
 msgid "Activity on %{instance}"
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:38
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:14
+#: lib/service/activity/renderer/comment.ex:37
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted an announcement under event %{event}."
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:24
+#: lib/service/activity/renderer/comment.ex:23
 #: lib/web/templates/email/activity/_comment_activity_item.html.heex:3
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:1
 #, elixir-autogen, elixir-format
 msgid "%{profile} mentionned you in a comment under event %{event}."
 msgstr ""
 
-#: lib/web/templates/email/email_direct_activity.html.heex:252
+#: lib/web/templates/email/email_direct_activity.html.heex:260
 #, elixir-autogen, elixir-format
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}."
 msgstr ""
@@ -270,13 +270,13 @@ msgstr ""
 msgid "Here's your weekly activity recap"
 msgstr ""
 
-#: lib/web/email/activity.ex:154
-#: lib/web/email/activity.ex:175
+#: lib/web/email/activity.ex:151
+#: lib/web/email/activity.ex:172
 #, elixir-autogen, elixir-format
 msgid "Activity notification for %{instance}"
 msgstr ""
 
-#: lib/web/email/activity.ex:161
+#: lib/web/email/activity.ex:158
 #, elixir-autogen, elixir-format
 msgid "Daily activity recap for %{instance}"
 msgstr ""
@@ -287,171 +287,171 @@ msgstr ""
 msgid "Here's your daily activity recap"
 msgstr ""
 
-#: lib/web/email/activity.ex:168
+#: lib/web/email/activity.ex:165
 #, elixir-autogen, elixir-format
 msgid "Weekly activity recap for %{instance}"
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:66
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:37
+#: lib/service/activity/renderer/comment.ex:65
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:31
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:19
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted a new comment under your event %{event}."
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:53
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:26
+#: lib/service/activity/renderer/comment.ex:52
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:22
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted a new reply under your event %{event}."
 msgstr ""
 
-#: lib/web/email/activity.ex:77
+#: lib/web/email/activity.ex:74
 #, elixir-autogen, elixir-format
 msgid "Announcement for your event %{event}"
 msgstr ""
 
-#: lib/service/activity/renderer/group.ex:23
+#: lib/service/activity/renderer/group.ex:22
 #, elixir-autogen, elixir-format
 msgid "The group %{group} was updated by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/post.ex:47
+#: lib/service/activity/renderer/post.ex:46
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was deleted by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/post.ex:31
+#: lib/service/activity/renderer/post.ex:30
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was published by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/post.ex:39
+#: lib/service/activity/renderer/post.ex:38
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was updated by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:39
+#: lib/service/activity/renderer/member.ex:38
 #, elixir-autogen, elixir-format
 msgid "%{member} accepted the invitation to join the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:47
+#: lib/service/activity/renderer/member.ex:46
 #, elixir-autogen, elixir-format
 msgid "%{member} joined the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:42
 #, elixir-autogen, elixir-format
 msgid "%{member} rejected the invitation to join the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:31
+#: lib/service/activity/renderer/member.ex:30
 #, elixir-autogen, elixir-format
 msgid "%{member} requested to join the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:35
+#: lib/service/activity/renderer/member.ex:34
 #, elixir-autogen, elixir-format
 msgid "%{member} was invited by %{profile} to group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:51
+#: lib/service/activity/renderer/member.ex:50
 #, elixir-autogen, elixir-format
 msgid "%{profile} added the member %{member} to group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:55
+#: lib/service/activity/renderer/member.ex:54
 #, elixir-autogen, elixir-format
 msgid "%{profile} approved the membership request from %{member} for group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:33
+#: lib/service/activity/renderer/resource.ex:32
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the folder %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:69
+#: lib/service/activity/renderer/resource.ex:68
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the folder %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:71
+#: lib/service/activity/renderer/resource.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the resource %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:75
+#: lib/service/activity/renderer/member.ex:74
 #, elixir-autogen, elixir-format
 msgid "%{profile} excluded member %{member} from the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:61
+#: lib/service/activity/renderer/resource.ex:60
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the folder %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:63
+#: lib/service/activity/renderer/resource.ex:62
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the resource %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:79
+#: lib/service/activity/renderer/member.ex:78
 #, elixir-autogen, elixir-format
 msgid "%{profile} quit the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:62
 #, elixir-autogen, elixir-format
 msgid "%{profile} rejected the membership request from %{member} for group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:45
+#: lib/service/activity/renderer/resource.ex:44
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:51
+#: lib/service/activity/renderer/resource.ex:50
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:71
+#: lib/service/activity/renderer/member.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} updated the member %{member} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:35
+#: lib/service/activity/renderer/resource.ex:34
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the resource %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:86
+#: lib/service/activity/renderer/discussion.ex:85
 #, elixir-autogen, elixir-format
 msgid "%{profile} archived the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:26
+#: lib/service/activity/renderer/discussion.ex:25
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:101
+#: lib/service/activity/renderer/discussion.ex:100
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:56
+#: lib/service/activity/renderer/discussion.ex:55
 #, elixir-autogen, elixir-format
 msgid "%{profile} mentionned you in the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:71
+#: lib/service/activity/renderer/discussion.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:41
+#: lib/service/activity/renderer/discussion.ex:40
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to the discussion %{discussion} in group %{group}."
 msgstr ""
@@ -462,8 +462,8 @@ msgstr ""
 msgid "%{profile} approved the member %{member}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:74
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:55
+#: lib/service/activity/renderer/event.ex:73
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:47
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:31
 #, elixir-autogen, elixir-format
 msgid "%{profile} joined your event %{event}."
@@ -496,12 +496,12 @@ msgstr ""
 msgid "%{profile} mentionned you in a conversation."
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:37
+#: lib/service/activity/renderer/conversation.ex:36
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to your message"
 msgstr ""
 
-#: lib/web/templates/email/activity/_conversation_activity_item.html.heex:12
+#: lib/web/templates/email/activity/_conversation_activity_item.html.heex:10
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{profile} replied you in a %{conversation}."
 msgstr ""
@@ -511,28 +511,28 @@ msgstr ""
 msgid "%{profile} replied you in a conversation."
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:50
+#: lib/service/activity/renderer/conversation.ex:49
 #, elixir-autogen, elixir-format
 msgid "%{profile} sent a private message about event %{event}"
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:24
+#: lib/service/activity/renderer/conversation.ex:23
 #, elixir-autogen, elixir-format
 msgid "%{profile} sent you a message"
 msgstr ""
 
-#: lib/web/email/activity.ex:51
+#: lib/web/email/activity.ex:52
 #, elixir-autogen, elixir-format
 msgid "Informations about your event %{event}"
 msgstr ""
 
-#: lib/web/templates/email/email_anonymous_activity.html.heex:122
+#: lib/web/templates/email/email_anonymous_activity.html.heex:118
 #: lib/web/templates/email/email_anonymous_activity.text.eex:20
 #, elixir-autogen, elixir-format
 msgid "It might give details on how to join the event, so make sure to read it appropriately."
 msgstr ""
 
-#: lib/web/templates/email/email_anonymous_activity.html.heex:160
+#: lib/web/templates/email/email_anonymous_activity.html.heex:156
 #: lib/web/templates/email/email_anonymous_activity.text.eex:28
 #, elixir-autogen, elixir-format
 msgid "This information is sent privately to you as a person who registered for this event. Share the informations above with other people with caution."

priv/gettext/ar/LC_MESSAGES/default.po

@@ -71,7 +71,7 @@ msgstr ""
 msgid "New report on Mobilizon instance %{instance}"
 msgstr ""
 
-#: lib/web/templates/email/before_event_notification.html.heex:67
+#: lib/web/templates/email/before_event_notification.html.heex:65
 #: lib/web/templates/email/before_event_notification.text.eex:4
 #, elixir-autogen, elixir-format
 msgid "Go to event page"
@@ -721,7 +721,7 @@ msgctxt "terms"
 msgid "Your content is yours"
 msgstr ""
 
-#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:71
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Confirm my e-mail address"
 msgstr ""
@@ -769,7 +769,6 @@ msgstr ""
 msgid "Please do not use it for real purposes."
 msgstr ""
 
-#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:88
 #: lib/web/templates/email/anonymous_participation_confirmation.text.eex:6
 #: lib/web/templates/email/event_updated.html.heex:172
 #: lib/web/templates/email/event_updated.text.eex:14
@@ -858,7 +857,7 @@ msgstr ""
 msgid "If you didn't trigger the change yourself, please ignore this message. Your password won't be changed until you click the link above."
 msgstr ""
 
-#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:103
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:130
 #: lib/web/templates/email/anonymous_participation_confirmation.text.eex:4
 #: lib/web/templates/email/registration_confirmation.html.heex:62
 #: lib/web/templates/email/registration_confirmation.text.eex:7
@@ -866,7 +865,7 @@ msgstr ""
 msgid "If you didn't trigger this email, you may safely ignore it."
 msgstr ""
 
-#: lib/web/templates/email/before_event_notification.html.heex:84
+#: lib/web/templates/email/before_event_notification.html.heex:82
 #: lib/web/templates/email/before_event_notification.text.eex:6
 #, elixir-autogen, elixir-format
 msgid "If you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button."
@@ -957,7 +956,7 @@ msgstr ""
 msgid "Unfortunately, the organizers rejected your request."
 msgstr "لسوء الحظ ، لقد رفض المُنظّمون طلب مشاركتك."
 
-#: lib/web/templates/email/email_changed_new.html.heex:70
+#: lib/web/templates/email/email_changed_new.html.heex:68
 #, elixir-autogen, elixir-format
 msgid "Verify your email address"
 msgstr ""
@@ -973,7 +972,7 @@ msgid "View report:"
 msgstr "إعرض التقرير"
 
 #: lib/web/templates/email/email_anonymous_activity.html.heex:85
-#: lib/web/templates/email/email_anonymous_activity.html.heex:184
+#: lib/web/templates/email/email_anonymous_activity.html.heex:182
 #: lib/web/templates/email/event_participation_approved.html.heex:81
 #: lib/web/templates/email/event_participation_confirmed.html.heex:81
 #, elixir-autogen, elixir-format
@@ -1028,7 +1027,7 @@ msgstr "لقد قمتَ بتقديم طلب للمشاركة في فعالية %
 msgid "You're going!"
 msgstr ""
 
-#: lib/web/templates/email/email_changed_new.html.heex:87
+#: lib/web/templates/email/email_changed_new.html.heex:85
 #: lib/web/templates/email/email_changed_new.text.eex:5
 #, elixir-autogen, elixir-format
 msgid "If you didn't trigger the change yourself, please ignore this message."
@@ -1237,12 +1236,12 @@ msgstr ""
 msgid "You have now confirmed your participation. Update your calendar, because you're on the guest list now!"
 msgstr ""
 
-#: lib/mobilizon/posts/post.ex:99
+#: lib/mobilizon/posts/post.ex:98
 #, elixir-autogen, elixir-format
 msgid "A text is required for the post"
 msgstr ""
 
-#: lib/mobilizon/posts/post.ex:98
+#: lib/mobilizon/posts/post.ex:97
 #, elixir-autogen, elixir-format
 msgid "A title is required for the post"
 msgstr ""
@@ -1311,25 +1310,25 @@ msgstr ""
 msgid "This is a demonstration site to test Mobilizon."
 msgstr ""
 
-#: lib/service/metadata/actor.ex:93
-#: lib/service/metadata/actor.ex:100
+#: lib/service/metadata/actor.ex:86
+#: lib/service/metadata/actor.ex:92
 #: lib/service/metadata/instance.ex:60
 #: lib/service/metadata/instance.ex:66
 #, elixir-autogen, elixir-format
 msgid "%{name}'s feed"
 msgstr ""
 
-#: lib/service/export/feed.ex:120
+#: lib/service/export/feed.ex:117
 #, elixir-autogen, elixir-format
 msgid "%{actor}'s private events feed on %{instance}"
 msgstr ""
 
-#: lib/service/export/feed.ex:115
+#: lib/service/export/feed.ex:112
 #, elixir-autogen, elixir-format
 msgid "%{actor}'s public events feed on %{instance}"
 msgstr ""
 
-#: lib/service/export/feed.ex:224
+#: lib/service/export/feed.ex:221
 #, elixir-autogen, elixir-format
 msgid "Feed for %{email} on %{instance}"
 msgstr ""
@@ -1608,7 +1607,7 @@ msgstr ""
 msgid "Sorry, not this time!"
 msgstr ""
 
-#: lib/web/templates/email/group_membership_approval.html.heex:74
+#: lib/web/templates/email/group_membership_approval.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "View the group"
 msgstr ""
@@ -2020,3 +2019,13 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Participant registration date"
 msgstr ""
+
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:113
+#, elixir-autogen, elixir-format
+msgid "Cancel my attendance"
+msgstr ""
+
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:90
+#, elixir-autogen, elixir-format
+msgid "If you wish to cancel your participation, simply click on the link below."
+msgstr ""

priv/gettext/ar/LC_MESSAGES/errors.po

@@ -19,7 +19,7 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Weblate 4.4.2\n"
 
-#: lib/mobilizon/discussions/discussion.ex:69
+#: lib/mobilizon/discussions/discussion.ex:68
 #, elixir-autogen
 msgid "can't be blank"
 msgstr "لا يمكن أن يترك فارغا"
@@ -186,7 +186,7 @@ msgstr ""
 
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:34
-#: lib/graphql/resolvers/participant.ex:212
+#: lib/graphql/resolvers/participant.ex:217
 #: lib/graphql/resolvers/person.ex:247
 #: lib/graphql/resolvers/person.ex:378
 #: lib/graphql/resolvers/person.ex:414
@@ -422,7 +422,7 @@ msgstr ""
 #: lib/graphql/resolvers/participant.ex:89
 #: lib/graphql/resolvers/participant.ex:130
 #: lib/graphql/resolvers/participant.ex:157
-#: lib/graphql/resolvers/participant.ex:345
+#: lib/graphql/resolvers/participant.ex:350
 #, elixir-autogen, elixir-format
 msgid "Event with this ID %{id} doesn't exist"
 msgstr ""
@@ -451,14 +451,14 @@ msgstr ""
 msgid "No such feed token"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:261
+#: lib/graphql/resolvers/participant.ex:266
 #, elixir-autogen, elixir-format
 msgid "Participant already has role %{role}"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:189
-#: lib/graphql/resolvers/participant.ex:222
-#: lib/graphql/resolvers/participant.ex:265
+#: lib/graphql/resolvers/participant.ex:191
+#: lib/graphql/resolvers/participant.ex:227
+#: lib/graphql/resolvers/participant.ex:270
 #, elixir-autogen, elixir-format
 msgid "Participant not found"
 msgstr ""
@@ -535,7 +535,7 @@ msgstr ""
 msgid "The event has already reached its maximum capacity"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:291
+#: lib/graphql/resolvers/participant.ex:296
 #, elixir-autogen, elixir-format
 msgid "This token is invalid"
 msgstr ""
@@ -616,8 +616,8 @@ msgstr ""
 msgid "You are not allowed to update a comment if not connected"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:183
-#: lib/graphql/resolvers/participant.ex:216
+#: lib/graphql/resolvers/participant.ex:185
+#: lib/graphql/resolvers/participant.ex:221
 #, elixir-autogen, elixir-format
 msgid "You can't leave event because you're the only event creator participant"
 msgstr ""
@@ -732,7 +732,7 @@ msgstr ""
 msgid "You need to be logged-in to join an event"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:227
+#: lib/graphql/resolvers/participant.ex:232
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to leave an event"
 msgstr ""
@@ -868,7 +868,7 @@ msgstr ""
 msgid "You don't have the right to remove this member."
 msgstr ""
 
-#: lib/mobilizon/actors/actor.ex:384
+#: lib/mobilizon/actors/actor.ex:385
 #, elixir-autogen, elixir-format
 msgid "This username is already taken."
 msgstr ""
@@ -913,8 +913,8 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #: lib/graphql/resolvers/event.ex:165
-#: lib/graphql/resolvers/participant.ex:255
-#: lib/graphql/resolvers/participant.ex:337
+#: lib/graphql/resolvers/participant.ex:260
+#: lib/graphql/resolvers/participant.ex:342
 #, elixir-autogen, elixir-format
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
@@ -954,7 +954,7 @@ msgstr ""
 msgid "Error while uploading pictures"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:192
+#: lib/graphql/resolvers/participant.ex:194
 #, elixir-autogen, elixir-format
 msgid "Failed to leave the event"
 msgstr ""
@@ -995,17 +995,17 @@ msgstr ""
 msgid "You cannot change your password."
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:330
+#: lib/graphql/resolvers/participant.ex:335
 #, elixir-autogen, elixir-format
 msgid "Format not supported"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:314
+#: lib/graphql/resolvers/participant.ex:319
 #, elixir-autogen, elixir-format
 msgid "A dependency needed to export to %{format} is not installed"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:322
+#: lib/graphql/resolvers/participant.ex:327
 #, elixir-autogen, elixir-format
 msgid "An error occured while saving export"
 msgstr ""
@@ -1125,7 +1125,7 @@ msgstr ""
 msgid "Unable to find an instance to follow at this address"
 msgstr ""
 
-#: lib/mobilizon/actors/actor.ex:403
+#: lib/mobilizon/actors/actor.ex:404
 #, elixir-autogen, elixir-format
 msgid "Username must only contain alphanumeric lowercased characters and underscores."
 msgstr ""
@@ -1197,23 +1197,23 @@ msgstr ""
 msgid "Impossible to create application."
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:358
+#: lib/web/controllers/application_controller.ex:355
 #, elixir-autogen, elixir-format
 msgid "Incorrect parameters sent. You need to provide at least the grant_type and client_id parameters, depending on the grant type being used."
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:331
+#: lib/web/controllers/application_controller.ex:328
 #, elixir-autogen, elixir-format
 msgid "Invalid client credentials provided"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:339
+#: lib/web/controllers/application_controller.ex:336
 #, elixir-autogen, elixir-format
 msgid "Invalid refresh token provided"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:172
-#: lib/web/controllers/application_controller.ex:403
+#: lib/web/controllers/application_controller.ex:169
+#: lib/web/controllers/application_controller.ex:400
 #, elixir-autogen, elixir-format
 msgid "No application was found with this client_id"
 msgstr ""
@@ -1239,17 +1239,17 @@ msgstr ""
 msgid "Not authorized to access this %{object_type}"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:281
+#: lib/web/controllers/application_controller.ex:278
 #, elixir-autogen, elixir-format
 msgid "Please slow down the rate of your requests"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:269
+#: lib/web/controllers/application_controller.ex:266
 #, elixir-autogen, elixir-format
 msgid "The authorization request is still pending"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:251
+#: lib/web/controllers/application_controller.ex:248
 #, elixir-autogen, elixir-format
 msgid "The client_id provided or the device_code associated is invalid"
 msgstr ""
@@ -1259,7 +1259,7 @@ msgstr ""
 msgid "The device user code was not provided before approving the application"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:306
+#: lib/web/controllers/application_controller.ex:303
 #, elixir-autogen, elixir-format
 msgid "The given device_code has expired"
 msgstr ""
@@ -1269,7 +1269,7 @@ msgstr ""
 msgid "The given redirect_uri is not in the list of allowed redirect URIs"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:160
+#: lib/web/controllers/application_controller.ex:157
 #, elixir-autogen, elixir-format
 msgid "The given scope is not in the list of the app declared scopes"
 msgstr ""
@@ -1286,22 +1286,22 @@ msgstr ""
 msgid "The given user code is invalid"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:413
+#: lib/web/controllers/application_controller.ex:410
 #, elixir-autogen, elixir-format
 msgid "The provided client_id does not match the provided code"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:416
+#: lib/web/controllers/application_controller.ex:413
 #, elixir-autogen, elixir-format
 msgid "The provided client_secret is invalid"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:409
+#: lib/web/controllers/application_controller.ex:406
 #, elixir-autogen, elixir-format
 msgid "The provided code is invalid or expired"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:420
+#: lib/web/controllers/application_controller.ex:417
 #, elixir-autogen, elixir-format
 msgid "The provided scope is invalid or not included in the app declared scopes"
 msgstr ""
@@ -1311,17 +1311,17 @@ msgstr ""
 msgid "The scope parameter is not a space separated list of valid scopes"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:294
+#: lib/web/controllers/application_controller.ex:291
 #, elixir-autogen, elixir-format
 msgid "The user rejected the requested authorization"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:406
+#: lib/web/controllers/application_controller.ex:403
 #, elixir-autogen, elixir-format
 msgid "This redirect URI is not allowed"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:383
+#: lib/web/controllers/application_controller.ex:380
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Token not found"
 msgstr ""
@@ -1331,27 +1331,27 @@ msgstr ""
 msgid "Too many requests"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:186
+#: lib/web/controllers/application_controller.ex:183
 #, elixir-autogen, elixir-format
 msgid "Unable to produce device code"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:375
+#: lib/web/controllers/application_controller.ex:372
 #, elixir-autogen, elixir-format
 msgid "Unable to revoke token"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:200
+#: lib/web/controllers/application_controller.ex:197
 #, elixir-autogen, elixir-format
 msgid "You need to pass both client_id and scope as parameters to obtain a device code"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:138
+#: lib/web/controllers/application_controller.ex:135
 #, elixir-autogen, elixir-format
 msgid "You need to provide a valid redirect_uri to autorize an application"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:128
+#: lib/web/controllers/application_controller.ex:125
 #, elixir-autogen, elixir-format
 msgid "You need to specify client_id, redirect_uri, scope and state to autorize an application"
 msgstr ""
@@ -1361,12 +1361,12 @@ msgstr ""
 msgid "Couldn't send an email. Internal error."
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:288
+#: lib/graphql/resolvers/participant.ex:293
 #, elixir-autogen, elixir-format
 msgid "Participation is already confirmed"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:285
+#: lib/graphql/resolvers/participant.ex:290
 #, elixir-autogen, elixir-format
 msgid "Participation is confirmed but not approved yet by an organizer"
 msgstr ""
@@ -1417,7 +1417,7 @@ msgstr ""
 msgid "Conversation needs to mention at least one participant that's not yourself"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:390
+#: lib/graphql/resolvers/participant.ex:396
 #, elixir-autogen, elixir-format
 msgid "There are no participants matching the audience you've selected."
 msgstr ""

priv/gettext/be/LC_MESSAGES/activity.po

@@ -65,7 +65,7 @@ msgstr ""
 msgid "%{profile} created the group %{group}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:15
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:13
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:8
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the resource %{resource}."
@@ -77,13 +77,13 @@ msgstr ""
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:88
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:76
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:40
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the folder %{resource}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:94
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:82
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:45
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the resource %{resource}."
@@ -95,13 +95,13 @@ msgstr ""
 msgid "%{profile} excluded member %{member}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:64
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:56
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:28
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the folder %{resource}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:75
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:65
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:34
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the resource %{resource}."
@@ -119,13 +119,13 @@ msgstr ""
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:28
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:24
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:14
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:45
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:39
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:21
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}."
@@ -137,7 +137,7 @@ msgstr ""
 msgid "%{profile} replied to the discussion %{discussion}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_group_activity_item.html.heex:14
+#: lib/web/templates/email/activity/_group_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_group_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "%{profile} updated the group %{group}."
@@ -149,22 +149,22 @@ msgstr ""
 msgid "%{profile} updated the member %{member}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:23
+#: lib/service/activity/renderer/event.ex:22
 #: lib/web/templates/email/activity/_event_activity_item.html.heex:3
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:1
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was created by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:43
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:25
+#: lib/service/activity/renderer/event.ex:42
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:21
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was deleted by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:33
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:14
+#: lib/service/activity/renderer/event.ex:32
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was updated by %{profile}."
@@ -176,13 +176,13 @@ msgstr ""
 msgid "The post %{post} was created by %{profile}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_post_activity_item.html.heex:25
+#: lib/web/templates/email/activity/_post_activity_item.html.heex:21
 #: lib/web/templates/email/activity/_post_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "The post %{post} was deleted by %{profile}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_post_activity_item.html.heex:14
+#: lib/web/templates/email/activity/_post_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_post_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "The post %{post} was updated by %{profile}."
@@ -194,15 +194,15 @@ msgstr ""
 msgid "%{member} joined the group."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:63
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:43
+#: lib/service/activity/renderer/event.ex:62
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:37
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:25
 #, elixir-autogen, elixir-format
 msgid "%{profile} posted a comment on the event %{event}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:54
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:32
+#: lib/service/activity/renderer/event.ex:53
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:28
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:19
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to a comment on the event %{event}."
@@ -213,7 +213,7 @@ msgstr ""
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
-#: lib/web/templates/email/email_direct_activity.html.heex:222
+#: lib/web/templates/email/email_direct_activity.html.heex:230
 #: lib/web/templates/email/email_direct_activity.text.eex:23
 #, elixir-format
 msgid "View one more activity"
@@ -238,21 +238,21 @@ msgstr[2] ""
 msgid "Activity on %{instance}"
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:38
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:14
+#: lib/service/activity/renderer/comment.ex:37
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted an announcement under event %{event}."
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:24
+#: lib/service/activity/renderer/comment.ex:23
 #: lib/web/templates/email/activity/_comment_activity_item.html.heex:3
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:1
 #, elixir-autogen, elixir-format
 msgid "%{profile} mentionned you in a comment under event %{event}."
 msgstr ""
 
-#: lib/web/templates/email/email_direct_activity.html.heex:252
+#: lib/web/templates/email/email_direct_activity.html.heex:260
 #, elixir-autogen, elixir-format
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}."
 msgstr ""
@@ -263,13 +263,13 @@ msgstr ""
 msgid "Here's your weekly activity recap"
 msgstr ""
 
-#: lib/web/email/activity.ex:154
-#: lib/web/email/activity.ex:175
+#: lib/web/email/activity.ex:151
+#: lib/web/email/activity.ex:172
 #, elixir-autogen, elixir-format
 msgid "Activity notification for %{instance}"
 msgstr ""
 
-#: lib/web/email/activity.ex:161
+#: lib/web/email/activity.ex:158
 #, elixir-autogen, elixir-format
 msgid "Daily activity recap for %{instance}"
 msgstr ""
@@ -280,171 +280,171 @@ msgstr ""
 msgid "Here's your daily activity recap"
 msgstr ""
 
-#: lib/web/email/activity.ex:168
+#: lib/web/email/activity.ex:165
 #, elixir-autogen, elixir-format
 msgid "Weekly activity recap for %{instance}"
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:66
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:37
+#: lib/service/activity/renderer/comment.ex:65
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:31
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:19
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted a new comment under your event %{event}."
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:53
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:26
+#: lib/service/activity/renderer/comment.ex:52
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:22
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted a new reply under your event %{event}."
 msgstr ""
 
-#: lib/web/email/activity.ex:77
+#: lib/web/email/activity.ex:74
 #, elixir-autogen, elixir-format
 msgid "Announcement for your event %{event}"
 msgstr ""
 
-#: lib/service/activity/renderer/group.ex:23
+#: lib/service/activity/renderer/group.ex:22
 #, elixir-autogen, elixir-format
 msgid "The group %{group} was updated by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/post.ex:47
+#: lib/service/activity/renderer/post.ex:46
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was deleted by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/post.ex:31
+#: lib/service/activity/renderer/post.ex:30
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was published by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/post.ex:39
+#: lib/service/activity/renderer/post.ex:38
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was updated by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:39
+#: lib/service/activity/renderer/member.ex:38
 #, elixir-autogen, elixir-format
 msgid "%{member} accepted the invitation to join the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:47
+#: lib/service/activity/renderer/member.ex:46
 #, elixir-autogen, elixir-format
 msgid "%{member} joined the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:42
 #, elixir-autogen, elixir-format
 msgid "%{member} rejected the invitation to join the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:31
+#: lib/service/activity/renderer/member.ex:30
 #, elixir-autogen, elixir-format
 msgid "%{member} requested to join the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:35
+#: lib/service/activity/renderer/member.ex:34
 #, elixir-autogen, elixir-format
 msgid "%{member} was invited by %{profile} to group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:51
+#: lib/service/activity/renderer/member.ex:50
 #, elixir-autogen, elixir-format
 msgid "%{profile} added the member %{member} to group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:55
+#: lib/service/activity/renderer/member.ex:54
 #, elixir-autogen, elixir-format
 msgid "%{profile} approved the membership request from %{member} for group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:33
+#: lib/service/activity/renderer/resource.ex:32
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the folder %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:69
+#: lib/service/activity/renderer/resource.ex:68
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the folder %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:71
+#: lib/service/activity/renderer/resource.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the resource %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:75
+#: lib/service/activity/renderer/member.ex:74
 #, elixir-autogen, elixir-format
 msgid "%{profile} excluded member %{member} from the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:61
+#: lib/service/activity/renderer/resource.ex:60
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the folder %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:63
+#: lib/service/activity/renderer/resource.ex:62
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the resource %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:79
+#: lib/service/activity/renderer/member.ex:78
 #, elixir-autogen, elixir-format
 msgid "%{profile} quit the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:62
 #, elixir-autogen, elixir-format
 msgid "%{profile} rejected the membership request from %{member} for group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:45
+#: lib/service/activity/renderer/resource.ex:44
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:51
+#: lib/service/activity/renderer/resource.ex:50
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:71
+#: lib/service/activity/renderer/member.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} updated the member %{member} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:35
+#: lib/service/activity/renderer/resource.ex:34
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the resource %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:86
+#: lib/service/activity/renderer/discussion.ex:85
 #, elixir-autogen, elixir-format
 msgid "%{profile} archived the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:26
+#: lib/service/activity/renderer/discussion.ex:25
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:101
+#: lib/service/activity/renderer/discussion.ex:100
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:56
+#: lib/service/activity/renderer/discussion.ex:55
 #, elixir-autogen, elixir-format
 msgid "%{profile} mentionned you in the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:71
+#: lib/service/activity/renderer/discussion.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:41
+#: lib/service/activity/renderer/discussion.ex:40
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to the discussion %{discussion} in group %{group}."
 msgstr ""
@@ -455,8 +455,8 @@ msgstr ""
 msgid "%{profile} approved the member %{member}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:74
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:55
+#: lib/service/activity/renderer/event.ex:73
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:47
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:31
 #, elixir-autogen, elixir-format
 msgid "%{profile} joined your event %{event}."
@@ -489,12 +489,12 @@ msgstr ""
 msgid "%{profile} mentionned you in a conversation."
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:37
+#: lib/service/activity/renderer/conversation.ex:36
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to your message"
 msgstr ""
 
-#: lib/web/templates/email/activity/_conversation_activity_item.html.heex:12
+#: lib/web/templates/email/activity/_conversation_activity_item.html.heex:10
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{profile} replied you in a %{conversation}."
 msgstr ""
@@ -504,28 +504,28 @@ msgstr ""
 msgid "%{profile} replied you in a conversation."
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:50
+#: lib/service/activity/renderer/conversation.ex:49
 #, elixir-autogen, elixir-format
 msgid "%{profile} sent a private message about event %{event}"
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:24
+#: lib/service/activity/renderer/conversation.ex:23
 #, elixir-autogen, elixir-format
 msgid "%{profile} sent you a message"
 msgstr ""
 
-#: lib/web/email/activity.ex:51
+#: lib/web/email/activity.ex:52
 #, elixir-autogen, elixir-format
 msgid "Informations about your event %{event}"
 msgstr ""
 
-#: lib/web/templates/email/email_anonymous_activity.html.heex:122
+#: lib/web/templates/email/email_anonymous_activity.html.heex:118
 #: lib/web/templates/email/email_anonymous_activity.text.eex:20
 #, elixir-autogen, elixir-format
 msgid "It might give details on how to join the event, so make sure to read it appropriately."
 msgstr ""
 
-#: lib/web/templates/email/email_anonymous_activity.html.heex:160
+#: lib/web/templates/email/email_anonymous_activity.html.heex:156
 #: lib/web/templates/email/email_anonymous_activity.text.eex:28
 #, elixir-autogen, elixir-format
 msgid "This information is sent privately to you as a person who registered for this event. Share the informations above with other people with caution."

priv/gettext/be/LC_MESSAGES/default.po

@@ -69,7 +69,7 @@ msgstr ""
 msgid "New report on Mobilizon instance %{instance}"
 msgstr ""
 
-#: lib/web/templates/email/before_event_notification.html.heex:67
+#: lib/web/templates/email/before_event_notification.html.heex:65
 #: lib/web/templates/email/before_event_notification.text.eex:4
 #, elixir-autogen, elixir-format
 msgid "Go to event page"
@@ -704,7 +704,7 @@ msgctxt "terms"
 msgid "Your content is yours"
 msgstr ""
 
-#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:71
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Confirm my e-mail address"
 msgstr ""
@@ -752,7 +752,6 @@ msgstr ""
 msgid "Please do not use it for real purposes."
 msgstr ""
 
-#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:88
 #: lib/web/templates/email/anonymous_participation_confirmation.text.eex:6
 #: lib/web/templates/email/event_updated.html.heex:172
 #: lib/web/templates/email/event_updated.text.eex:14
@@ -838,7 +837,7 @@ msgstr ""
 msgid "If you didn't trigger the change yourself, please ignore this message. Your password won't be changed until you click the link above."
 msgstr ""
 
-#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:103
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:130
 #: lib/web/templates/email/anonymous_participation_confirmation.text.eex:4
 #: lib/web/templates/email/registration_confirmation.html.heex:62
 #: lib/web/templates/email/registration_confirmation.text.eex:7
@@ -846,7 +845,7 @@ msgstr ""
 msgid "If you didn't trigger this email, you may safely ignore it."
 msgstr ""
 
-#: lib/web/templates/email/before_event_notification.html.heex:84
+#: lib/web/templates/email/before_event_notification.html.heex:82
 #: lib/web/templates/email/before_event_notification.text.eex:6
 #, elixir-autogen, elixir-format
 msgid "If you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button."
@@ -937,7 +936,7 @@ msgstr ""
 msgid "Unfortunately, the organizers rejected your request."
 msgstr ""
 
-#: lib/web/templates/email/email_changed_new.html.heex:70
+#: lib/web/templates/email/email_changed_new.html.heex:68
 #, elixir-autogen, elixir-format
 msgid "Verify your email address"
 msgstr ""
@@ -953,7 +952,7 @@ msgid "View report:"
 msgstr ""
 
 #: lib/web/templates/email/email_anonymous_activity.html.heex:85
-#: lib/web/templates/email/email_anonymous_activity.html.heex:184
+#: lib/web/templates/email/email_anonymous_activity.html.heex:182
 #: lib/web/templates/email/event_participation_approved.html.heex:81
 #: lib/web/templates/email/event_participation_confirmed.html.heex:81
 #, elixir-autogen, elixir-format
@@ -1008,7 +1007,7 @@ msgstr ""
 msgid "You're going!"
 msgstr ""
 
-#: lib/web/templates/email/email_changed_new.html.heex:87
+#: lib/web/templates/email/email_changed_new.html.heex:85
 #: lib/web/templates/email/email_changed_new.text.eex:5
 #, elixir-autogen, elixir-format
 msgid "If you didn't trigger the change yourself, please ignore this message."
@@ -1217,12 +1216,12 @@ msgstr ""
 msgid "You have now confirmed your participation. Update your calendar, because you're on the guest list now!"
 msgstr ""
 
-#: lib/mobilizon/posts/post.ex:99
+#: lib/mobilizon/posts/post.ex:98
 #, elixir-autogen, elixir-format
 msgid "A text is required for the post"
 msgstr ""
 
-#: lib/mobilizon/posts/post.ex:98
+#: lib/mobilizon/posts/post.ex:97
 #, elixir-autogen, elixir-format
 msgid "A title is required for the post"
 msgstr ""
@@ -1291,25 +1290,25 @@ msgstr ""
 msgid "This is a demonstration site to test Mobilizon."
 msgstr ""
 
-#: lib/service/metadata/actor.ex:93
-#: lib/service/metadata/actor.ex:100
+#: lib/service/metadata/actor.ex:86
+#: lib/service/metadata/actor.ex:92
 #: lib/service/metadata/instance.ex:60
 #: lib/service/metadata/instance.ex:66
 #, elixir-autogen, elixir-format
 msgid "%{name}'s feed"
 msgstr ""
 
-#: lib/service/export/feed.ex:120
+#: lib/service/export/feed.ex:117
 #, elixir-autogen, elixir-format
 msgid "%{actor}'s private events feed on %{instance}"
 msgstr ""
 
-#: lib/service/export/feed.ex:115
+#: lib/service/export/feed.ex:112
 #, elixir-autogen, elixir-format
 msgid "%{actor}'s public events feed on %{instance}"
 msgstr ""
 
-#: lib/service/export/feed.ex:224
+#: lib/service/export/feed.ex:221
 #, elixir-autogen, elixir-format
 msgid "Feed for %{email} on %{instance}"
 msgstr ""
@@ -1588,7 +1587,7 @@ msgstr ""
 msgid "Sorry, not this time!"
 msgstr ""
 
-#: lib/web/templates/email/group_membership_approval.html.heex:74
+#: lib/web/templates/email/group_membership_approval.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "View the group"
 msgstr ""
@@ -1997,3 +1996,13 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Participant registration date"
 msgstr ""
+
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:113
+#, elixir-autogen, elixir-format
+msgid "Cancel my attendance"
+msgstr ""
+
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:90
+#, elixir-autogen, elixir-format
+msgid "If you wish to cancel your participation, simply click on the link below."
+msgstr ""

priv/gettext/be/LC_MESSAGES/errors.po

@@ -11,7 +11,7 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100 != 11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10||n%100>=20) ? 1 : 2);\n"
 
-#: lib/mobilizon/discussions/discussion.ex:69
+#: lib/mobilizon/discussions/discussion.ex:68
 #, elixir-autogen
 msgid "can't be blank"
 msgstr ""
@@ -160,7 +160,7 @@ msgstr ""
 
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:34
-#: lib/graphql/resolvers/participant.ex:212
+#: lib/graphql/resolvers/participant.ex:217
 #: lib/graphql/resolvers/person.ex:247
 #: lib/graphql/resolvers/person.ex:378
 #: lib/graphql/resolvers/person.ex:414
@@ -396,7 +396,7 @@ msgstr ""
 #: lib/graphql/resolvers/participant.ex:89
 #: lib/graphql/resolvers/participant.ex:130
 #: lib/graphql/resolvers/participant.ex:157
-#: lib/graphql/resolvers/participant.ex:345
+#: lib/graphql/resolvers/participant.ex:350
 #, elixir-autogen, elixir-format
 msgid "Event with this ID %{id} doesn't exist"
 msgstr ""
@@ -425,14 +425,14 @@ msgstr ""
 msgid "No such feed token"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:261
+#: lib/graphql/resolvers/participant.ex:266
 #, elixir-autogen, elixir-format
 msgid "Participant already has role %{role}"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:189
-#: lib/graphql/resolvers/participant.ex:222
-#: lib/graphql/resolvers/participant.ex:265
+#: lib/graphql/resolvers/participant.ex:191
+#: lib/graphql/resolvers/participant.ex:227
+#: lib/graphql/resolvers/participant.ex:270
 #, elixir-autogen, elixir-format
 msgid "Participant not found"
 msgstr ""
@@ -509,7 +509,7 @@ msgstr ""
 msgid "The event has already reached its maximum capacity"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:291
+#: lib/graphql/resolvers/participant.ex:296
 #, elixir-autogen, elixir-format
 msgid "This token is invalid"
 msgstr ""
@@ -590,8 +590,8 @@ msgstr ""
 msgid "You are not allowed to update a comment if not connected"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:183
-#: lib/graphql/resolvers/participant.ex:216
+#: lib/graphql/resolvers/participant.ex:185
+#: lib/graphql/resolvers/participant.ex:221
 #, elixir-autogen, elixir-format
 msgid "You can't leave event because you're the only event creator participant"
 msgstr ""
@@ -706,7 +706,7 @@ msgstr ""
 msgid "You need to be logged-in to join an event"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:227
+#: lib/graphql/resolvers/participant.ex:232
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to leave an event"
 msgstr ""
@@ -842,7 +842,7 @@ msgstr ""
 msgid "You don't have the right to remove this member."
 msgstr ""
 
-#: lib/mobilizon/actors/actor.ex:384
+#: lib/mobilizon/actors/actor.ex:385
 #, elixir-autogen, elixir-format
 msgid "This username is already taken."
 msgstr ""
@@ -887,8 +887,8 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #: lib/graphql/resolvers/event.ex:165
-#: lib/graphql/resolvers/participant.ex:255
-#: lib/graphql/resolvers/participant.ex:337
+#: lib/graphql/resolvers/participant.ex:260
+#: lib/graphql/resolvers/participant.ex:342
 #, elixir-autogen, elixir-format
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
@@ -928,7 +928,7 @@ msgstr ""
 msgid "Error while uploading pictures"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:192
+#: lib/graphql/resolvers/participant.ex:194
 #, elixir-autogen, elixir-format
 msgid "Failed to leave the event"
 msgstr ""
@@ -969,17 +969,17 @@ msgstr ""
 msgid "You cannot change your password."
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:330
+#: lib/graphql/resolvers/participant.ex:335
 #, elixir-autogen, elixir-format
 msgid "Format not supported"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:314
+#: lib/graphql/resolvers/participant.ex:319
 #, elixir-autogen, elixir-format
 msgid "A dependency needed to export to %{format} is not installed"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:322
+#: lib/graphql/resolvers/participant.ex:327
 #, elixir-autogen, elixir-format
 msgid "An error occured while saving export"
 msgstr ""
@@ -1099,7 +1099,7 @@ msgstr ""
 msgid "Unable to find an instance to follow at this address"
 msgstr ""
 
-#: lib/mobilizon/actors/actor.ex:403
+#: lib/mobilizon/actors/actor.ex:404
 #, elixir-autogen, elixir-format
 msgid "Username must only contain alphanumeric lowercased characters and underscores."
 msgstr ""
@@ -1171,23 +1171,23 @@ msgstr ""
 msgid "Impossible to create application."
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:358
+#: lib/web/controllers/application_controller.ex:355
 #, elixir-autogen, elixir-format
 msgid "Incorrect parameters sent. You need to provide at least the grant_type and client_id parameters, depending on the grant type being used."
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:331
+#: lib/web/controllers/application_controller.ex:328
 #, elixir-autogen, elixir-format
 msgid "Invalid client credentials provided"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:339
+#: lib/web/controllers/application_controller.ex:336
 #, elixir-autogen, elixir-format
 msgid "Invalid refresh token provided"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:172
-#: lib/web/controllers/application_controller.ex:403
+#: lib/web/controllers/application_controller.ex:169
+#: lib/web/controllers/application_controller.ex:400
 #, elixir-autogen, elixir-format
 msgid "No application was found with this client_id"
 msgstr ""
@@ -1213,17 +1213,17 @@ msgstr ""
 msgid "Not authorized to access this %{object_type}"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:281
+#: lib/web/controllers/application_controller.ex:278
 #, elixir-autogen, elixir-format
 msgid "Please slow down the rate of your requests"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:269
+#: lib/web/controllers/application_controller.ex:266
 #, elixir-autogen, elixir-format
 msgid "The authorization request is still pending"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:251
+#: lib/web/controllers/application_controller.ex:248
 #, elixir-autogen, elixir-format
 msgid "The client_id provided or the device_code associated is invalid"
 msgstr ""
@@ -1233,7 +1233,7 @@ msgstr ""
 msgid "The device user code was not provided before approving the application"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:306
+#: lib/web/controllers/application_controller.ex:303
 #, elixir-autogen, elixir-format
 msgid "The given device_code has expired"
 msgstr ""
@@ -1243,7 +1243,7 @@ msgstr ""
 msgid "The given redirect_uri is not in the list of allowed redirect URIs"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:160
+#: lib/web/controllers/application_controller.ex:157
 #, elixir-autogen, elixir-format
 msgid "The given scope is not in the list of the app declared scopes"
 msgstr ""
@@ -1260,22 +1260,22 @@ msgstr ""
 msgid "The given user code is invalid"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:413
+#: lib/web/controllers/application_controller.ex:410
 #, elixir-autogen, elixir-format
 msgid "The provided client_id does not match the provided code"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:416
+#: lib/web/controllers/application_controller.ex:413
 #, elixir-autogen, elixir-format
 msgid "The provided client_secret is invalid"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:409
+#: lib/web/controllers/application_controller.ex:406
 #, elixir-autogen, elixir-format
 msgid "The provided code is invalid or expired"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:420
+#: lib/web/controllers/application_controller.ex:417
 #, elixir-autogen, elixir-format
 msgid "The provided scope is invalid or not included in the app declared scopes"
 msgstr ""
@@ -1285,17 +1285,17 @@ msgstr ""
 msgid "The scope parameter is not a space separated list of valid scopes"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:294
+#: lib/web/controllers/application_controller.ex:291
 #, elixir-autogen, elixir-format
 msgid "The user rejected the requested authorization"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:406
+#: lib/web/controllers/application_controller.ex:403
 #, elixir-autogen, elixir-format
 msgid "This redirect URI is not allowed"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:383
+#: lib/web/controllers/application_controller.ex:380
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Token not found"
 msgstr ""
@@ -1305,27 +1305,27 @@ msgstr ""
 msgid "Too many requests"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:186
+#: lib/web/controllers/application_controller.ex:183
 #, elixir-autogen, elixir-format
 msgid "Unable to produce device code"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:375
+#: lib/web/controllers/application_controller.ex:372
 #, elixir-autogen, elixir-format
 msgid "Unable to revoke token"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:200
+#: lib/web/controllers/application_controller.ex:197
 #, elixir-autogen, elixir-format
 msgid "You need to pass both client_id and scope as parameters to obtain a device code"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:138
+#: lib/web/controllers/application_controller.ex:135
 #, elixir-autogen, elixir-format
 msgid "You need to provide a valid redirect_uri to autorize an application"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:128
+#: lib/web/controllers/application_controller.ex:125
 #, elixir-autogen, elixir-format
 msgid "You need to specify client_id, redirect_uri, scope and state to autorize an application"
 msgstr ""
@@ -1335,12 +1335,12 @@ msgstr ""
 msgid "Couldn't send an email. Internal error."
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:288
+#: lib/graphql/resolvers/participant.ex:293
 #, elixir-autogen, elixir-format
 msgid "Participation is already confirmed"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:285
+#: lib/graphql/resolvers/participant.ex:290
 #, elixir-autogen, elixir-format
 msgid "Participation is confirmed but not approved yet by an organizer"
 msgstr ""
@@ -1391,7 +1391,7 @@ msgstr ""
 msgid "Conversation needs to mention at least one participant that's not yourself"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:390
+#: lib/graphql/resolvers/participant.ex:396
 #, elixir-autogen, elixir-format
 msgid "There are no participants matching the audience you've selected."
 msgstr ""

priv/gettext/ca/LC_MESSAGES/activity.po

@@ -72,7 +72,7 @@ msgstr ""
 msgid "%{profile} created the group %{group}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:15
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:13
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:8
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the resource %{resource}."
@@ -84,13 +84,13 @@ msgstr ""
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:88
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:76
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:40
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the folder %{resource}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:94
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:82
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:45
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the resource %{resource}."
@@ -102,13 +102,13 @@ msgstr ""
 msgid "%{profile} excluded member %{member}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:64
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:56
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:28
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the folder %{resource}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:75
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:65
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:34
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the resource %{resource}."
@@ -126,13 +126,13 @@ msgstr ""
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:28
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:24
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:14
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:45
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:39
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:21
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}."
@@ -144,7 +144,7 @@ msgstr ""
 msgid "%{profile} replied to the discussion %{discussion}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_group_activity_item.html.heex:14
+#: lib/web/templates/email/activity/_group_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_group_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "%{profile} updated the group %{group}."
@@ -156,22 +156,22 @@ msgstr ""
 msgid "%{profile} updated the member %{member}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:23
+#: lib/service/activity/renderer/event.ex:22
 #: lib/web/templates/email/activity/_event_activity_item.html.heex:3
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:1
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was created by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:43
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:25
+#: lib/service/activity/renderer/event.ex:42
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:21
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was deleted by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:33
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:14
+#: lib/service/activity/renderer/event.ex:32
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was updated by %{profile}."
@@ -183,13 +183,13 @@ msgstr ""
 msgid "The post %{post} was created by %{profile}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_post_activity_item.html.heex:25
+#: lib/web/templates/email/activity/_post_activity_item.html.heex:21
 #: lib/web/templates/email/activity/_post_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "The post %{post} was deleted by %{profile}."
 msgstr ""
 
-#: lib/web/templates/email/activity/_post_activity_item.html.heex:14
+#: lib/web/templates/email/activity/_post_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_post_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "The post %{post} was updated by %{profile}."
@@ -201,15 +201,15 @@ msgstr ""
 msgid "%{member} joined the group."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:63
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:43
+#: lib/service/activity/renderer/event.ex:62
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:37
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:25
 #, elixir-autogen, elixir-format
 msgid "%{profile} posted a comment on the event %{event}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:54
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:32
+#: lib/service/activity/renderer/event.ex:53
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:28
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:19
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to a comment on the event %{event}."
@@ -220,7 +220,7 @@ msgstr ""
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
-#: lib/web/templates/email/email_direct_activity.html.heex:222
+#: lib/web/templates/email/email_direct_activity.html.heex:230
 #: lib/web/templates/email/email_direct_activity.text.eex:23
 #, elixir-format
 msgid "View one more activity"
@@ -243,21 +243,21 @@ msgstr[1] ""
 msgid "Activity on %{instance}"
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:38
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:14
+#: lib/service/activity/renderer/comment.ex:37
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted an announcement under event %{event}."
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:24
+#: lib/service/activity/renderer/comment.ex:23
 #: lib/web/templates/email/activity/_comment_activity_item.html.heex:3
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:1
 #, elixir-autogen, elixir-format
 msgid "%{profile} mentionned you in a comment under event %{event}."
 msgstr ""
 
-#: lib/web/templates/email/email_direct_activity.html.heex:252
+#: lib/web/templates/email/email_direct_activity.html.heex:260
 #, elixir-autogen, elixir-format
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}."
 msgstr ""
@@ -268,13 +268,13 @@ msgstr ""
 msgid "Here's your weekly activity recap"
 msgstr ""
 
-#: lib/web/email/activity.ex:154
-#: lib/web/email/activity.ex:175
+#: lib/web/email/activity.ex:151
+#: lib/web/email/activity.ex:172
 #, elixir-autogen, elixir-format
 msgid "Activity notification for %{instance}"
 msgstr ""
 
-#: lib/web/email/activity.ex:161
+#: lib/web/email/activity.ex:158
 #, elixir-autogen, elixir-format
 msgid "Daily activity recap for %{instance}"
 msgstr ""
@@ -285,171 +285,171 @@ msgstr ""
 msgid "Here's your daily activity recap"
 msgstr ""
 
-#: lib/web/email/activity.ex:168
+#: lib/web/email/activity.ex:165
 #, elixir-autogen, elixir-format
 msgid "Weekly activity recap for %{instance}"
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:66
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:37
+#: lib/service/activity/renderer/comment.ex:65
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:31
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:19
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted a new comment under your event %{event}."
 msgstr ""
 
-#: lib/service/activity/renderer/comment.ex:53
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:26
+#: lib/service/activity/renderer/comment.ex:52
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:22
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted a new reply under your event %{event}."
 msgstr ""
 
-#: lib/web/email/activity.ex:77
+#: lib/web/email/activity.ex:74
 #, elixir-autogen, elixir-format
 msgid "Announcement for your event %{event}"
 msgstr ""
 
-#: lib/service/activity/renderer/group.ex:23
+#: lib/service/activity/renderer/group.ex:22
 #, elixir-autogen, elixir-format
 msgid "The group %{group} was updated by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/post.ex:47
+#: lib/service/activity/renderer/post.ex:46
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was deleted by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/post.ex:31
+#: lib/service/activity/renderer/post.ex:30
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was published by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/post.ex:39
+#: lib/service/activity/renderer/post.ex:38
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was updated by %{profile}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:39
+#: lib/service/activity/renderer/member.ex:38
 #, elixir-autogen, elixir-format
 msgid "%{member} accepted the invitation to join the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:47
+#: lib/service/activity/renderer/member.ex:46
 #, elixir-autogen, elixir-format
 msgid "%{member} joined the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:42
 #, elixir-autogen, elixir-format
 msgid "%{member} rejected the invitation to join the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:31
+#: lib/service/activity/renderer/member.ex:30
 #, elixir-autogen, elixir-format
 msgid "%{member} requested to join the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:35
+#: lib/service/activity/renderer/member.ex:34
 #, elixir-autogen, elixir-format
 msgid "%{member} was invited by %{profile} to group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:51
+#: lib/service/activity/renderer/member.ex:50
 #, elixir-autogen, elixir-format
 msgid "%{profile} added the member %{member} to group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:55
+#: lib/service/activity/renderer/member.ex:54
 #, elixir-autogen, elixir-format
 msgid "%{profile} approved the membership request from %{member} for group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:33
+#: lib/service/activity/renderer/resource.ex:32
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the folder %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:69
+#: lib/service/activity/renderer/resource.ex:68
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the folder %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:71
+#: lib/service/activity/renderer/resource.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the resource %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:75
+#: lib/service/activity/renderer/member.ex:74
 #, elixir-autogen, elixir-format
 msgid "%{profile} excluded member %{member} from the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:61
+#: lib/service/activity/renderer/resource.ex:60
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the folder %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:63
+#: lib/service/activity/renderer/resource.ex:62
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the resource %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:79
+#: lib/service/activity/renderer/member.ex:78
 #, elixir-autogen, elixir-format
 msgid "%{profile} quit the group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:62
 #, elixir-autogen, elixir-format
 msgid "%{profile} rejected the membership request from %{member} for group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:45
+#: lib/service/activity/renderer/resource.ex:44
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:51
+#: lib/service/activity/renderer/resource.ex:50
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/member.ex:71
+#: lib/service/activity/renderer/member.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} updated the member %{member} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/resource.ex:35
+#: lib/service/activity/renderer/resource.ex:34
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the resource %{resource} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:86
+#: lib/service/activity/renderer/discussion.ex:85
 #, elixir-autogen, elixir-format
 msgid "%{profile} archived the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:26
+#: lib/service/activity/renderer/discussion.ex:25
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:101
+#: lib/service/activity/renderer/discussion.ex:100
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:56
+#: lib/service/activity/renderer/discussion.ex:55
 #, elixir-autogen, elixir-format
 msgid "%{profile} mentionned you in the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:71
+#: lib/service/activity/renderer/discussion.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the discussion %{discussion} in group %{group}."
 msgstr ""
 
-#: lib/service/activity/renderer/discussion.ex:41
+#: lib/service/activity/renderer/discussion.ex:40
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to the discussion %{discussion} in group %{group}."
 msgstr ""
@@ -460,8 +460,8 @@ msgstr ""
 msgid "%{profile} approved the member %{member}."
 msgstr ""
 
-#: lib/service/activity/renderer/event.ex:74
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:55
+#: lib/service/activity/renderer/event.ex:73
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:47
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:31
 #, elixir-autogen, elixir-format
 msgid "%{profile} joined your event %{event}."
@@ -494,12 +494,12 @@ msgstr ""
 msgid "%{profile} mentionned you in a conversation."
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:37
+#: lib/service/activity/renderer/conversation.ex:36
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to your message"
 msgstr ""
 
-#: lib/web/templates/email/activity/_conversation_activity_item.html.heex:12
+#: lib/web/templates/email/activity/_conversation_activity_item.html.heex:10
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{profile} replied you in a %{conversation}."
 msgstr ""
@@ -509,28 +509,28 @@ msgstr ""
 msgid "%{profile} replied you in a conversation."
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:50
+#: lib/service/activity/renderer/conversation.ex:49
 #, elixir-autogen, elixir-format
 msgid "%{profile} sent a private message about event %{event}"
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:24
+#: lib/service/activity/renderer/conversation.ex:23
 #, elixir-autogen, elixir-format
 msgid "%{profile} sent you a message"
 msgstr ""
 
-#: lib/web/email/activity.ex:51
+#: lib/web/email/activity.ex:52
 #, elixir-autogen, elixir-format
 msgid "Informations about your event %{event}"
 msgstr ""
 
-#: lib/web/templates/email/email_anonymous_activity.html.heex:122
+#: lib/web/templates/email/email_anonymous_activity.html.heex:118
 #: lib/web/templates/email/email_anonymous_activity.text.eex:20
 #, elixir-autogen, elixir-format
 msgid "It might give details on how to join the event, so make sure to read it appropriately."
 msgstr ""
 
-#: lib/web/templates/email/email_anonymous_activity.html.heex:160
+#: lib/web/templates/email/email_anonymous_activity.html.heex:156
 #: lib/web/templates/email/email_anonymous_activity.text.eex:28
 #, elixir-autogen, elixir-format
 msgid "This information is sent privately to you as a person who registered for this event. Share the informations above with other people with caution."

priv/gettext/ca/LC_MESSAGES/default.po

@@ -74,7 +74,7 @@ msgstr "Instruccions per confirmar el teu compte de Mobilizon a %{instance}"
 msgid "New report on Mobilizon instance %{instance}"
 msgstr "S'ha denunciat una activitat al servidor de Mobilizon %{instance}"
 
-#: lib/web/templates/email/before_event_notification.html.heex:67
+#: lib/web/templates/email/before_event_notification.html.heex:65
 #: lib/web/templates/email/before_event_notification.text.eex:4
 #, elixir-autogen, elixir-format
 msgid "Go to event page"
@@ -867,7 +867,7 @@ msgctxt "terms"
 msgid "Your content is yours"
 msgstr "El teu contingut et pertany"
 
-#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:71
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Confirm my e-mail address"
 msgstr "Confirma la meva adreça de correu"
@@ -918,7 +918,6 @@ msgstr "Algú ha soŀlicitat a %{instance} una contrasenya nova."
 msgid "Please do not use it for real purposes."
 msgstr "No ho facis servir més que proves, sisplau"
 
-#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:88
 #: lib/web/templates/email/anonymous_participation_confirmation.text.eex:6
 #: lib/web/templates/email/event_updated.html.heex:172
 #: lib/web/templates/email/event_updated.text.eex:14
@@ -1022,7 +1021,7 @@ msgstr ""
 "Si no has fet aquest canvi, pots ignorar aquest missatge. La teva "
 "contrasenya es mantindrà si no cliques l'enllaç de sobre."
 
-#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:103
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:130
 #: lib/web/templates/email/anonymous_participation_confirmation.text.eex:4
 #: lib/web/templates/email/registration_confirmation.html.heex:62
 #: lib/web/templates/email/registration_confirmation.text.eex:7
@@ -1030,7 +1029,7 @@ msgstr ""
 msgid "If you didn't trigger this email, you may safely ignore it."
 msgstr "Si no has demanat això, sisplau ignora aquest correu."
 
-#: lib/web/templates/email/before_event_notification.html.heex:84
+#: lib/web/templates/email/before_event_notification.html.heex:82
 #: lib/web/templates/email/before_event_notification.text.eex:6
 #, elixir-autogen, elixir-format
 msgid "If you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button."
@@ -1125,7 +1124,7 @@ msgstr ""
 msgid "Unfortunately, the organizers rejected your request."
 msgstr "Malauradament, les organitzadores han rebutjat la teva participació."
 
-#: lib/web/templates/email/email_changed_new.html.heex:70
+#: lib/web/templates/email/email_changed_new.html.heex:68
 #, elixir-autogen, elixir-format
 msgid "Verify your email address"
 msgstr "Verifica l'adreça de correu"
@@ -1141,7 +1140,7 @@ msgid "View report:"
 msgstr "Mostra la denúncia"
 
 #: lib/web/templates/email/email_anonymous_activity.html.heex:85
-#: lib/web/templates/email/email_anonymous_activity.html.heex:184
+#: lib/web/templates/email/email_anonymous_activity.html.heex:182
 #: lib/web/templates/email/event_participation_approved.html.heex:81
 #: lib/web/templates/email/event_participation_confirmed.html.heex:81
 #, elixir-autogen, elixir-format
@@ -1202,7 +1201,7 @@ msgstr "Has soŀlicitat participar a l'activitat %{title}."
 msgid "You're going!"
 msgstr "T'han acceptat!"
 
-#: lib/web/templates/email/email_changed_new.html.heex:87
+#: lib/web/templates/email/email_changed_new.html.heex:85
 #: lib/web/templates/email/email_changed_new.text.eex:5
 #, elixir-autogen, elixir-format
 msgid "If you didn't trigger the change yourself, please ignore this message."
@@ -1454,12 +1453,12 @@ msgstr ""
 "Has confirmat la teva participació. Actualitza't l'agenda, perquè estàs a la "
 "llista de convidades!"
 
-#: lib/mobilizon/posts/post.ex:99
+#: lib/mobilizon/posts/post.ex:98
 #, elixir-autogen, elixir-format
 msgid "A text is required for the post"
 msgstr "Cal un text per la publicació"
 
-#: lib/mobilizon/posts/post.ex:98
+#: lib/mobilizon/posts/post.ex:97
 #, elixir-autogen, elixir-format
 msgid "A title is required for the post"
 msgstr "Cal un títol per la publicació"
@@ -1533,25 +1532,25 @@ msgstr "Ho sentim, s'ha produït un error al nostre costat."
 msgid "This is a demonstration site to test Mobilizon."
 msgstr "Aquesta és una web de proves per provar la beta de Mobilizon."
 
-#: lib/service/metadata/actor.ex:93
-#: lib/service/metadata/actor.ex:100
+#: lib/service/metadata/actor.ex:86
+#: lib/service/metadata/actor.ex:92
 #: lib/service/metadata/instance.ex:60
 #: lib/service/metadata/instance.ex:66
 #, elixir-autogen, elixir-format
 msgid "%{name}'s feed"
 msgstr "El flux de %{name}"
 
-#: lib/service/export/feed.ex:120
+#: lib/service/export/feed.ex:117
 #, elixir-autogen, elixir-format
 msgid "%{actor}'s private events feed on %{instance}"
 msgstr "El flux d'activitats privades de %{actor} a %{instance}"
 
-#: lib/service/export/feed.ex:115
+#: lib/service/export/feed.ex:112
 #, elixir-autogen, elixir-format
 msgid "%{actor}'s public events feed on %{instance}"
 msgstr "El flux d'activitats públiques de %{actor} a %{instance}"
 
-#: lib/service/export/feed.ex:224
+#: lib/service/export/feed.ex:221
 #, elixir-autogen, elixir-format
 msgid "Feed for %{email} on %{instance}"
 msgstr "Flux de %{email} a %{instance}"
@@ -1834,7 +1833,7 @@ msgstr ""
 msgid "Sorry, not this time!"
 msgstr ""
 
-#: lib/web/templates/email/group_membership_approval.html.heex:74
+#: lib/web/templates/email/group_membership_approval.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "View the group"
 msgstr ""
@@ -2255,3 +2254,13 @@ msgstr "Comentaris denunciats"
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Participant registration date"
 msgstr ""
+
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:113
+#, elixir-autogen, elixir-format
+msgid "Cancel my attendance"
+msgstr ""
+
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:90
+#, elixir-autogen, elixir-format
+msgid "If you wish to cancel your participation, simply click on the link below."
+msgstr ""

priv/gettext/ca/LC_MESSAGES/errors.po

@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Weblate 4.1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/mobilizon/discussions/discussion.ex:69
+#: lib/mobilizon/discussions/discussion.ex:68
 #, elixir-autogen
 msgid "can't be blank"
 msgstr "no pot estar buit"
@@ -161,7 +161,7 @@ msgstr ""
 
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:34
-#: lib/graphql/resolvers/participant.ex:212
+#: lib/graphql/resolvers/participant.ex:217
 #: lib/graphql/resolvers/person.ex:247
 #: lib/graphql/resolvers/person.ex:378
 #: lib/graphql/resolvers/person.ex:414
@@ -397,7 +397,7 @@ msgstr ""
 #: lib/graphql/resolvers/participant.ex:89
 #: lib/graphql/resolvers/participant.ex:130
 #: lib/graphql/resolvers/participant.ex:157
-#: lib/graphql/resolvers/participant.ex:345
+#: lib/graphql/resolvers/participant.ex:350
 #, elixir-autogen, elixir-format
 msgid "Event with this ID %{id} doesn't exist"
 msgstr ""
@@ -426,14 +426,14 @@ msgstr ""
 msgid "No such feed token"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:261
+#: lib/graphql/resolvers/participant.ex:266
 #, elixir-autogen, elixir-format
 msgid "Participant already has role %{role}"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:189
-#: lib/graphql/resolvers/participant.ex:222
-#: lib/graphql/resolvers/participant.ex:265
+#: lib/graphql/resolvers/participant.ex:191
+#: lib/graphql/resolvers/participant.ex:227
+#: lib/graphql/resolvers/participant.ex:270
 #, elixir-autogen, elixir-format
 msgid "Participant not found"
 msgstr ""
@@ -510,7 +510,7 @@ msgstr ""
 msgid "The event has already reached its maximum capacity"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:291
+#: lib/graphql/resolvers/participant.ex:296
 #, elixir-autogen, elixir-format
 msgid "This token is invalid"
 msgstr ""
@@ -591,8 +591,8 @@ msgstr ""
 msgid "You are not allowed to update a comment if not connected"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:183
-#: lib/graphql/resolvers/participant.ex:216
+#: lib/graphql/resolvers/participant.ex:185
+#: lib/graphql/resolvers/participant.ex:221
 #, elixir-autogen, elixir-format
 msgid "You can't leave event because you're the only event creator participant"
 msgstr ""
@@ -707,7 +707,7 @@ msgstr ""
 msgid "You need to be logged-in to join an event"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:227
+#: lib/graphql/resolvers/participant.ex:232
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to leave an event"
 msgstr ""
@@ -843,7 +843,7 @@ msgstr ""
 msgid "You don't have the right to remove this member."
 msgstr ""
 
-#: lib/mobilizon/actors/actor.ex:384
+#: lib/mobilizon/actors/actor.ex:385
 #, elixir-autogen, elixir-format
 msgid "This username is already taken."
 msgstr ""
@@ -888,8 +888,8 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #: lib/graphql/resolvers/event.ex:165
-#: lib/graphql/resolvers/participant.ex:255
-#: lib/graphql/resolvers/participant.ex:337
+#: lib/graphql/resolvers/participant.ex:260
+#: lib/graphql/resolvers/participant.ex:342
 #, elixir-autogen, elixir-format
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
@@ -929,7 +929,7 @@ msgstr ""
 msgid "Error while uploading pictures"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:192
+#: lib/graphql/resolvers/participant.ex:194
 #, elixir-autogen, elixir-format
 msgid "Failed to leave the event"
 msgstr ""
@@ -970,17 +970,17 @@ msgstr ""
 msgid "You cannot change your password."
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:330
+#: lib/graphql/resolvers/participant.ex:335
 #, elixir-autogen, elixir-format
 msgid "Format not supported"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:314
+#: lib/graphql/resolvers/participant.ex:319
 #, elixir-autogen, elixir-format
 msgid "A dependency needed to export to %{format} is not installed"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:322
+#: lib/graphql/resolvers/participant.ex:327
 #, elixir-autogen, elixir-format
 msgid "An error occured while saving export"
 msgstr ""
@@ -1100,7 +1100,7 @@ msgstr ""
 msgid "Unable to find an instance to follow at this address"
 msgstr ""
 
-#: lib/mobilizon/actors/actor.ex:403
+#: lib/mobilizon/actors/actor.ex:404
 #, elixir-autogen, elixir-format
 msgid "Username must only contain alphanumeric lowercased characters and underscores."
 msgstr ""
@@ -1172,23 +1172,23 @@ msgstr ""
 msgid "Impossible to create application."
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:358
+#: lib/web/controllers/application_controller.ex:355
 #, elixir-autogen, elixir-format
 msgid "Incorrect parameters sent. You need to provide at least the grant_type and client_id parameters, depending on the grant type being used."
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:331
+#: lib/web/controllers/application_controller.ex:328
 #, elixir-autogen, elixir-format
 msgid "Invalid client credentials provided"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:339
+#: lib/web/controllers/application_controller.ex:336
 #, elixir-autogen, elixir-format
 msgid "Invalid refresh token provided"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:172
-#: lib/web/controllers/application_controller.ex:403
+#: lib/web/controllers/application_controller.ex:169
+#: lib/web/controllers/application_controller.ex:400
 #, elixir-autogen, elixir-format
 msgid "No application was found with this client_id"
 msgstr ""
@@ -1214,17 +1214,17 @@ msgstr ""
 msgid "Not authorized to access this %{object_type}"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:281
+#: lib/web/controllers/application_controller.ex:278
 #, elixir-autogen, elixir-format
 msgid "Please slow down the rate of your requests"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:269
+#: lib/web/controllers/application_controller.ex:266
 #, elixir-autogen, elixir-format
 msgid "The authorization request is still pending"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:251
+#: lib/web/controllers/application_controller.ex:248
 #, elixir-autogen, elixir-format
 msgid "The client_id provided or the device_code associated is invalid"
 msgstr ""
@@ -1234,7 +1234,7 @@ msgstr ""
 msgid "The device user code was not provided before approving the application"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:306
+#: lib/web/controllers/application_controller.ex:303
 #, elixir-autogen, elixir-format
 msgid "The given device_code has expired"
 msgstr ""
@@ -1244,7 +1244,7 @@ msgstr ""
 msgid "The given redirect_uri is not in the list of allowed redirect URIs"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:160
+#: lib/web/controllers/application_controller.ex:157
 #, elixir-autogen, elixir-format
 msgid "The given scope is not in the list of the app declared scopes"
 msgstr ""
@@ -1261,22 +1261,22 @@ msgstr ""
 msgid "The given user code is invalid"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:413
+#: lib/web/controllers/application_controller.ex:410
 #, elixir-autogen, elixir-format
 msgid "The provided client_id does not match the provided code"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:416
+#: lib/web/controllers/application_controller.ex:413
 #, elixir-autogen, elixir-format
 msgid "The provided client_secret is invalid"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:409
+#: lib/web/controllers/application_controller.ex:406
 #, elixir-autogen, elixir-format
 msgid "The provided code is invalid or expired"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:420
+#: lib/web/controllers/application_controller.ex:417
 #, elixir-autogen, elixir-format
 msgid "The provided scope is invalid or not included in the app declared scopes"
 msgstr ""
@@ -1286,17 +1286,17 @@ msgstr ""
 msgid "The scope parameter is not a space separated list of valid scopes"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:294
+#: lib/web/controllers/application_controller.ex:291
 #, elixir-autogen, elixir-format
 msgid "The user rejected the requested authorization"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:406
+#: lib/web/controllers/application_controller.ex:403
 #, elixir-autogen, elixir-format
 msgid "This redirect URI is not allowed"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:383
+#: lib/web/controllers/application_controller.ex:380
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Token not found"
 msgstr ""
@@ -1306,27 +1306,27 @@ msgstr ""
 msgid "Too many requests"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:186
+#: lib/web/controllers/application_controller.ex:183
 #, elixir-autogen, elixir-format
 msgid "Unable to produce device code"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:375
+#: lib/web/controllers/application_controller.ex:372
 #, elixir-autogen, elixir-format
 msgid "Unable to revoke token"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:200
+#: lib/web/controllers/application_controller.ex:197
 #, elixir-autogen, elixir-format
 msgid "You need to pass both client_id and scope as parameters to obtain a device code"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:138
+#: lib/web/controllers/application_controller.ex:135
 #, elixir-autogen, elixir-format
 msgid "You need to provide a valid redirect_uri to autorize an application"
 msgstr ""
 
-#: lib/web/controllers/application_controller.ex:128
+#: lib/web/controllers/application_controller.ex:125
 #, elixir-autogen, elixir-format
 msgid "You need to specify client_id, redirect_uri, scope and state to autorize an application"
 msgstr ""
@@ -1336,12 +1336,12 @@ msgstr ""
 msgid "Couldn't send an email. Internal error."
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:288
+#: lib/graphql/resolvers/participant.ex:293
 #, elixir-autogen, elixir-format
 msgid "Participation is already confirmed"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:285
+#: lib/graphql/resolvers/participant.ex:290
 #, elixir-autogen, elixir-format
 msgid "Participation is confirmed but not approved yet by an organizer"
 msgstr ""
@@ -1392,7 +1392,7 @@ msgstr ""
 msgid "Conversation needs to mention at least one participant that's not yourself"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:390
+#: lib/graphql/resolvers/participant.ex:396
 #, elixir-autogen, elixir-format
 msgid "There are no participants matching the audience you've selected."
 msgstr ""

priv/gettext/cs/LC_MESSAGES/activity.po

@@ -72,7 +72,7 @@ msgstr "%{profile} vytvořil složku %{resource}."
 msgid "%{profile} created the group %{group}."
 msgstr "%{profile} vytvořil skupinu %{group}."
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:15
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:13
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:8
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the resource %{resource}."
@@ -84,13 +84,13 @@ msgstr "%{profile} vytvořil zdroj %{resource}."
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr "%{profile} smazal diskusi %{discussion}."
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:88
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:76
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:40
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the folder %{resource}."
 msgstr "%{profile} smazal složku %{resource}."
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:94
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:82
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:45
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the resource %{resource}."
@@ -102,13 +102,13 @@ msgstr "%{profile} smazal prostředek %{resource}."
 msgid "%{profile} excluded member %{member}."
 msgstr "%{profile} vyloučil člena %{member}."
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:64
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:56
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:28
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the folder %{resource}."
 msgstr "%{profile} přesunul složku %{resource}."
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:75
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:65
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:34
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the resource %{resource}."
@@ -126,13 +126,13 @@ msgstr "%{profile} ukončil skupinu."
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr "%{profile} přejmenoval diskusi %{discussion}."
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:28
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:24
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:14
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}."
 msgstr "%{profile} přejmenoval složku z %{old_resource_title} na %{resource}."
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:45
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:39
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:21
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}."
@@ -144,7 +144,7 @@ msgstr "%{profile} přejmenoval zdroj z %{old_resource_title} na %{resource}."
 msgid "%{profile} replied to the discussion %{discussion}."
 msgstr "%{profile} odpověděl na příspěvek v diskusi %{discussion}."
 
-#: lib/web/templates/email/activity/_group_activity_item.html.heex:14
+#: lib/web/templates/email/activity/_group_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_group_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "%{profile} updated the group %{group}."
@@ -156,22 +156,22 @@ msgstr "%{profile} aktualizoval skupinu %{group}."
 msgid "%{profile} updated the member %{member}."
 msgstr "%{profile} aktualizoval člena %{member}."
 
-#: lib/service/activity/renderer/event.ex:23
+#: lib/service/activity/renderer/event.ex:22
 #: lib/web/templates/email/activity/_event_activity_item.html.heex:3
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:1
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was created by %{profile}."
 msgstr "Událost %{event} byla vytvořena pomocí %{profile}."
 
-#: lib/service/activity/renderer/event.ex:43
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:25
+#: lib/service/activity/renderer/event.ex:42
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:21
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was deleted by %{profile}."
 msgstr "Událost %{event} byla odstraněna pomocí %{profile}."
 
-#: lib/service/activity/renderer/event.ex:33
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:14
+#: lib/service/activity/renderer/event.ex:32
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was updated by %{profile}."
@@ -183,13 +183,13 @@ msgstr "Událost %{event} byla aktualizována pomocí %{profile}."
 msgid "The post %{post} was created by %{profile}."
 msgstr "Příspěvek %{post} byl vytvořen uživatelem %{profile}."
 
-#: lib/web/templates/email/activity/_post_activity_item.html.heex:25
+#: lib/web/templates/email/activity/_post_activity_item.html.heex:21
 #: lib/web/templates/email/activity/_post_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "The post %{post} was deleted by %{profile}."
 msgstr "Příspěvek %{post} byl smazán uživatelem %{profile}."
 
-#: lib/web/templates/email/activity/_post_activity_item.html.heex:14
+#: lib/web/templates/email/activity/_post_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_post_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "The post %{post} was updated by %{profile}."
@@ -201,15 +201,15 @@ msgstr "Příspěvek %{post} byl aktualizován uživatelem %{profile}."
 msgid "%{member} joined the group."
 msgstr "%{member} se připojil ke skupině."
 
-#: lib/service/activity/renderer/event.ex:63
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:43
+#: lib/service/activity/renderer/event.ex:62
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:37
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:25
 #, elixir-autogen, elixir-format
 msgid "%{profile} posted a comment on the event %{event}."
 msgstr "%{profile} vložil komentář k události %{event}."
 
-#: lib/service/activity/renderer/event.ex:54
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:32
+#: lib/service/activity/renderer/event.ex:53
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:28
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:19
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to a comment on the event %{event}."
@@ -222,7 +222,7 @@ msgstr ""
 "Nechcete dostávat oznámení o aktivitách? V nastavení můžete změnit frekvenci "
 "nebo je zakázat."
 
-#: lib/web/templates/email/email_direct_activity.html.heex:222
+#: lib/web/templates/email/email_direct_activity.html.heex:230
 #: lib/web/templates/email/email_direct_activity.text.eex:23
 #, elixir-format
 msgid "View one more activity"
@@ -247,21 +247,21 @@ msgstr[2] "Došlo k nějakým aktivitám!"
 msgid "Activity on %{instance}"
 msgstr "Aktivita na %{instance}"
 
-#: lib/service/activity/renderer/comment.ex:38
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:14
+#: lib/service/activity/renderer/comment.ex:37
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted an announcement under event %{event}."
 msgstr "%{profile} zveřejnil oznámení v rámci události %{event}."
 
-#: lib/service/activity/renderer/comment.ex:24
+#: lib/service/activity/renderer/comment.ex:23
 #: lib/web/templates/email/activity/_comment_activity_item.html.heex:3
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:1
 #, elixir-autogen, elixir-format
 msgid "%{profile} mentionned you in a comment under event %{event}."
 msgstr "%{profile} vás zmínil v komentáři pod událostí %{event}."
 
-#: lib/web/templates/email/email_direct_activity.html.heex:252
+#: lib/web/templates/email/email_direct_activity.html.heex:260
 #, elixir-autogen, elixir-format
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}."
 msgstr ""
@@ -274,13 +274,13 @@ msgstr ""
 msgid "Here's your weekly activity recap"
 msgstr "Zde je váš týdenní přehled aktivit"
 
-#: lib/web/email/activity.ex:154
-#: lib/web/email/activity.ex:175
+#: lib/web/email/activity.ex:151
+#: lib/web/email/activity.ex:172
 #, elixir-autogen, elixir-format
 msgid "Activity notification for %{instance}"
 msgstr "Oznámení o činnosti pro %{instance}"
 
-#: lib/web/email/activity.ex:161
+#: lib/web/email/activity.ex:158
 #, elixir-autogen, elixir-format
 msgid "Daily activity recap for %{instance}"
 msgstr "Rekapitulace denní aktivity pro %{instance}"
@@ -291,177 +291,177 @@ msgstr "Rekapitulace denní aktivity pro %{instance}"
 msgid "Here's your daily activity recap"
 msgstr "Zde je přehled denních aktivit"
 
-#: lib/web/email/activity.ex:168
+#: lib/web/email/activity.ex:165
 #, elixir-autogen, elixir-format
 msgid "Weekly activity recap for %{instance}"
 msgstr "Týdenní shrnutí činnosti pro %{instance}"
 
-#: lib/service/activity/renderer/comment.ex:66
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:37
+#: lib/service/activity/renderer/comment.ex:65
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:31
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:19
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted a new comment under your event %{event}."
 msgstr "%{profile} vložil nový komentář pod vaši událost %{event}."
 
-#: lib/service/activity/renderer/comment.ex:53
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:26
+#: lib/service/activity/renderer/comment.ex:52
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:22
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted a new reply under your event %{event}."
 msgstr "%{profile} vložil novou odpověď pod vaši událost %{event}."
 
-#: lib/web/email/activity.ex:77
+#: lib/web/email/activity.ex:74
 #, elixir-autogen, elixir-format
 msgid "Announcement for your event %{event}"
 msgstr "Oznámení o vaší události %{event}"
 
-#: lib/service/activity/renderer/group.ex:23
+#: lib/service/activity/renderer/group.ex:22
 #, elixir-autogen, elixir-format
 msgid "The group %{group} was updated by %{profile}."
 msgstr "Skupina %{group} byla aktualizována pomocí %{profile}."
 
-#: lib/service/activity/renderer/post.ex:47
+#: lib/service/activity/renderer/post.ex:46
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was deleted by %{profile}."
 msgstr "Příspěvek %{post} ze skupiny %{group} byl smazán uživatelem %{profile}."
 
-#: lib/service/activity/renderer/post.ex:31
+#: lib/service/activity/renderer/post.ex:30
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was published by %{profile}."
 msgstr ""
 "Příspěvek %{post} ze skupiny %{group} byl zveřejněn uživatelem %{profile}."
 
-#: lib/service/activity/renderer/post.ex:39
+#: lib/service/activity/renderer/post.ex:38
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was updated by %{profile}."
 msgstr ""
 "Příspěvek %{post} ze skupiny %{group} byl aktualizován uživatelem %{profile}."
 
-#: lib/service/activity/renderer/member.ex:39
+#: lib/service/activity/renderer/member.ex:38
 #, elixir-autogen, elixir-format
 msgid "%{member} accepted the invitation to join the group %{group}."
 msgstr "%{member} přijal pozvání do skupiny %{group}."
 
-#: lib/service/activity/renderer/member.ex:47
+#: lib/service/activity/renderer/member.ex:46
 #, elixir-autogen, elixir-format
 msgid "%{member} joined the group %{group}."
 msgstr "%{member} se připojil ke skupině %{group}."
 
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:42
 #, elixir-autogen, elixir-format
 msgid "%{member} rejected the invitation to join the group %{group}."
 msgstr "%{member} odmítl pozvání do skupiny %{group}."
 
-#: lib/service/activity/renderer/member.ex:31
+#: lib/service/activity/renderer/member.ex:30
 #, elixir-autogen, elixir-format
 msgid "%{member} requested to join the group %{group}."
 msgstr "%{member} požádal o připojení ke skupině %{group}."
 
-#: lib/service/activity/renderer/member.ex:35
+#: lib/service/activity/renderer/member.ex:34
 #, elixir-autogen, elixir-format
 msgid "%{member} was invited by %{profile} to group %{group}."
 msgstr "%{member} byl pozván %{profile} do skupiny %{group}."
 
-#: lib/service/activity/renderer/member.ex:51
+#: lib/service/activity/renderer/member.ex:50
 #, elixir-autogen, elixir-format
 msgid "%{profile} added the member %{member} to group %{group}."
 msgstr "%{profile} přidal člena %{member} do skupiny %{group}."
 
-#: lib/service/activity/renderer/member.ex:55
+#: lib/service/activity/renderer/member.ex:54
 #, elixir-autogen, elixir-format
 msgid "%{profile} approved the membership request from %{member} for group %{group}."
 msgstr "%{profile} schválil žádost %{member} o členství ve skupině %{group}."
 
-#: lib/service/activity/renderer/resource.ex:33
+#: lib/service/activity/renderer/resource.ex:32
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the folder %{resource} in group %{group}."
 msgstr "%{profile} vytvořil složku %{resource} ve skupině %{group}."
 
-#: lib/service/activity/renderer/resource.ex:69
+#: lib/service/activity/renderer/resource.ex:68
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the folder %{resource} in group %{group}."
 msgstr "%{profile} odstranil složku %{resource} ve skupině %{group}."
 
-#: lib/service/activity/renderer/resource.ex:71
+#: lib/service/activity/renderer/resource.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the resource %{resource} in group %{group}."
 msgstr "%{profile} odstranil prostředek %{resource} ve skupině %{group}."
 
-#: lib/service/activity/renderer/member.ex:75
+#: lib/service/activity/renderer/member.ex:74
 #, elixir-autogen, elixir-format
 msgid "%{profile} excluded member %{member} from the group %{group}."
 msgstr "%{profile} vyloučil člena %{member} ze skupiny %{group}."
 
-#: lib/service/activity/renderer/resource.ex:61
+#: lib/service/activity/renderer/resource.ex:60
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the folder %{resource} in group %{group}."
 msgstr "%{profile} přesunul složku %{resource} do skupiny %{group}."
 
-#: lib/service/activity/renderer/resource.ex:63
+#: lib/service/activity/renderer/resource.ex:62
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the resource %{resource} in group %{group}."
 msgstr "%{profile} přesunul prostředek %{resource} do skupiny %{group}."
 
-#: lib/service/activity/renderer/member.ex:79
+#: lib/service/activity/renderer/member.ex:78
 #, elixir-autogen, elixir-format
 msgid "%{profile} quit the group %{group}."
 msgstr "%{profile} ukončí skupinu %{group}."
 
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:62
 #, elixir-autogen, elixir-format
 msgid "%{profile} rejected the membership request from %{member} for group %{group}."
 msgstr "%{profile} zamítl žádost o členství od %{member} pro skupinu %{group}."
 
-#: lib/service/activity/renderer/resource.ex:45
+#: lib/service/activity/renderer/resource.ex:44
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}."
 msgstr ""
 "%{profile} přejmenoval složku z %{old_resource_title} na %{resource} ve "
 "skupině %{group}."
 
-#: lib/service/activity/renderer/resource.ex:51
+#: lib/service/activity/renderer/resource.ex:50
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}."
 msgstr ""
 "%{profile} přejmenoval prostředek z %{old_resource_title} na %{resource} ve "
 "skupině %{group}."
 
-#: lib/service/activity/renderer/member.ex:71
+#: lib/service/activity/renderer/member.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} updated the member %{member} in group %{group}."
 msgstr "%{profile} aktualizoval člena %{member} ve skupině %{group}."
 
-#: lib/service/activity/renderer/resource.ex:35
+#: lib/service/activity/renderer/resource.ex:34
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the resource %{resource} in group %{group}."
 msgstr "%{profile} vytvořil prostředek %{resource} ve skupině %{group}."
 
-#: lib/service/activity/renderer/discussion.ex:86
+#: lib/service/activity/renderer/discussion.ex:85
 #, elixir-autogen, elixir-format
 msgid "%{profile} archived the discussion %{discussion} in group %{group}."
 msgstr "%{profile} archivoval diskusi %{discussion} ve skupině %{group}."
 
-#: lib/service/activity/renderer/discussion.ex:26
+#: lib/service/activity/renderer/discussion.ex:25
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the discussion %{discussion} in group %{group}."
 msgstr "%{profile} založil diskusi %{discussion} ve skupině %{group}."
 
-#: lib/service/activity/renderer/discussion.ex:101
+#: lib/service/activity/renderer/discussion.ex:100
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the discussion %{discussion} in group %{group}."
 msgstr "%{profile} smazal diskusi %{discussion} ve skupině %{group}."
 
-#: lib/service/activity/renderer/discussion.ex:56
+#: lib/service/activity/renderer/discussion.ex:55
 #, elixir-autogen, elixir-format
 msgid "%{profile} mentionned you in the discussion %{discussion} in group %{group}."
 msgstr "%{profile} vás zmínil v diskusi %{discussion} ve skupině %{group}."
 
-#: lib/service/activity/renderer/discussion.ex:71
+#: lib/service/activity/renderer/discussion.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the discussion %{discussion} in group %{group}."
 msgstr "%{profile} přejmenoval diskusi %{discussion} ve skupině %{group}."
 
-#: lib/service/activity/renderer/discussion.ex:41
+#: lib/service/activity/renderer/discussion.ex:40
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to the discussion %{discussion} in group %{group}."
 msgstr "%{profile} odpověděl na diskusi %{discussion} ve skupině %{group}."
@@ -472,8 +472,8 @@ msgstr "%{profile} odpověděl na diskusi %{discussion} ve skupině %{group}."
 msgid "%{profile} approved the member %{member}."
 msgstr "%{profile} schválil člena %{member}."
 
-#: lib/service/activity/renderer/event.ex:74
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:55
+#: lib/service/activity/renderer/event.ex:73
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:47
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:31
 #, elixir-autogen, elixir-format
 msgid "%{profile} joined your event %{event}."
@@ -506,12 +506,12 @@ msgstr "%{profile} vás zmínil v komentáři pod událostí %{event}."
 msgid "%{profile} mentionned you in a conversation."
 msgstr "%{profile} vás zmínil v komentáři pod událostí %{event}."
 
-#: lib/service/activity/renderer/conversation.ex:37
+#: lib/service/activity/renderer/conversation.ex:36
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to your message"
 msgstr ""
 
-#: lib/web/templates/email/activity/_conversation_activity_item.html.heex:12
+#: lib/web/templates/email/activity/_conversation_activity_item.html.heex:10
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{profile} replied you in a %{conversation}."
 msgstr "%{profile} odpověděl na příspěvek v diskusi %{discussion}."
@@ -521,28 +521,28 @@ msgstr "%{profile} odpověděl na příspěvek v diskusi %{discussion}."
 msgid "%{profile} replied you in a conversation."
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:50
+#: lib/service/activity/renderer/conversation.ex:49
 #, elixir-autogen, elixir-format
 msgid "%{profile} sent a private message about event %{event}"
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:24
+#: lib/service/activity/renderer/conversation.ex:23
 #, elixir-autogen, elixir-format
 msgid "%{profile} sent you a message"
 msgstr ""
 
-#: lib/web/email/activity.ex:51
+#: lib/web/email/activity.ex:52
 #, elixir-autogen, elixir-format
 msgid "Informations about your event %{event}"
 msgstr ""
 
-#: lib/web/templates/email/email_anonymous_activity.html.heex:122
+#: lib/web/templates/email/email_anonymous_activity.html.heex:118
 #: lib/web/templates/email/email_anonymous_activity.text.eex:20
 #, elixir-autogen, elixir-format
 msgid "It might give details on how to join the event, so make sure to read it appropriately."
 msgstr ""
 
-#: lib/web/templates/email/email_anonymous_activity.html.heex:160
+#: lib/web/templates/email/email_anonymous_activity.html.heex:156
 #: lib/web/templates/email/email_anonymous_activity.text.eex:28
 #, elixir-autogen, elixir-format
 msgid "This information is sent privately to you as a person who registered for this event. Share the informations above with other people with caution."

priv/gettext/cs/LC_MESSAGES/default.po

@@ -74,7 +74,7 @@ msgstr "Pokyny pro potvrzení účtu Mobilizon na %{instance}"
 msgid "New report on Mobilizon instance %{instance}"
 msgstr "Nové hlášení na instanci Mobilizon %{instance}"
 
-#: lib/web/templates/email/before_event_notification.html.heex:67
+#: lib/web/templates/email/before_event_notification.html.heex:65
 #: lib/web/templates/email/before_event_notification.text.eex:4
 #, elixir-autogen, elixir-format
 msgid "Go to event page"
@@ -873,7 +873,7 @@ msgctxt "terms"
 msgid "Your content is yours"
 msgstr "Obsah je váš"
 
-#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:71
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Confirm my e-mail address"
 msgstr "Potvrzení mé e-mailové adresy"
@@ -925,7 +925,6 @@ msgstr "Vyžádali jste si nové heslo pro svůj účet na <b>%{instance}</b>."
 msgid "Please do not use it for real purposes."
 msgstr "Nepoužívejte ji pro skutečné účely."
 
-#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:88
 #: lib/web/templates/email/anonymous_participation_confirmation.text.eex:6
 #: lib/web/templates/email/event_updated.html.heex:172
 #: lib/web/templates/email/event_updated.text.eex:14
@@ -1032,7 +1031,7 @@ msgstr ""
 "Pokud jste změnu nevyvolali sami, tuto zprávu ignorujte. Vaše heslo se "
 "nezmění, dokud nekliknete na výše uvedený odkaz."
 
-#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:103
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:130
 #: lib/web/templates/email/anonymous_participation_confirmation.text.eex:4
 #: lib/web/templates/email/registration_confirmation.html.heex:62
 #: lib/web/templates/email/registration_confirmation.text.eex:7
@@ -1040,7 +1039,7 @@ msgstr ""
 msgid "If you didn't trigger this email, you may safely ignore it."
 msgstr "Pokud jste tento e-mail nespustili, můžete jej bez obav ignorovat."
 
-#: lib/web/templates/email/before_event_notification.html.heex:84
+#: lib/web/templates/email/before_event_notification.html.heex:82
 #: lib/web/templates/email/before_event_notification.text.eex:6
 #, elixir-autogen, elixir-format
 msgid "If you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button."
@@ -1140,7 +1139,7 @@ msgstr ""
 msgid "Unfortunately, the organizers rejected your request."
 msgstr "Organizátoři bohužel vaši žádost zamítli."
 
-#: lib/web/templates/email/email_changed_new.html.heex:70
+#: lib/web/templates/email/email_changed_new.html.heex:68
 #, elixir-autogen, elixir-format
 msgid "Verify your email address"
 msgstr "Ověření e-mailové adresy"
@@ -1156,7 +1155,7 @@ msgid "View report:"
 msgstr "Zobrazit hlášení:"
 
 #: lib/web/templates/email/email_anonymous_activity.html.heex:85
-#: lib/web/templates/email/email_anonymous_activity.html.heex:184
+#: lib/web/templates/email/email_anonymous_activity.html.heex:182
 #: lib/web/templates/email/event_participation_approved.html.heex:81
 #: lib/web/templates/email/event_participation_confirmed.html.heex:81
 #, elixir-autogen, elixir-format
@@ -1218,7 +1217,7 @@ msgstr "Nedávno jste požádali o účast na %{title}."
 msgid "You're going!"
 msgstr "Chystáte se!"
 
-#: lib/web/templates/email/email_changed_new.html.heex:87
+#: lib/web/templates/email/email_changed_new.html.heex:85
 #: lib/web/templates/email/email_changed_new.text.eex:5
 #, elixir-autogen, elixir-format
 msgid "If you didn't trigger the change yourself, please ignore this message."
@@ -1516,12 +1515,12 @@ msgstr ""
 "Nyní jste potvrdili svou účast. Aktualizujte si kalendář, protože nyní jste "
 "na seznamu hostů!"
 
-#: lib/mobilizon/posts/post.ex:99
+#: lib/mobilizon/posts/post.ex:98
 #, elixir-autogen, elixir-format
 msgid "A text is required for the post"
 msgstr "U příspěvku je vyžadován text"
 
-#: lib/mobilizon/posts/post.ex:98
+#: lib/mobilizon/posts/post.ex:97
 #, elixir-autogen, elixir-format
 msgid "A title is required for the post"
 msgstr "U příspěvku je vyžadován nadpis"
@@ -1596,25 +1595,25 @@ msgstr "Je nám líto, ale na naší straně se něco pokazilo."
 msgid "This is a demonstration site to test Mobilizon."
 msgstr "Jde o demonstrační web pro testování Mobilizon."
 
-#: lib/service/metadata/actor.ex:93
-#: lib/service/metadata/actor.ex:100
+#: lib/service/metadata/actor.ex:86
+#: lib/service/metadata/actor.ex:92
 #: lib/service/metadata/instance.ex:60
 #: lib/service/metadata/instance.ex:66
 #, elixir-autogen, elixir-format
 msgid "%{name}'s feed"
 msgstr "Kanál %{name}"
 
-#: lib/service/export/feed.ex:120
+#: lib/service/export/feed.ex:117
 #, elixir-autogen, elixir-format
 msgid "%{actor}'s private events feed on %{instance}"
 msgstr "Kanál soukromých událostí %{actor} na %{instance}"
 
-#: lib/service/export/feed.ex:115
+#: lib/service/export/feed.ex:112
 #, elixir-autogen, elixir-format
 msgid "%{actor}'s public events feed on %{instance}"
 msgstr "Kanál veřejných událostí %{actor} na %{instance}"
 
-#: lib/service/export/feed.ex:224
+#: lib/service/export/feed.ex:221
 #, elixir-autogen, elixir-format
 msgid "Feed for %{email} on %{instance}"
 msgstr "Kanál pro %{email} na %{instance}"
@@ -1899,7 +1898,7 @@ msgstr "Nové datum zahájení:"
 msgid "Sorry, not this time!"
 msgstr "Promiňte, tentokrát ne!"
 
-#: lib/web/templates/email/group_membership_approval.html.heex:74
+#: lib/web/templates/email/group_membership_approval.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "View the group"
 msgstr "Zobrazit skupinu"
@@ -2348,3 +2347,13 @@ msgstr "Označené komentáře"
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Participant registration date"
 msgstr "Status účastníka"
+
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:113
+#, elixir-autogen, elixir-format
+msgid "Cancel my attendance"
+msgstr ""
+
+#: lib/web/templates/email/anonymous_participation_confirmation.html.heex:90
+#, elixir-autogen, elixir-format
+msgid "If you wish to cancel your participation, simply click on the link below."
+msgstr ""

priv/gettext/cs/LC_MESSAGES/errors.po

@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 4.16.4\n"
 
-#: lib/mobilizon/discussions/discussion.ex:69
+#: lib/mobilizon/discussions/discussion.ex:68
 #, elixir-autogen
 msgid "can't be blank"
 msgstr "nemůže být prázdný"
@@ -169,7 +169,7 @@ msgstr "Nebyl nalezen žádný uživatel s tímto e-mailem"
 
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:34
-#: lib/graphql/resolvers/participant.ex:212
+#: lib/graphql/resolvers/participant.ex:217
 #: lib/graphql/resolvers/person.ex:247
 #: lib/graphql/resolvers/person.ex:378
 #: lib/graphql/resolvers/person.ex:414
@@ -407,7 +407,7 @@ msgstr "Událost nebyla nalezena"
 #: lib/graphql/resolvers/participant.ex:89
 #: lib/graphql/resolvers/participant.ex:130
 #: lib/graphql/resolvers/participant.ex:157
-#: lib/graphql/resolvers/participant.ex:345
+#: lib/graphql/resolvers/participant.ex:350
 #, elixir-autogen, elixir-format
 msgid "Event with this ID %{id} doesn't exist"
 msgstr "Událost s tímto ID %{id} neexistuje"
@@ -436,14 +436,14 @@ msgstr "Pro uživatele nebyl nalezen žádný profil"
 msgid "No such feed token"
 msgstr "Žádný takový token"
 
-#: lib/graphql/resolvers/participant.ex:261
+#: lib/graphql/resolvers/participant.ex:266
 #, elixir-autogen, elixir-format
 msgid "Participant already has role %{role}"
 msgstr "Účastník již má roli %{role}"
 
-#: lib/graphql/resolvers/participant.ex:189
-#: lib/graphql/resolvers/participant.ex:222
-#: lib/graphql/resolvers/participant.ex:265
+#: lib/graphql/resolvers/participant.ex:191
+#: lib/graphql/resolvers/participant.ex:227
+#: lib/graphql/resolvers/participant.ex:270
 #, elixir-autogen, elixir-format
 msgid "Participant not found"
 msgstr "Účastník nebyl nalezen"
@@ -520,7 +520,7 @@ msgstr "Zdroj neexistuje"
 msgid "The event has already reached its maximum capacity"
 msgstr "Kapacita akce již byla naplněna na maximum"
 
-#: lib/graphql/resolvers/participant.ex:291
+#: lib/graphql/resolvers/participant.ex:296
 #, elixir-autogen, elixir-format
 msgid "This token is invalid"
 msgstr "Tento token je neplatný"
@@ -601,8 +601,8 @@ msgstr "Pokud nejste připojeni, nemůžete odstranit token kanálu"
 msgid "You are not allowed to update a comment if not connected"
 msgstr "Pokud nejste připojeni, nemůžete komentář aktualizovat"
 
-#: lib/graphql/resolvers/participant.ex:183
-#: lib/graphql/resolvers/participant.ex:216
+#: lib/graphql/resolvers/participant.ex:185
+#: lib/graphql/resolvers/participant.ex:221
 #, elixir-autogen, elixir-format
 msgid "You can't leave event because you're the only event creator participant"
 msgstr ""
@@ -724,7 +724,7 @@ msgstr "Chcete-li odstranit zdroje, musíte být přihlášeni"
 msgid "You need to be logged-in to join an event"
 msgstr "Chcete-li se připojit k události, musíte být přihlášeni"
 
-#: lib/graphql/resolvers/participant.ex:227
+#: lib/graphql/resolvers/participant.ex:232
 #, elixir-autogen, elixir-format
 msgid "You need to be logged-in to leave an event"
 msgstr "Chcete-li opustit událost, musíte být přihlášeni"
@@ -860,7 +860,7 @@ msgstr "Tento člen již byl odmítnut."
 msgid "You don't have the right to remove this member."
 msgstr "Nemáte oprávnění tohoto člena odstranit."
 
-#: lib/mobilizon/actors/actor.ex:384
+#: lib/mobilizon/actors/actor.ex:385
 #, elixir-autogen, elixir-format
 msgid "This username is already taken."
 msgstr "Toto uživatelské jméno je již obsazeno."
@@ -905,8 +905,8 @@ msgid "Unable to fetch resource details from this URL."
 msgstr "Z této adresy URL nelze načíst podrobnosti o prostředku."
 
 #: lib/graphql/resolvers/event.ex:165
-#: lib/graphql/resolvers/participant.ex:255
-#: lib/graphql/resolvers/participant.ex:337
+#: lib/graphql/resolvers/participant.ex:260
+#: lib/graphql/resolvers/participant.ex:342
 #, elixir-autogen, elixir-format
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr "Za předpokladu, že profil nemá oprávnění moderátora této události"
@@ -949,7 +949,7 @@ msgstr "Chyba při aktualizaci locale"
 msgid "Error while uploading pictures"
 msgstr "Chyba při nahrávání obrázků"
 
-#: lib/graphql/resolvers/participant.ex:192
+#: lib/graphql/resolvers/participant.ex:194
 #, elixir-autogen, elixir-format
 msgid "Failed to leave the event"
 msgstr "Nepodařilo se opustit událost"
@@ -990,17 +990,17 @@ msgstr "Nejste autorem komentáře"
 msgid "You cannot change your password."
 msgstr "Heslo nelze změnit."
 
-#: lib/graphql/resolvers/participant.ex:330
+#: lib/graphql/resolvers/participant.ex:335
 #, elixir-autogen, elixir-format
 msgid "Format not supported"
 msgstr "Formát není podporován"
 
-#: lib/graphql/resolvers/participant.ex:314
+#: lib/graphql/resolvers/participant.ex:319
 #, elixir-autogen, elixir-format
 msgid "A dependency needed to export to %{format} is not installed"
 msgstr "Závislost potřebná k exportu do %{format} není nainstalována"
 
-#: lib/graphql/resolvers/participant.ex:322
+#: lib/graphql/resolvers/participant.ex:327
 #, elixir-autogen, elixir-format
 msgid "An error occured while saving export"
 msgstr "Při ukládání exportu došlo k chybě"
@@ -1122,7 +1122,7 @@ msgid "Unable to find an instance to follow at this address"
 msgstr ""
 "Na této adrese se nepodařilo najít instanci, kterou by bylo možné sledovat"
 
-#: lib/mobilizon/actors/actor.ex:403
+#: lib/mobilizon/actors/actor.ex:404
 #, elixir-autogen, elixir-format
 msgid "Username must only contain alphanumeric lowercased characters and underscores."
 msgstr ""
@@ -1199,25 +1199,25 @@ msgstr "Chyba při odebírání tokenu"
 msgid "Impossible to create application."
 msgstr "Nelze vytvořit aplikaci."
 
-#: lib/web/controllers/application_controller.ex:358
+#: lib/web/controllers/application_controller.ex:355
 #, elixir-autogen, elixir-format
 msgid "Incorrect parameters sent. You need to provide at least the grant_type and client_id parameters, depending on the grant type being used."
 msgstr ""
 "Odeslány nesprávné parametry. V závislosti na použitém typu grantu je třeba "
 "zadat alespoň parametry grant_type a client_id."
 
-#: lib/web/controllers/application_controller.ex:331
+#: lib/web/controllers/application_controller.ex:328
 #, elixir-autogen, elixir-format
 msgid "Invalid client credentials provided"
 msgstr "Zadání neplatných pověření klienta"
 
-#: lib/web/controllers/application_controller.ex:339
+#: lib/web/controllers/application_controller.ex:336
 #, elixir-autogen, elixir-format
 msgid "Invalid refresh token provided"
 msgstr "Zadán neplatný token obnovení"
 
-#: lib/web/controllers/application_controller.ex:172
-#: lib/web/controllers/application_controller.ex:403
+#: lib/web/controllers/application_controller.ex:169
+#: lib/web/controllers/application_controller.ex:400
 #, elixir-autogen, elixir-format
 msgid "No application was found with this client_id"
 msgstr "Nebyla nalezena žádná aplikace s tímto client_id"
@@ -1243,17 +1243,17 @@ msgstr "Není oprávněn přistupovat k objektu %{objekt}"
 msgid "Not authorized to access this %{object_type}"
 msgstr "Není oprávněn k přístupu k tomuto %{object_type}"
 
-#: lib/web/controllers/application_controller.ex:281
+#: lib/web/controllers/application_controller.ex:278
 #, elixir-autogen, elixir-format
 msgid "Please slow down the rate of your requests"
 msgstr "Zpomalte prosím tempo svých požadavků"
 
-#: lib/web/controllers/application_controller.ex:269
+#: lib/web/controllers/application_controller.ex:266
 #, elixir-autogen, elixir-format
 msgid "The authorization request is still pending"
 msgstr "Na žádost o povolení se stále čeká"
 
-#: lib/web/controllers/application_controller.ex:251
+#: lib/web/controllers/application_controller.ex:248
 #, elixir-autogen, elixir-format
 msgid "The client_id provided or the device_code associated is invalid"
 msgstr "Zadané client_id nebo přiřazený device_code jsou neplatné"
@@ -1263,7 +1263,7 @@ msgstr "Zadané client_id nebo přiřazený device_code jsou neplatné"
 msgid "The device user code was not provided before approving the application"
 msgstr "Před schválením žádosti nebyl uveden kód uživatele zařízení"
 
-#: lib/web/controllers/application_controller.ex:306
+#: lib/web/controllers/application_controller.ex:303
 #, elixir-autogen, elixir-format
 msgid "The given device_code has expired"
 msgstr "Platnost daného device_code vypršela"
@@ -1273,7 +1273,7 @@ msgstr "Platnost daného device_code vypršela"
 msgid "The given redirect_uri is not in the list of allowed redirect URIs"
 msgstr "Zadané redirect_uri není v seznamu povolených URI pro přesměrování"
 
-#: lib/web/controllers/application_controller.ex:160
+#: lib/web/controllers/application_controller.ex:157
 #, elixir-autogen, elixir-format
 msgid "The given scope is not in the list of the app declared scopes"
 msgstr "Daný rozsah není v seznamu deklarovaných rozsahů aplikace"
@@ -1290,22 +1290,22 @@ msgstr "Platnost daného kódu uživatele vypršela"
 msgid "The given user code is invalid"
 msgstr "Zadaný kód uživatele je neplatný"
 
-#: lib/web/controllers/application_controller.ex:413
+#: lib/web/controllers/application_controller.ex:410
 #, elixir-autogen, elixir-format
 msgid "The provided client_id does not match the provided code"
 msgstr "Zadané client_id neodpovídá zadanému kódu"
 
-#: lib/web/controllers/application_controller.ex:416
+#: lib/web/controllers/application_controller.ex:413
 #, elixir-autogen, elixir-format
 msgid "The provided client_secret is invalid"
 msgstr "Zadaný client_secret je neplatný"
 
-#: lib/web/controllers/application_controller.ex:409
+#: lib/web/controllers/application_controller.ex:406
 #, elixir-autogen, elixir-format
 msgid "The provided code is invalid or expired"
 msgstr "Poskytnutý kód je neplatný nebo jeho platnost vypršela"
 
-#: lib/web/controllers/application_controller.ex:420
+#: lib/web/controllers/application_controller.ex:417
 #, elixir-autogen, elixir-format
 msgid "The provided scope is invalid or not included in the app declared scopes"
 msgstr ""
@@ -1316,17 +1316,17 @@ msgstr ""
 msgid "The scope parameter is not a space separated list of valid scopes"
 msgstr "Parametr rozsah není seznam platných rozsahů oddělený mezerou"
 
-#: lib/web/controllers/application_controller.ex:294
+#: lib/web/controllers/application_controller.ex:291
 #, elixir-autogen, elixir-format
 msgid "The user rejected the requested authorization"
 msgstr "Uživatel odmítl požadovanou autorizaci"
 
-#: lib/web/controllers/application_controller.ex:406
+#: lib/web/controllers/application_controller.ex:403
 #, elixir-autogen, elixir-format
 msgid "This redirect URI is not allowed"
 msgstr "Toto přesměrování URI není povoleno"
 
-#: lib/web/controllers/application_controller.ex:383
+#: lib/web/controllers/application_controller.ex:380
 #, elixir-autogen, elixir-format
 msgid "Token not found"
 msgstr "Token nebyl nalezen"
@@ -1336,28 +1336,28 @@ msgstr "Token nebyl nalezen"
 msgid "Too many requests"
 msgstr "Příliš mnoho požadavků"
 
-#: lib/web/controllers/application_controller.ex:186
+#: lib/web/controllers/application_controller.ex:183
 #, elixir-autogen, elixir-format
 msgid "Unable to produce device code"
 msgstr "Nelze vytvořit kód zařízení"
 
-#: lib/web/controllers/application_controller.ex:375
+#: lib/web/controllers/application_controller.ex:372
 #, elixir-autogen, elixir-format
 msgid "Unable to revoke token"
 msgstr "Nelze odvolat token"
 
-#: lib/web/controllers/application_controller.ex:200
+#: lib/web/controllers/application_controller.ex:197
 #, elixir-autogen, elixir-format
 msgid "You need to pass both client_id and scope as parameters to obtain a device code"
 msgstr ""
 "Chcete-li získat kód zařízení, musíte jako parametry předat client_id a scope"
 
-#: lib/web/controllers/application_controller.ex:138
+#: lib/web/controllers/application_controller.ex:135
 #, elixir-autogen, elixir-format
 msgid "You need to provide a valid redirect_uri to autorize an application"
 msgstr "Pro autorizaci aplikace je třeba zadat platnou redirect_uri"
 
-#: lib/web/controllers/application_controller.ex:128
+#: lib/web/controllers/application_controller.ex:125
 #, elixir-autogen, elixir-format
 msgid "You need to specify client_id, redirect_uri, scope and state to autorize an application"
 msgstr ""
@@ -1368,12 +1368,12 @@ msgstr ""
 msgid "Couldn't send an email. Internal error."
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:288
+#: lib/graphql/resolvers/participant.ex:293
 #, elixir-autogen, elixir-format
 msgid "Participation is already confirmed"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:285
+#: lib/graphql/resolvers/participant.ex:290
 #, elixir-autogen, elixir-format
 msgid "Participation is confirmed but not approved yet by an organizer"
 msgstr ""
@@ -1424,7 +1424,7 @@ msgstr ""
 msgid "Conversation needs to mention at least one participant that's not yourself"
 msgstr ""
 
-#: lib/graphql/resolvers/participant.ex:390
+#: lib/graphql/resolvers/participant.ex:396
 #, elixir-autogen, elixir-format
 msgid "There are no participants matching the audience you've selected."
 msgstr ""

priv/gettext/de/LC_MESSAGES/activity.po

@@ -72,7 +72,7 @@ msgstr "%{profile} hat den Ordner %{resource} erstellt."
 msgid "%{profile} created the group %{group}."
 msgstr "%{profile} hat die Gruppe %{group} erstellt."
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:15
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:13
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:8
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the resource %{resource}."
@@ -84,13 +84,13 @@ msgstr "%{profile} hat die Ressource %{resource} erstellt."
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr "%{profile} hat die Diskussion %{discussion} gelöscht."
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:88
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:76
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:40
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the folder %{resource}."
 msgstr "%{profile} hat den Ordner %{resource} gelöscht."
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:94
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:82
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:45
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the resource %{resource}."
@@ -102,13 +102,13 @@ msgstr "%{profile} hat die Ressource %{resource} gelöscht."
 msgid "%{profile} excluded member %{member}."
 msgstr "%{profile} hat das Mitglied %{member} ausgeschlossen."
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:64
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:56
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:28
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the folder %{resource}."
 msgstr "%{profile} hat den Ordner %{resource} verschoben."
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:75
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:65
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:34
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the resource %{resource}."
@@ -126,14 +126,14 @@ msgstr "%{profile} hat die Gruppe verlassen."
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr "%{profile} hat die Diskussion %{discussion} umbenannt."
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:28
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:24
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:14
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}."
 msgstr ""
 "%{profile} hat den Folder %{old_resource_title} in %{resource} umbenannt."
 
-#: lib/web/templates/email/activity/_resource_activity_item.html.heex:45
+#: lib/web/templates/email/activity/_resource_activity_item.html.heex:39
 #: lib/web/templates/email/activity/_resource_activity_item.text.eex:21
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}."
@@ -146,7 +146,7 @@ msgstr ""
 msgid "%{profile} replied to the discussion %{discussion}."
 msgstr "%{profile} hat auf die Diskussion %{discussion} geantwortet."
 
-#: lib/web/templates/email/activity/_group_activity_item.html.heex:14
+#: lib/web/templates/email/activity/_group_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_group_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "%{profile} updated the group %{group}."
@@ -158,22 +158,22 @@ msgstr "%{profile} hat die Gruppe %{group} aktualisiert."
 msgid "%{profile} updated the member %{member}."
 msgstr "%{profile} hat das Mitglied %{member} aktualisiert."
 
-#: lib/service/activity/renderer/event.ex:23
+#: lib/service/activity/renderer/event.ex:22
 #: lib/web/templates/email/activity/_event_activity_item.html.heex:3
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:1
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was created by %{profile}."
 msgstr "Die Veranstaltung %{event} wurde von %{profile} erstellt."
 
-#: lib/service/activity/renderer/event.ex:43
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:25
+#: lib/service/activity/renderer/event.ex:42
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:21
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was deleted by %{profile}."
 msgstr "Die Veranstaltung %{event} wurde von %{profile} gelöscht."
 
-#: lib/service/activity/renderer/event.ex:33
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:14
+#: lib/service/activity/renderer/event.ex:32
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "The event %{event} was updated by %{profile}."
@@ -185,13 +185,13 @@ msgstr "Die Veranstaltung %{event} wurde von %{profile} aktualisiert."
 msgid "The post %{post} was created by %{profile}."
 msgstr "Der Beitrag %{post} wurde von %{profile} erstellt."
 
-#: lib/web/templates/email/activity/_post_activity_item.html.heex:25
+#: lib/web/templates/email/activity/_post_activity_item.html.heex:21
 #: lib/web/templates/email/activity/_post_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "The post %{post} was deleted by %{profile}."
 msgstr "Der Beitrag %{post} wurde von %{profile} gelöscht."
 
-#: lib/web/templates/email/activity/_post_activity_item.html.heex:14
+#: lib/web/templates/email/activity/_post_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_post_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "The post %{post} was updated by %{profile}."
@@ -203,15 +203,15 @@ msgstr "Der Beitrag %{post} wurde von %{profile} aktualisiert."
 msgid "%{member} joined the group."
 msgstr "%{member} ist der Gruppe beigetreten."
 
-#: lib/service/activity/renderer/event.ex:63
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:43
+#: lib/service/activity/renderer/event.ex:62
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:37
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:25
 #, elixir-autogen, elixir-format
 msgid "%{profile} posted a comment on the event %{event}."
 msgstr "%{profile} hat die Veranstaltung %{event} kommentiert."
 
-#: lib/service/activity/renderer/event.ex:54
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:32
+#: lib/service/activity/renderer/event.ex:53
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:28
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:19
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to a comment on the event %{event}."
@@ -226,7 +226,7 @@ msgstr ""
 "mit der Sie Benachrichtigungen erhalten, in den Einstellungen ändern oder "
 "Sie ausschalten."
 
-#: lib/web/templates/email/email_direct_activity.html.heex:222
+#: lib/web/templates/email/email_direct_activity.html.heex:230
 #: lib/web/templates/email/email_direct_activity.text.eex:23
 #, elixir-format
 msgid "View one more activity"
@@ -249,8 +249,8 @@ msgstr[1] "Es hat sich einiges getan!"
 msgid "Activity on %{instance}"
 msgstr "Aktivität auf %{instance}"
 
-#: lib/service/activity/renderer/comment.ex:38
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:14
+#: lib/service/activity/renderer/comment.ex:37
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:12
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:7
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted an announcement under event %{event}."
@@ -258,7 +258,7 @@ msgstr ""
 "%{profile} hat eine Ankündigung unter der Veranstaltung %{event} "
 "veröffentlicht."
 
-#: lib/service/activity/renderer/comment.ex:24
+#: lib/service/activity/renderer/comment.ex:23
 #: lib/web/templates/email/activity/_comment_activity_item.html.heex:3
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:1
 #, elixir-autogen, elixir-format
@@ -267,7 +267,7 @@ msgstr ""
 "%{profile} hat Sie in einem Kommentar unter der Veranstaltung %{event} "
 "erwähnt."
 
-#: lib/web/templates/email/email_direct_activity.html.heex:252
+#: lib/web/templates/email/email_direct_activity.html.heex:260
 #, elixir-autogen, elixir-format
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}."
 msgstr ""
@@ -281,13 +281,13 @@ msgstr ""
 msgid "Here's your weekly activity recap"
 msgstr "Hier ist Ihre wöchentliche Zusammenfassung der Aktivitäten"
 
-#: lib/web/email/activity.ex:154
-#: lib/web/email/activity.ex:175
+#: lib/web/email/activity.ex:151
+#: lib/web/email/activity.ex:172
 #, elixir-autogen, elixir-format
 msgid "Activity notification for %{instance}"
 msgstr "Aktivitätsbenachrichtigung für %{instance}"
 
-#: lib/web/email/activity.ex:161
+#: lib/web/email/activity.ex:158
 #, elixir-autogen, elixir-format
 msgid "Daily activity recap for %{instance}"
 msgstr "Tägliche Zusammenfassung der Aktivitäten für %{instance}"
@@ -298,13 +298,13 @@ msgstr "Tägliche Zusammenfassung der Aktivitäten für %{instance}"
 msgid "Here's your daily activity recap"
 msgstr "Hier ist Ihre tägliche Zusammenfassung der Aktivitäten"
 
-#: lib/web/email/activity.ex:168
+#: lib/web/email/activity.ex:165
 #, elixir-autogen, elixir-format
 msgid "Weekly activity recap for %{instance}"
 msgstr "Wöchentliche Zusammenfassung der Aktivitäten für %{instance}"
 
-#: lib/service/activity/renderer/comment.ex:66
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:37
+#: lib/service/activity/renderer/comment.ex:65
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:31
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:19
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted a new comment under your event %{event}."
@@ -312,172 +312,172 @@ msgstr ""
 "%{profile} hat einen neuen Kommentar unter Ihrer Veranstaltung %{event} "
 "abgegeben."
 
-#: lib/service/activity/renderer/comment.ex:53
-#: lib/web/templates/email/activity/_comment_activity_item.html.heex:26
+#: lib/service/activity/renderer/comment.ex:52
+#: lib/web/templates/email/activity/_comment_activity_item.html.heex:22
 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:13
 #, elixir-autogen, elixir-format
 msgid "%{profile} has posted a new reply under your event %{event}."
 msgstr ""
 "%{profile} hat eine neue Antwort unter Ihrer Veranstaltung %{event} gepostet."
 
-#: lib/web/email/activity.ex:77
+#: lib/web/email/activity.ex:74
 #, elixir-autogen, elixir-format
 msgid "Announcement for your event %{event}"
 msgstr "Ankündigung für Ihre Veranstaltung %{event}"
 
-#: lib/service/activity/renderer/group.ex:23
+#: lib/service/activity/renderer/group.ex:22
 #, elixir-autogen, elixir-format
 msgid "The group %{group} was updated by %{profile}."
 msgstr "Die Gruppe %{group} wurde von %{profile} aktualisiert."
 
-#: lib/service/activity/renderer/post.ex:47
+#: lib/service/activity/renderer/post.ex:46
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was deleted by %{profile}."
 msgstr ""
 "Der Beitrag %{post} in der Gruppe %{group} wurde von %{profile} gelöscht."
 
-#: lib/service/activity/renderer/post.ex:31
+#: lib/service/activity/renderer/post.ex:30
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was published by %{profile}."
 msgstr ""
 "Der Beitrag %{post} in der Gruppe %{group} wurde von %{profile} "
 "veröffentlicht."
 
-#: lib/service/activity/renderer/post.ex:39
+#: lib/service/activity/renderer/post.ex:38
 #, elixir-autogen, elixir-format
 msgid "The post %{post} from group %{group} was updated by %{profile}."
 msgstr ""
 "Der Beitrag %{post} in der Gruppe %{group} wurde von %{profile} aktualisiert."
 
-#: lib/service/activity/renderer/member.ex:39
+#: lib/service/activity/renderer/member.ex:38
 #, elixir-autogen, elixir-format
 msgid "%{member} accepted the invitation to join the group %{group}."
 msgstr "%{member} hat die Einladung in die Gruppe angenommen."
 
-#: lib/service/activity/renderer/member.ex:47
+#: lib/service/activity/renderer/member.ex:46
 #, elixir-autogen, elixir-format
 msgid "%{member} joined the group %{group}."
 msgstr "%{member} ist der Gruppe beigetreten."
 
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:42
 #, elixir-autogen, elixir-format
 msgid "%{member} rejected the invitation to join the group %{group}."
 msgstr "%{member} hat die Einladung in die Gruppe abgelehnt."
 
-#: lib/service/activity/renderer/member.ex:31
+#: lib/service/activity/renderer/member.ex:30
 #, elixir-autogen, elixir-format
 msgid "%{member} requested to join the group %{group}."
 msgstr "%{member} hat den Eintritt in die Gruppe beantragt."
 
-#: lib/service/activity/renderer/member.ex:35
+#: lib/service/activity/renderer/member.ex:34
 #, elixir-autogen, elixir-format
 msgid "%{member} was invited by %{profile} to group %{group}."
 msgstr "%{member} wurde von %{profile} eingeladen."
 
-#: lib/service/activity/renderer/member.ex:51
+#: lib/service/activity/renderer/member.ex:50
 #, elixir-autogen, elixir-format
 msgid "%{profile} added the member %{member} to group %{group}."
 msgstr "%{profile} hat das Mitglied %{member} hinzugefügt."
 
-#: lib/service/activity/renderer/member.ex:55
+#: lib/service/activity/renderer/member.ex:54
 #, elixir-autogen, elixir-format
 msgid "%{profile} approved the membership request from %{member} for group %{group}."
 msgstr "%{profile} hat das Mitglied %{member} aktualisiert."
 
-#: lib/service/activity/renderer/resource.ex:33
+#: lib/service/activity/renderer/resource.ex:32
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the folder %{resource} in group %{group}."
 msgstr "%{profile} hat den Folder %{resource} erstellt."
 
-#: lib/service/activity/renderer/resource.ex:69
+#: lib/service/activity/renderer/resource.ex:68
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the folder %{resource} in group %{group}."
 msgstr "%{profile} hat den Folder %{resource} gelöscht."
 
-#: lib/service/activity/renderer/resource.ex:71
+#: lib/service/activity/renderer/resource.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the resource %{resource} in group %{group}."
 msgstr "%{profile} hat die Ressource %{resource} gelöscht."
 
-#: lib/service/activity/renderer/member.ex:75
+#: lib/service/activity/renderer/member.ex:74
 #, elixir-autogen, elixir-format
 msgid "%{profile} excluded member %{member} from the group %{group}."
 msgstr "%{profile} hat das Mitglied %{member} ausgeschlossen."
 
-#: lib/service/activity/renderer/resource.ex:61
+#: lib/service/activity/renderer/resource.ex:60
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the folder %{resource} in group %{group}."
 msgstr ""
 "%{profile} hat den Ordner %{resource} in der Gruppe %{group} verschoben."
 
-#: lib/service/activity/renderer/resource.ex:63
+#: lib/service/activity/renderer/resource.ex:62
 #, elixir-autogen, elixir-format
 msgid "%{profile} moved the resource %{resource} in group %{group}."
 msgstr ""
 "%{profile} hat die Ressource %{resource} in der Gruppe %{group} verschoben."
 
-#: lib/service/activity/renderer/member.ex:79
+#: lib/service/activity/renderer/member.ex:78
 #, elixir-autogen, elixir-format
 msgid "%{profile} quit the group %{group}."
 msgstr "%{profile} hat die Gruppe verlassen."
 
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:62
 #, elixir-autogen, elixir-format
 msgid "%{profile} rejected the membership request from %{member} for group %{group}."
 msgstr ""
 "%{profile} hat die Mitgliedschaftsanfrage von %{member} für die Gruppe "
 "%{group} abgelehnt."
 
-#: lib/service/activity/renderer/resource.ex:45
+#: lib/service/activity/renderer/resource.ex:44
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource} in group %{group}."
 msgstr ""
 "%{profile} hat den Folder %{old_resource_title} in %{resource} umbenannt."
 
-#: lib/service/activity/renderer/resource.ex:51
+#: lib/service/activity/renderer/resource.ex:50
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource} in group %{group}."
 msgstr ""
 "{profile} hat die Ressource %{old_resource_title} in %{resource} umbenannt."
 
-#: lib/service/activity/renderer/member.ex:71
+#: lib/service/activity/renderer/member.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} updated the member %{member} in group %{group}."
 msgstr "%{profile} hat das Mitglied %{member} aktualisiert."
 
-#: lib/service/activity/renderer/resource.ex:35
+#: lib/service/activity/renderer/resource.ex:34
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the resource %{resource} in group %{group}."
 msgstr "%{profile} hat die Ressource %{resource} erstellt."
 
-#: lib/service/activity/renderer/discussion.ex:86
+#: lib/service/activity/renderer/discussion.ex:85
 #, elixir-autogen, elixir-format
 msgid "%{profile} archived the discussion %{discussion} in group %{group}."
 msgstr "%{profile} hat die Diskussion %{discussion} archiviert."
 
-#: lib/service/activity/renderer/discussion.ex:26
+#: lib/service/activity/renderer/discussion.ex:25
 #, elixir-autogen, elixir-format
 msgid "%{profile} created the discussion %{discussion} in group %{group}."
 msgstr "%{profile} hat die Diskussion %{discussion} erstellt."
 
-#: lib/service/activity/renderer/discussion.ex:101
+#: lib/service/activity/renderer/discussion.ex:100
 #, elixir-autogen, elixir-format
 msgid "%{profile} deleted the discussion %{discussion} in group %{group}."
 msgstr "%{profile} hat die Diskussion %{discussion} gelöscht."
 
-#: lib/service/activity/renderer/discussion.ex:56
+#: lib/service/activity/renderer/discussion.ex:55
 #, elixir-autogen, elixir-format
 msgid "%{profile} mentionned you in the discussion %{discussion} in group %{group}."
 msgstr ""
 "%{profile} hat dich in der Diskussion %{discussion} in der Gruppe %{group} "
 "erwähnt."
 
-#: lib/service/activity/renderer/discussion.ex:71
+#: lib/service/activity/renderer/discussion.ex:70
 #, elixir-autogen, elixir-format
 msgid "%{profile} renamed the discussion %{discussion} in group %{group}."
 msgstr "%{profile} hat die Diskussion %{discussion} umbenannt."
 
-#: lib/service/activity/renderer/discussion.ex:41
+#: lib/service/activity/renderer/discussion.ex:40
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to the discussion %{discussion} in group %{group}."
 msgstr "%{profile} hat auf die Diskussion %{discussion} geantwortet."
@@ -488,8 +488,8 @@ msgstr "%{profile} hat auf die Diskussion %{discussion} geantwortet."
 msgid "%{profile} approved the member %{member}."
 msgstr "%{profile} hat das Mitglied %{member} bestätigt."
 
-#: lib/service/activity/renderer/event.ex:74
-#: lib/web/templates/email/activity/_event_activity_item.html.heex:55
+#: lib/service/activity/renderer/event.ex:73
+#: lib/web/templates/email/activity/_event_activity_item.html.heex:47
 #: lib/web/templates/email/activity/_event_activity_item.text.eex:31
 #, elixir-autogen, elixir-format
 msgid "%{profile} joined your event %{event}."
@@ -530,12 +530,12 @@ msgstr ""
 "%{profile} hat Sie in einem Kommentar unter der Veranstaltung %{event} "
 "erwähnt."
 
-#: lib/service/activity/renderer/conversation.ex:37
+#: lib/service/activity/renderer/conversation.ex:36
 #, elixir-autogen, elixir-format
 msgid "%{profile} replied to your message"
 msgstr ""
 
-#: lib/web/templates/email/activity/_conversation_activity_item.html.heex:12
+#: lib/web/templates/email/activity/_conversation_activity_item.html.heex:10
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{profile} replied you in a %{conversation}."
 msgstr "%{profile} hat auf die Diskussion %{discussion} geantwortet."
@@ -545,28 +545,28 @@ msgstr "%{profile} hat auf die Diskussion %{discussion} geantwortet."
 msgid "%{profile} replied you in a conversation."
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:50
+#: lib/service/activity/renderer/conversation.ex:49
 #, elixir-autogen, elixir-format
 msgid "%{profile} sent a private message about event %{event}"
 msgstr ""
 
-#: lib/service/activity/renderer/conversation.ex:24
+#: lib/service/activity/renderer/conversation.ex:23
 #, elixir-autogen, elixir-format
 msgid "%{profile} sent you a message"
 msgstr ""
 
-#: lib/web/email/activity.ex:51
+#: lib/web/email/activity.ex:52
 #, elixir-autogen, elixir-format
 msgid "Informations about your event %{event}"
 msgstr ""
 
-#: lib/web/templates/email/email_anonymous_activity.html.heex:122
+#: lib/web/templates/email/email_anonymous_activity.html.heex:118
 #: lib/web/templates/email/email_anonymous_activity.text.eex:20
 #, elixir-autogen, elixir-format
 msgid "It might give details on how to join the event, so make sure to read it appropriately."
 msgstr ""
 
-#: lib/web/templates/email/email_anonymous_activity.html.heex:160
+#: lib/web/templates/email/email_anonymous_activity.html.heex:156
 #: lib/web/templates/email/email_anonymous_activity.text.eex:28
 #, elixir-autogen, elixir-format
 msgid "This information is sent privately to you as a person who registered for this event. Share the informations above with other people with caution."