From 5cdac95a85b92b355aa3ff449660f049e2d849e1 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 27 Jun 2021 18:16:34 +0200 Subject: [PATCH 1/3] Send announcement notifications to anonymous participants Signed-off-by: Thomas Citharel --- lib/mobilizon/events/events.ex | 13 + lib/service/notifier/email.ex | 12 + .../workers/legacy_notifier_builder.ex | 22 +- lib/web/email/activity.ex | 18 ++ .../email/email_anonymous_activity.html.eex | 83 +++++++ .../email/email_anonymous_activity.text.eex | 11 + priv/gettext/activity.pot | 61 +++-- priv/gettext/ar/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/ar/LC_MESSAGES/default.po | 4 +- priv/gettext/be/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/be/LC_MESSAGES/default.po | 4 +- priv/gettext/ca/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/ca/LC_MESSAGES/default.po | 4 +- priv/gettext/cs/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/cs/LC_MESSAGES/default.po | 4 +- priv/gettext/de/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/de/LC_MESSAGES/default.po | 4 +- priv/gettext/default.pot | 4 +- priv/gettext/en/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/en/LC_MESSAGES/default.po | 4 +- priv/gettext/es/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/es/LC_MESSAGES/default.po | 4 +- priv/gettext/fi/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/fi/LC_MESSAGES/default.po | 4 +- priv/gettext/fr/LC_MESSAGES/activity.po | 227 ++++++++---------- priv/gettext/fr/LC_MESSAGES/default.po | 4 +- priv/gettext/gl/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/gl/LC_MESSAGES/default.po | 4 +- priv/gettext/hu/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/hu/LC_MESSAGES/default.po | 4 +- priv/gettext/it/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/it/LC_MESSAGES/default.po | 4 +- priv/gettext/ja/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/ja/LC_MESSAGES/default.po | 4 +- priv/gettext/nl/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/nl/LC_MESSAGES/default.po | 4 +- priv/gettext/nn/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/nn/LC_MESSAGES/default.po | 4 +- priv/gettext/oc/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/oc/LC_MESSAGES/default.po | 4 +- priv/gettext/pl/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/pl/LC_MESSAGES/default.po | 4 +- priv/gettext/pt/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/pt/LC_MESSAGES/default.po | 4 +- priv/gettext/pt_BR/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/pt_BR/LC_MESSAGES/default.po | 4 +- priv/gettext/ru/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/ru/LC_MESSAGES/default.po | 4 +- priv/gettext/sv/LC_MESSAGES/activity.po | 61 +++-- priv/gettext/sv/LC_MESSAGES/default.po | 4 +- test/service/notifier/email_test.exs | 12 + 51 files changed, 1172 insertions(+), 595 deletions(-) create mode 100644 lib/web/templates/email/email_anonymous_activity.html.eex create mode 100644 lib/web/templates/email/email_anonymous_activity.text.eex diff --git a/lib/mobilizon/events/events.ex b/lib/mobilizon/events/events.ex index f1a99c06a..e410bd9dd 100644 --- a/lib/mobilizon/events/events.ex +++ b/lib/mobilizon/events/events.ex @@ -1611,6 +1611,19 @@ defmodule Mobilizon.Events do |> select([p, a, u, s], {p, a, u, s}) end + @doc """ + List anonymous participations to an event + """ + @spec list_anonymous_participants_for_event(String.t()) :: [Participant.t()] + def list_anonymous_participants_for_event(event_id) do + Participant + |> where( + [p], + p.event_id == ^event_id and p.role not in [^:not_approved, ^:not_confirmed, ^:rejected] + ) + |> Repo.all() + end + @spec list_participations_for_user_query(integer()) :: Ecto.Query.t() defp list_participations_for_user_query(user_id) do from( diff --git a/lib/service/notifier/email.ex b/lib/service/notifier/email.ex index 304074696..c12f6106d 100644 --- a/lib/service/notifier/email.ex +++ b/lib/service/notifier/email.ex @@ -51,6 +51,18 @@ defmodule Mobilizon.Service.Notifier.Email do end end + @doc """ + Send an anonymous activity directly to an email, for anonymous participants for instance + """ + @spec send_anonymous_activity(String.t(), Activity.t(), Keyword.t()) :: {:ok, :sent} + def send_anonymous_activity(email, %Activity{} = activity, options) do + email + |> EmailActivity.anonymous_activity(activity, options) + |> Mailer.send_email() + + {:ok, :sent} + end + # These notifications are using LegacyNotifierBuilder and don't have any history, # so we always send them directly, as long as the setting isn't none @always_direct_subjects [ diff --git a/lib/service/workers/legacy_notifier_builder.ex b/lib/service/workers/legacy_notifier_builder.ex index 83ebe0399..9a6ef1391 100644 --- a/lib/service/workers/legacy_notifier_builder.ex +++ b/lib/service/workers/legacy_notifier_builder.ex @@ -6,7 +6,7 @@ defmodule Mobilizon.Service.Workers.LegacyNotifierBuilder do alias Mobilizon.Activities.Activity alias Mobilizon.{Actors, Events, Users} alias Mobilizon.Actors.Actor - alias Mobilizon.Events.Event + alias Mobilizon.Events.{Event, Participant} alias Mobilizon.Service.Notifier use Mobilizon.Service.Workers.Helper, queue: "activity" @@ -16,6 +16,10 @@ defmodule Mobilizon.Service.Workers.LegacyNotifierBuilder do with {"legacy_notify", args} <- Map.pop(args, "op") do activity = build_activity(args) + if args["subject"] == "participation_event_comment" do + notify_anonymous_participants(get_in(args, ["subject_params", "event_id"]), activity) + end + args |> users_to_notify(author_id: args["author_id"], group_id: Map.get(args, "group_id")) |> Enum.each(&Notifier.notify(&1, activity, single_activity: true)) @@ -91,4 +95,20 @@ defmodule Mobilizon.Service.Workers.LegacyNotifierBuilder do |> Enum.uniq() |> Enum.map(&Users.get_user_with_settings!/1) end + + defp notify_anonymous_participants(nil, _activity), do: :ok + + defp notify_anonymous_participants(event_id, activity) do + event_id + |> Events.list_anonymous_participants_for_event() + |> Enum.filter(fn %Participant{metadata: metadata} -> + is_map(metadata) && is_binary(metadata.email) + end) + |> Enum.map(fn %Participant{metadata: metadata} -> metadata end) + |> Enum.map(fn metadata -> + Notifier.Email.send_anonymous_activity(metadata.email, activity, + locale: Map.get(metadata, :locale, "en") + ) + end) + end end diff --git a/lib/web/email/activity.ex b/lib/web/email/activity.ex index ba2735a25..339fcb9eb 100644 --- a/lib/web/email/activity.ex +++ b/lib/web/email/activity.ex @@ -38,6 +38,24 @@ defmodule Mobilizon.Web.Email.Activity do |> render(:email_direct_activity) end + @spec anonymous_activity(String.t(), Activity.t(), Keyword.t()) :: Bamboo.Email.t() + def anonymous_activity(email, %Activity{subject_params: subject_params} = activity, options) do + locale = Keyword.get(options, :locale, "en") + + subject = + dgettext( + "activity", + "Announcement for your event %{event}", + event: subject_params["event_title"] + ) + + Email.base_email(to: email, subject: subject) + |> assign(:subject, subject) + |> assign(:activity, activity) + |> assign(:locale, locale) + |> render(:email_anonymous_activity) + end + @spec chunk_activities(list()) :: map() defp chunk_activities(activities) do activities diff --git a/lib/web/templates/email/email_anonymous_activity.html.eex b/lib/web/templates/email/email_anonymous_activity.html.eex new file mode 100644 index 000000000..66b95852a --- /dev/null +++ b/lib/web/templates/email/email_anonymous_activity.html.eex @@ -0,0 +1,83 @@ + + + + + + + + +
+

+ <%= @subject %> +

+
+ + + + + + + + + + + + + + + +
+ + + + +
+ <%= + dgettext("activity", "%{profile} has posted an announcement under event %{event}.", + %{ + profile: "#{Mobilizon.Actors.Actor.display_name_and_username(@activity.author)}", + event: " URI.decode()}\"> + #{@activity.subject_params["event_title"]} + " + } + ) |> raw %> +
+
+ + + + +
+ + + + +
" 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;"> + <%= gettext "Visit event page" %> +
+
+
+ + + diff --git a/lib/web/templates/email/email_anonymous_activity.text.eex b/lib/web/templates/email/email_anonymous_activity.text.eex new file mode 100644 index 000000000..0df709a1c --- /dev/null +++ b/lib/web/templates/email/email_anonymous_activity.text.eex @@ -0,0 +1,11 @@ +<%= @subject %> + +== + +<%= 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"] + } +) %> +<%= page_url(Mobilizon.Web.Endpoint, :event, @activity.subject_params["event_uuid"]) |> URI.decode() %> \ No newline at end of file diff --git a/priv/gettext/activity.pot b/priv/gettext/activity.pot index e6019876c..676c34405 100644 --- a/priv/gettext/activity.pot +++ b/priv/gettext/activity.pot @@ -42,15 +42,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -74,8 +74,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -117,8 +117,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -136,8 +136,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -208,13 +208,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -222,7 +222,8 @@ msgstr[1] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -235,13 +236,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -251,31 +253,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/ar/LC_MESSAGES/activity.po b/priv/gettext/ar/LC_MESSAGES/activity.po index 3541f1c1d..d19e67644 100644 --- a/priv/gettext/ar/LC_MESSAGES/activity.po +++ b/priv/gettext/ar/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -227,7 +227,8 @@ msgstr[5] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -244,13 +245,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -260,31 +262,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/ar/LC_MESSAGES/default.po b/priv/gettext/ar/LC_MESSAGES/default.po index 7da8ae989..1d099c8f4 100644 --- a/priv/gettext/ar/LC_MESSAGES/default.po +++ b/priv/gettext/ar/LC_MESSAGES/default.po @@ -995,8 +995,8 @@ msgid "View report:" msgstr "إعرض التقرير" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "" diff --git a/priv/gettext/be/LC_MESSAGES/activity.po b/priv/gettext/be/LC_MESSAGES/activity.po index 51013c016..1bab892e4 100644 --- a/priv/gettext/be/LC_MESSAGES/activity.po +++ b/priv/gettext/be/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -224,7 +224,8 @@ msgstr[2] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -238,13 +239,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -254,31 +256,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/be/LC_MESSAGES/default.po b/priv/gettext/be/LC_MESSAGES/default.po index 4c5b87c8c..64b28e7a0 100644 --- a/priv/gettext/be/LC_MESSAGES/default.po +++ b/priv/gettext/be/LC_MESSAGES/default.po @@ -971,8 +971,8 @@ msgid "View report:" msgstr "" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "" diff --git a/priv/gettext/ca/LC_MESSAGES/activity.po b/priv/gettext/ca/LC_MESSAGES/activity.po index c60def8eb..fb15ee9b0 100644 --- a/priv/gettext/ca/LC_MESSAGES/activity.po +++ b/priv/gettext/ca/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -223,7 +223,8 @@ msgstr[1] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -236,13 +237,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -252,31 +254,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/ca/LC_MESSAGES/default.po b/priv/gettext/ca/LC_MESSAGES/default.po index b771a7dc1..f0f3bbfcf 100644 --- a/priv/gettext/ca/LC_MESSAGES/default.po +++ b/priv/gettext/ca/LC_MESSAGES/default.po @@ -1161,8 +1161,8 @@ msgid "View report:" msgstr "Mostra la denúncia" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "Vés a la pàgina d'activitat" diff --git a/priv/gettext/cs/LC_MESSAGES/activity.po b/priv/gettext/cs/LC_MESSAGES/activity.po index 45e4ba00e..06453d769 100644 --- a/priv/gettext/cs/LC_MESSAGES/activity.po +++ b/priv/gettext/cs/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -224,7 +224,8 @@ msgstr[2] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -238,13 +239,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -254,31 +256,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/cs/LC_MESSAGES/default.po b/priv/gettext/cs/LC_MESSAGES/default.po index c6cb6ea1f..3af7c3fc5 100644 --- a/priv/gettext/cs/LC_MESSAGES/default.po +++ b/priv/gettext/cs/LC_MESSAGES/default.po @@ -971,8 +971,8 @@ msgid "View report:" msgstr "" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/activity.po b/priv/gettext/de/LC_MESSAGES/activity.po index e945cb4e5..1e421ab3b 100644 --- a/priv/gettext/de/LC_MESSAGES/activity.po +++ b/priv/gettext/de/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -223,7 +223,8 @@ msgstr[1] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -236,13 +237,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -252,31 +254,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index b4728d7a8..0a9e98d70 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -1199,8 +1199,8 @@ msgid "View report:" msgstr "Meldung ansehen:" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "Besuche die Event Seite" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index e5066feb7..15e2cfc51 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -950,8 +950,8 @@ msgid "View report:" msgstr "" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/activity.po b/priv/gettext/en/LC_MESSAGES/activity.po index 2e4a1d3fd..19f519e1d 100644 --- a/priv/gettext/en/LC_MESSAGES/activity.po +++ b/priv/gettext/en/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -223,7 +223,8 @@ msgstr[1] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -236,13 +237,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -252,31 +254,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index eef4f401c..75252235e 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -1003,8 +1003,8 @@ msgid "View report:" msgstr "View the report" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "" diff --git a/priv/gettext/es/LC_MESSAGES/activity.po b/priv/gettext/es/LC_MESSAGES/activity.po index 153688b80..5e9d0bd07 100644 --- a/priv/gettext/es/LC_MESSAGES/activity.po +++ b/priv/gettext/es/LC_MESSAGES/activity.po @@ -50,15 +50,15 @@ msgstr "%{profile} agregó el miembro %{member}." #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "%{profile} archivó la discusión %{discussion}." #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "%{profile} creó la discusión %{discussion}." @@ -82,8 +82,8 @@ msgstr "%{profile} creó el recurso %{resource}." #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "%{profile} eliminó la discusión %{discussion}." @@ -125,8 +125,8 @@ msgstr "%{profile} abandona el grupo." #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "%{profile} renombrado la discusión %{discussion}." @@ -146,8 +146,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "%{profile} respondió a la discusión %{discussion}." @@ -218,15 +218,15 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "%{profile} respondió a un comentario sobre el evento %{event}." #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" "¿No quieres recibir notificaciones de actividad? Puede cambiar la frecuencia " "o deshabilitarlos en su configuración." #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "Ver una actividad más" @@ -234,7 +234,8 @@ msgstr[1] "Ver %{count} actividades mas" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "¡Ha habido una actividad!" @@ -247,13 +248,14 @@ msgstr "Actividad en %{instance}" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "%{profile} ha publicado un anuncio en el evento %{event}." #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "%{profile} te mencionó en un comentario en el evento %{event}." @@ -263,7 +265,7 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "%{profile}te mencioné en la discusión %{discussion}." #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" "¿No quieres recibir notificaciones de actividad? Puede cambiar la frecuencia " @@ -271,25 +273,44 @@ msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "Actividad en %{instance}" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "%{profile} ha publicado un anuncio en el evento %{event}." + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "%{profile} ha publicado un anuncio en el evento %{event}." + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/es/LC_MESSAGES/default.po b/priv/gettext/es/LC_MESSAGES/default.po index 549e556a2..ee43a753a 100644 --- a/priv/gettext/es/LC_MESSAGES/default.po +++ b/priv/gettext/es/LC_MESSAGES/default.po @@ -1174,8 +1174,8 @@ msgid "View report:" msgstr "Ver el informe:" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "Visita la página del evento" diff --git a/priv/gettext/fi/LC_MESSAGES/activity.po b/priv/gettext/fi/LC_MESSAGES/activity.po index f8093a46e..5538c2c1f 100644 --- a/priv/gettext/fi/LC_MESSAGES/activity.po +++ b/priv/gettext/fi/LC_MESSAGES/activity.po @@ -50,15 +50,15 @@ msgstr "%{profile} lisäsi jäsenen %{member}." #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "%{profile} arkistoi keskustelun %{discussion}." #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "%{profile} loi keskustelun %{discussion}." @@ -82,8 +82,8 @@ msgstr "%{profile} loi resurssin %{resource}." #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "%{profile} poisti keskustelun %{discussion}." @@ -125,8 +125,8 @@ msgstr "%{profile} poistui ryhmästä." #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "%{profile} muutti keskustelun %{discussion} nimer." @@ -144,8 +144,8 @@ msgstr "%{profile} muutti resurssin %{old_resource_title} nimeksi %{resource}." #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "%{profile} vastasi keskusteluun %{discussion}." @@ -216,15 +216,15 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "%{profile} vastasi tapahtuman %{event} kommenttiin." #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" "Jos et halua vastaanottaa toimenpideilmoituksia, voit muuttaa " "ilmoitustiheyttä tai poistaa ilmoitukset käytöstä asetuksista." #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "Näytä seuraava toimenpide" @@ -232,7 +232,8 @@ msgstr[1] "Näytä %{count} seuraavaa toimenpidettä" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "Toimenpide!" @@ -245,13 +246,14 @@ msgstr "Toimenpide palvelimella %{instance}" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "%{profile} on julkaissut ilmoituksen tapahtumassa %{event}." #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "%{profile} mainitsi sinut tapahtuman %{event} kommentissa." @@ -261,7 +263,7 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "%{profile} mainitsi sinut keskustelussa %{discussion}." #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" "Jos et halua vastaanottaa toimenpideilmoituksia, voit muuttaa " @@ -269,25 +271,44 @@ msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "Toimenpide palvelimella %{instance}" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "%{profile} on julkaissut ilmoituksen tapahtumassa %{event}." + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "%{profile} on julkaissut ilmoituksen tapahtumassa %{event}." + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/fi/LC_MESSAGES/default.po b/priv/gettext/fi/LC_MESSAGES/default.po index c131ea364..16b1cca36 100644 --- a/priv/gettext/fi/LC_MESSAGES/default.po +++ b/priv/gettext/fi/LC_MESSAGES/default.po @@ -1154,8 +1154,8 @@ msgid "View report:" msgstr "Näytä raportti:" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "Käy tapahtumasivulla" diff --git a/priv/gettext/fr/LC_MESSAGES/activity.po b/priv/gettext/fr/LC_MESSAGES/activity.po index 3207d4ff5..d94406121 100644 --- a/priv/gettext/fr/LC_MESSAGES/activity.po +++ b/priv/gettext/fr/LC_MESSAGES/activity.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-06-25 09:38+0200\n" +"PO-Revision-Date: 2021-06-27 18:06+0200\n" "Last-Translator: Thomas Citharel \n" "Language-Team: French \n" "Language: fr\n" @@ -20,274 +20,241 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Poedit 2.4.3\n" -#, elixir-format -#: lib/service/activity/renderer/member.ex:38 -#: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12 +#: lib/service/activity/renderer/member.ex:38 lib/web/templates/email/activity/_member_activity_item.html.eex:19 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:12 msgid "%{member} accepted the invitation to join the group." msgstr "%{member} a accepté l'invitation à rejoindre le groupe." -#, elixir-format -#: lib/service/activity/renderer/member.ex:42 -#: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17 +#: lib/service/activity/renderer/member.ex:42 lib/web/templates/email/activity/_member_activity_item.html.eex:26 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:17 msgid "%{member} rejected the invitation to join the group." msgstr "%{member} a refusé l'invitation à rejoindre le groupe." -#, elixir-format -#: lib/service/activity/renderer/member.ex:30 -#: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1 +#: lib/service/activity/renderer/member.ex:30 lib/web/templates/email/activity/_member_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:1 msgid "%{member} requested to join the group." msgstr "%{member} a demandé à rejoindre le groupe." -#, elixir-format -#: lib/service/activity/renderer/member.ex:34 -#: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6 +#: lib/service/activity/renderer/member.ex:34 lib/web/templates/email/activity/_member_activity_item.html.eex:11 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:6 msgid "%{member} was invited by %{profile}." msgstr "%{member} a été invité⋅e par %{profile}." -#, elixir-format -#: lib/service/activity/renderer/member.ex:50 -#: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27 +#: lib/service/activity/renderer/member.ex:50 lib/web/templates/email/activity/_member_activity_item.html.eex:40 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:27 msgid "%{profile} added the member %{member}." msgstr "%{profile} a ajouté le ou la membre %{membre}." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/discussion.ex:65 lib/service/activity/renderer/post.ex:53 +#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "%{profile} a archivé la discussion %{discussion}." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/discussion.ex:25 lib/service/activity/renderer/post.ex:23 +#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "%{profile} a créé la discussion %{discussion}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:24 -#: lib/web/templates/email/activity/_resource_activity_item.html.eex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2 +#: lib/service/activity/renderer/resource.ex:24 lib/web/templates/email/activity/_resource_activity_item.html.eex:5 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2 msgid "%{profile} created the folder %{resource}." msgstr "%{profile} a créé le dossier %{resource}." -#, elixir-format -#: lib/web/templates/email/activity/_group_activity_item.html.eex:4 -#: lib/web/templates/email/activity/_group_activity_item.text.eex:1 +#: lib/web/templates/email/activity/_group_activity_item.html.eex:4 lib/web/templates/email/activity/_group_activity_item.text.eex:1 msgid "%{profile} created the group %{group}." msgstr "%{profile} a créé le groupe %{group}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:33 -#: lib/web/templates/email/activity/_resource_activity_item.html.eex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8 +#: lib/service/activity/renderer/resource.ex:33 lib/web/templates/email/activity/_resource_activity_item.html.eex:20 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8 msgid "%{profile} created the resource %{resource}." msgstr "%{profile} a créé la resource %{resource}." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/discussion.ex:75 lib/service/activity/renderer/post.ex:63 +#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "%{profile} a créé la discussion %{discussion}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:97 -#: lib/web/templates/email/activity/_resource_activity_item.html.eex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40 +#: lib/service/activity/renderer/resource.ex:97 lib/web/templates/email/activity/_resource_activity_item.html.eex:103 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40 msgid "%{profile} deleted the folder %{resource}." msgstr "%{profile} a supprimé le dossier %{resource}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:106 -#: lib/web/templates/email/activity/_resource_activity_item.html.eex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45 +#: lib/service/activity/renderer/resource.ex:106 lib/web/templates/email/activity/_resource_activity_item.html.eex:111 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45 msgid "%{profile} deleted the resource %{resource}." msgstr "%{profile} a supprimé la resource %{resource}." -#, elixir-format -#: lib/service/activity/renderer/member.ex:58 -#: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39 +#: lib/service/activity/renderer/member.ex:58 lib/web/templates/email/activity/_member_activity_item.html.eex:56 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:39 msgid "%{profile} excluded member %{member}." msgstr "%{profile} a exclu le ou la membre %{membre}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:76 -#: lib/web/templates/email/activity/_resource_activity_item.html.eex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28 +#: lib/service/activity/renderer/resource.ex:76 lib/web/templates/email/activity/_resource_activity_item.html.eex:71 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28 msgid "%{profile} moved the folder %{resource}." msgstr "%{profile} a déplacé le dossier %{resource}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:85 -#: lib/web/templates/email/activity/_resource_activity_item.html.eex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34 +#: lib/service/activity/renderer/resource.ex:85 lib/web/templates/email/activity/_resource_activity_item.html.eex:86 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34 msgid "%{profile} moved the resource %{resource}." msgstr "%{profile} a déplacé la ressource %{resource}." -#, elixir-format -#: lib/service/activity/renderer/member.ex:62 -#: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45 +#: lib/service/activity/renderer/member.ex:62 lib/web/templates/email/activity/_member_activity_item.html.eex:64 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:45 msgid "%{profile} quit the group." msgstr "%{profile} a quitté le groupe." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/discussion.ex:55 lib/service/activity/renderer/post.ex:43 +#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "%{profile} a renommé la discussion %{discussion}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:45 -#: lib/web/templates/email/activity/_resource_activity_item.html.eex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14 +#: lib/service/activity/renderer/resource.ex:45 lib/web/templates/email/activity/_resource_activity_item.html.eex:37 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}." msgstr "%{profile} a renommé le dossier %{old_resource_title} en %{resource}." -#, elixir-format -#: lib/service/activity/renderer/resource.ex:59 -#: lib/web/templates/email/activity/_resource_activity_item.html.eex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21 +#: lib/service/activity/renderer/resource.ex:59 lib/web/templates/email/activity/_resource_activity_item.html.eex:53 +#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}." msgstr "%{profile} a renommé la resource %{old_resource_title} en %{resource}." -#, elixir-format -#: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/discussion.ex:35 lib/service/activity/renderer/post.ex:33 +#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "%{profile} a répondu à la discussion %{discussion}." -#, elixir-format -#: lib/web/templates/email/activity/_group_activity_item.html.eex:19 -#: lib/web/templates/email/activity/_group_activity_item.text.eex:7 +#: lib/web/templates/email/activity/_group_activity_item.html.eex:19 lib/web/templates/email/activity/_group_activity_item.text.eex:7 msgid "%{profile} updated the group %{group}." msgstr "%{profile} a mis à jour le groupe %{group}." -#, elixir-format -#: lib/service/activity/renderer/member.ex:54 -#: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33 +#: lib/service/activity/renderer/member.ex:54 lib/web/templates/email/activity/_member_activity_item.html.eex:48 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:33 msgid "%{profile} updated the member %{member}." msgstr "%{profile} a mis à jour le membre %{member}." -#, elixir-format -#: lib/service/activity/renderer/event.ex:23 -#: lib/web/templates/email/activity/_event_activity_item.html.eex:4 lib/web/templates/email/activity/_event_activity_item.text.eex:1 +#: lib/service/activity/renderer/event.ex:23 lib/web/templates/email/activity/_event_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_event_activity_item.text.eex:1 msgid "The event %{event} was created by %{profile}." msgstr "L'événement %{event} a été créé par %{profile}." -#, elixir-format -#: lib/service/activity/renderer/event.ex:43 -#: lib/web/templates/email/activity/_event_activity_item.html.eex:34 lib/web/templates/email/activity/_event_activity_item.text.eex:13 +#: lib/service/activity/renderer/event.ex:43 lib/web/templates/email/activity/_event_activity_item.html.eex:34 +#: lib/web/templates/email/activity/_event_activity_item.text.eex:13 msgid "The event %{event} was deleted by %{profile}." msgstr "L'événement %{event} a été supprimé par %{profile}." -#, elixir-format -#: lib/service/activity/renderer/event.ex:33 -#: lib/web/templates/email/activity/_event_activity_item.html.eex:19 lib/web/templates/email/activity/_event_activity_item.text.eex:7 +#: lib/service/activity/renderer/event.ex:33 lib/web/templates/email/activity/_event_activity_item.html.eex:19 +#: lib/web/templates/email/activity/_event_activity_item.text.eex:7 msgid "The event %{event} was updated by %{profile}." msgstr "L'événement %{event} a été mis à jour par %{profile}." -#, elixir-format -#: lib/service/activity/renderer/group.ex:23 -#: lib/web/templates/email/activity/_post_activity_item.html.eex:4 lib/web/templates/email/activity/_post_activity_item.text.eex:1 +#: lib/service/activity/renderer/group.ex:23 lib/web/templates/email/activity/_post_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_post_activity_item.text.eex:1 msgid "The post %{post} was created by %{profile}." msgstr "Le billet %{post} a été créé par %{profile}." -#, elixir-format -#: lib/service/activity/renderer/group.ex:43 -#: lib/web/templates/email/activity/_post_activity_item.html.eex:34 lib/web/templates/email/activity/_post_activity_item.text.eex:13 +#: lib/service/activity/renderer/group.ex:43 lib/web/templates/email/activity/_post_activity_item.html.eex:34 +#: lib/web/templates/email/activity/_post_activity_item.text.eex:13 msgid "The post %{post} was deleted by %{profile}." msgstr "Le billet %{post} a été supprimé par %{profile}." -#, elixir-format -#: lib/service/activity/renderer/group.ex:33 -#: lib/web/templates/email/activity/_post_activity_item.html.eex:19 lib/web/templates/email/activity/_post_activity_item.text.eex:7 +#: lib/service/activity/renderer/group.ex:33 lib/web/templates/email/activity/_post_activity_item.html.eex:19 +#: lib/web/templates/email/activity/_post_activity_item.text.eex:7 msgid "The post %{post} was updated by %{profile}." msgstr "Le billet %{post} a été mis à jour par %{profile}." -#, elixir-format -#: lib/service/activity/renderer/member.ex:46 -#: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22 +#: lib/service/activity/renderer/member.ex:46 lib/web/templates/email/activity/_member_activity_item.html.eex:33 +#: lib/web/templates/email/activity/_member_activity_item.text.eex:22 msgid "%{member} joined the group." msgstr "%{member} a rejoint le groupe." -#, elixir-format -#: lib/service/activity/renderer/event.ex:63 -#: lib/web/templates/email/activity/_event_activity_item.html.eex:58 lib/web/templates/email/activity/_event_activity_item.text.eex:25 +#: lib/service/activity/renderer/event.ex:63 lib/web/templates/email/activity/_event_activity_item.html.eex:58 +#: lib/web/templates/email/activity/_event_activity_item.text.eex:25 msgid "%{profile} posted a comment on the event %{event}." msgstr "%{profile} a posté un commentaire sur l'événement %{event}." -#, elixir-format -#: lib/service/activity/renderer/event.ex:54 -#: lib/web/templates/email/activity/_event_activity_item.html.eex:43 lib/web/templates/email/activity/_event_activity_item.text.eex:19 +#: lib/service/activity/renderer/event.ex:54 lib/web/templates/email/activity/_event_activity_item.html.eex:43 +#: lib/web/templates/email/activity/_event_activity_item.text.eex:19 msgid "%{profile} replied to a comment on the event %{event}." msgstr "%{profile} a répondu à un commentaire sur l'événement %{event}." -#, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "Vous ne voulez pas recevoir de notifications d'activité ? Vous pouvez changer leur fréquence ou les désactiver dans vos préférences." -#, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "Voir une activité de plus" msgstr[1] "Voir %{count} activités de plus" -#, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:44 lib/web/templates/email/email_direct_activity.html.eex:46 +#: lib/web/templates/email/email_direct_activity.text.eex:6 lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "Il y a eu une activité !" msgstr[1] "Il y a eu de l'activité !" -#, elixir-format #: lib/service/activity/renderer/renderer.ex:38 msgid "Activity on %{instance}" msgstr "Activité sur %{instance}" -#, elixir-format -#: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/service/activity/renderer/comment.ex:38 lib/web/templates/email/activity/_comment_activity_item.html.eex:19 +#: lib/web/templates/email/activity/_comment_activity_item.text.eex:7 lib/web/templates/email/email_anonymous_activity.html.eex:41 +#: lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "%{profile} a posté une annonce sous l'événement %{event}." -#, elixir-format -#: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/service/activity/renderer/comment.ex:24 lib/web/templates/email/activity/_comment_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "%{profile} vous a mentionné dans un commentaire sous l'événement %{event}." -#, elixir-format #: lib/service/activity/renderer/discussion.ex:45 msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "%{profile} vous a mentionné dans la discussion %{discussion}." -#, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" "Vous ne voulez pas recevoir de notifications d'activité ? Vous pouvez changer leur fréquence ou les désactiver dans %{tag_start}vos " "préférences%{tag_end}." -#, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.html.eex:42 lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "Voici votre récapitulatif hebdomadaire d'activité" -#, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "Notification d'activité sur %{instance}" -#, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "Récapitulatif quotidien d'activité sur %{instance}" -#, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.html.eex:40 lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "Voici votre récapitulatif quotidien d'activité" -#, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "Récapitulatif hebdomadaire d'activité sur %{instance}" + +#: lib/service/activity/renderer/comment.ex:66 lib/web/templates/email/activity/_comment_activity_item.html.eex:51 +#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "%{profile} a posté un nouveau commentaire sous votre événement %{event}." + +#: lib/service/activity/renderer/comment.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:36 +#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "%{profile} a posté une nouvelle réponse sous votre événement %{event}." + +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "Annonce pour votre événement %{event}" diff --git a/priv/gettext/fr/LC_MESSAGES/default.po b/priv/gettext/fr/LC_MESSAGES/default.po index 995d2be1f..2c6c8dc65 100644 --- a/priv/gettext/fr/LC_MESSAGES/default.po +++ b/priv/gettext/fr/LC_MESSAGES/default.po @@ -986,8 +986,8 @@ msgid "View report:" msgstr "Voir le signalement :" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "Voir la page de l'événement" diff --git a/priv/gettext/gl/LC_MESSAGES/activity.po b/priv/gettext/gl/LC_MESSAGES/activity.po index e19a8477a..c383bcdd8 100644 --- a/priv/gettext/gl/LC_MESSAGES/activity.po +++ b/priv/gettext/gl/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -223,7 +223,8 @@ msgstr[1] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -236,13 +237,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -252,31 +254,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/gl/LC_MESSAGES/default.po b/priv/gettext/gl/LC_MESSAGES/default.po index e7b528b62..8963b47bf 100644 --- a/priv/gettext/gl/LC_MESSAGES/default.po +++ b/priv/gettext/gl/LC_MESSAGES/default.po @@ -1153,8 +1153,8 @@ msgid "View report:" msgstr "Ver denuncia:" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "Visitar páxina do evento" diff --git a/priv/gettext/hu/LC_MESSAGES/activity.po b/priv/gettext/hu/LC_MESSAGES/activity.po index ec26dc419..3e6b65f2a 100644 --- a/priv/gettext/hu/LC_MESSAGES/activity.po +++ b/priv/gettext/hu/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -223,7 +223,8 @@ msgstr[1] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -236,13 +237,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -252,31 +254,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/hu/LC_MESSAGES/default.po b/priv/gettext/hu/LC_MESSAGES/default.po index e0997fe45..8c8cbeb37 100644 --- a/priv/gettext/hu/LC_MESSAGES/default.po +++ b/priv/gettext/hu/LC_MESSAGES/default.po @@ -1016,8 +1016,8 @@ msgid "View report:" msgstr "Jelentés megtekintése:" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "Eseményoldal felkeresése" diff --git a/priv/gettext/it/LC_MESSAGES/activity.po b/priv/gettext/it/LC_MESSAGES/activity.po index e57244add..980ba271d 100644 --- a/priv/gettext/it/LC_MESSAGES/activity.po +++ b/priv/gettext/it/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -223,7 +223,8 @@ msgstr[1] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -236,13 +237,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -252,31 +254,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/it/LC_MESSAGES/default.po b/priv/gettext/it/LC_MESSAGES/default.po index eba9fdf4b..b1fc021b6 100644 --- a/priv/gettext/it/LC_MESSAGES/default.po +++ b/priv/gettext/it/LC_MESSAGES/default.po @@ -1182,8 +1182,8 @@ msgid "View report:" msgstr "Visualizza la segnalazione:" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "Visualizza la pagina dell'evento" diff --git a/priv/gettext/ja/LC_MESSAGES/activity.po b/priv/gettext/ja/LC_MESSAGES/activity.po index 8230957ac..7731e490f 100644 --- a/priv/gettext/ja/LC_MESSAGES/activity.po +++ b/priv/gettext/ja/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,20 +209,21 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -234,13 +235,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -250,31 +252,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/ja/LC_MESSAGES/default.po b/priv/gettext/ja/LC_MESSAGES/default.po index 1718b6588..50ddc507c 100644 --- a/priv/gettext/ja/LC_MESSAGES/default.po +++ b/priv/gettext/ja/LC_MESSAGES/default.po @@ -959,8 +959,8 @@ msgid "View report:" msgstr "" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "" diff --git a/priv/gettext/nl/LC_MESSAGES/activity.po b/priv/gettext/nl/LC_MESSAGES/activity.po index a5f82a2bc..6b0fefc0b 100644 --- a/priv/gettext/nl/LC_MESSAGES/activity.po +++ b/priv/gettext/nl/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -223,7 +223,8 @@ msgstr[1] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -236,13 +237,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -252,31 +254,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/nl/LC_MESSAGES/default.po b/priv/gettext/nl/LC_MESSAGES/default.po index f515c770a..fbf2cfbfc 100644 --- a/priv/gettext/nl/LC_MESSAGES/default.po +++ b/priv/gettext/nl/LC_MESSAGES/default.po @@ -983,8 +983,8 @@ msgid "View report:" msgstr "Bekijk de melding" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "" diff --git a/priv/gettext/nn/LC_MESSAGES/activity.po b/priv/gettext/nn/LC_MESSAGES/activity.po index 17848ed89..c93a79a85 100644 --- a/priv/gettext/nn/LC_MESSAGES/activity.po +++ b/priv/gettext/nn/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -223,7 +223,8 @@ msgstr[1] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -236,13 +237,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -252,31 +254,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/nn/LC_MESSAGES/default.po b/priv/gettext/nn/LC_MESSAGES/default.po index 5320d1524..bed7721fc 100644 --- a/priv/gettext/nn/LC_MESSAGES/default.po +++ b/priv/gettext/nn/LC_MESSAGES/default.po @@ -1147,8 +1147,8 @@ msgid "View report:" msgstr "Les rapporten:" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "Sjå på hendingssida" diff --git a/priv/gettext/oc/LC_MESSAGES/activity.po b/priv/gettext/oc/LC_MESSAGES/activity.po index 790da5aa2..621b28eb7 100644 --- a/priv/gettext/oc/LC_MESSAGES/activity.po +++ b/priv/gettext/oc/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -223,7 +223,8 @@ msgstr[1] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -236,13 +237,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -252,31 +254,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/oc/LC_MESSAGES/default.po b/priv/gettext/oc/LC_MESSAGES/default.po index e541eb927..ef2700e14 100644 --- a/priv/gettext/oc/LC_MESSAGES/default.po +++ b/priv/gettext/oc/LC_MESSAGES/default.po @@ -1059,8 +1059,8 @@ msgid "View report:" msgstr "Veire lo senhalament :" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "Veire la pagina de l'eveniment" diff --git a/priv/gettext/pl/LC_MESSAGES/activity.po b/priv/gettext/pl/LC_MESSAGES/activity.po index 1ae95de96..91ae97ab6 100644 --- a/priv/gettext/pl/LC_MESSAGES/activity.po +++ b/priv/gettext/pl/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -224,7 +224,8 @@ msgstr[2] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -238,13 +239,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -254,31 +256,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/pl/LC_MESSAGES/default.po b/priv/gettext/pl/LC_MESSAGES/default.po index 8c2c2c90b..25050a04f 100644 --- a/priv/gettext/pl/LC_MESSAGES/default.po +++ b/priv/gettext/pl/LC_MESSAGES/default.po @@ -1069,8 +1069,8 @@ msgid "View report:" msgstr "Zobacz zgłoszenie" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "Odwiedź stronę wydarzenia" diff --git a/priv/gettext/pt/LC_MESSAGES/activity.po b/priv/gettext/pt/LC_MESSAGES/activity.po index 45e721f6b..3c35ba216 100644 --- a/priv/gettext/pt/LC_MESSAGES/activity.po +++ b/priv/gettext/pt/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -223,7 +223,8 @@ msgstr[1] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -236,13 +237,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -252,31 +254,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/pt/LC_MESSAGES/default.po b/priv/gettext/pt/LC_MESSAGES/default.po index 5c6befce6..072dbb188 100644 --- a/priv/gettext/pt/LC_MESSAGES/default.po +++ b/priv/gettext/pt/LC_MESSAGES/default.po @@ -964,8 +964,8 @@ msgid "View report:" msgstr "" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "" diff --git a/priv/gettext/pt_BR/LC_MESSAGES/activity.po b/priv/gettext/pt_BR/LC_MESSAGES/activity.po index 073edb521..3caf3b0ab 100644 --- a/priv/gettext/pt_BR/LC_MESSAGES/activity.po +++ b/priv/gettext/pt_BR/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -223,7 +223,8 @@ msgstr[1] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -236,13 +237,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -252,31 +254,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/pt_BR/LC_MESSAGES/default.po b/priv/gettext/pt_BR/LC_MESSAGES/default.po index 358ce36a2..b556cf88a 100644 --- a/priv/gettext/pt_BR/LC_MESSAGES/default.po +++ b/priv/gettext/pt_BR/LC_MESSAGES/default.po @@ -1041,8 +1041,8 @@ msgid "View report:" msgstr "Veja o relato" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "" diff --git a/priv/gettext/ru/LC_MESSAGES/activity.po b/priv/gettext/ru/LC_MESSAGES/activity.po index b7657a061..0f392d97a 100644 --- a/priv/gettext/ru/LC_MESSAGES/activity.po +++ b/priv/gettext/ru/LC_MESSAGES/activity.po @@ -51,15 +51,15 @@ msgstr "%{profile} добавил участника %{member}." #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "%{profile} заархивировал обсуждение %{discussion}." #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "%{profile} создал обсуждение %{discussion}." @@ -83,8 +83,8 @@ msgstr "%{profile} создал ресурс %{resource}." #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "%{profile} удалил обсуждение %{discussion}." @@ -126,8 +126,8 @@ msgstr "%{profile} вышел из группы." #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "%{profile} переименовал обсуждение %{discussion}." @@ -145,8 +145,8 @@ msgstr "%{profile} переименовал ресурс из %{old_resource_tit #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "%{profile} ответил на обсуждение %{discussion}." @@ -217,15 +217,15 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "%{profile} ответил на комментарий к мероприятию %{event}." #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" "Не хотите получать уведомления о событиях? Вы можете изменить частоту " "уведомлений или отключить их в своих настройках." #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "Посмотреть еще одно событие" @@ -234,7 +234,8 @@ msgstr[2] "Посмотреть еще %{count} событий" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "Было событие!" @@ -248,13 +249,14 @@ msgstr "События на %{instance}" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "%{profile} разместил объявление под мероприятием %{event}." #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "%{profile} упомянул вас в комментарии под мероприятием %{event}." @@ -264,7 +266,7 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "%{profile} упомянул вас в обсуждении %{discussion}." #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" "Не хотите получать уведомления о событиях? Вы можете изменить частоту " @@ -272,25 +274,44 @@ msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "События на %{instance}" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "%{profile} разместил объявление под мероприятием %{event}." + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "%{profile} разместил объявление под мероприятием %{event}." + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/ru/LC_MESSAGES/default.po b/priv/gettext/ru/LC_MESSAGES/default.po index 6eb09594e..440a2a108 100644 --- a/priv/gettext/ru/LC_MESSAGES/default.po +++ b/priv/gettext/ru/LC_MESSAGES/default.po @@ -1181,8 +1181,8 @@ msgid "View report:" msgstr "Смотреть отчёт:" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "Посетите страницу мероприятия" diff --git a/priv/gettext/sv/LC_MESSAGES/activity.po b/priv/gettext/sv/LC_MESSAGES/activity.po index d77ed49f4..ad159c18c 100644 --- a/priv/gettext/sv/LC_MESSAGES/activity.po +++ b/priv/gettext/sv/LC_MESSAGES/activity.po @@ -43,15 +43,15 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:65 -#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 +#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19 msgid "%{profile} archived the discussion %{discussion}." msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:25 -#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 +#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1 msgid "%{profile} created the discussion %{discussion}." msgstr "" @@ -75,8 +75,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:75 -#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.text.eex:25 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 +#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25 msgid "%{profile} deleted the discussion %{discussion}." msgstr "" @@ -118,8 +118,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:55 -#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 +#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13 msgid "%{profile} renamed the discussion %{discussion}." msgstr "" @@ -137,8 +137,8 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/discussion.ex:35 -#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 -#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 +#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18 +#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7 msgid "%{profile} replied to the discussion %{discussion}." msgstr "" @@ -209,13 +209,13 @@ msgid "%{profile} replied to a comment on the event %{event}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.text.eex:23 +#: lib/web/templates/email/email_direct_activity.text.eex:27 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:133 -#: lib/web/templates/email/email_direct_activity.text.eex:19 +#: lib/web/templates/email/email_direct_activity.html.eex:135 +#: lib/web/templates/email/email_direct_activity.text.eex:23 msgid "View one more activity" msgid_plural "View %{count} more activities" msgstr[0] "" @@ -223,7 +223,8 @@ msgstr[1] "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:44 -#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:4 +#: lib/web/templates/email/email_direct_activity.html.eex:46 lib/web/templates/email/email_direct_activity.text.eex:6 +#: lib/web/templates/email/email_direct_activity.text.eex:7 msgid "There has been an activity!" msgid_plural "There has been some activity!" msgstr[0] "" @@ -236,13 +237,14 @@ msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:38 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:37 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19 lib/web/templates/email/activity/_comment_activity_item.text.eex:7 +#: lib/web/templates/email/email_anonymous_activity.html.eex:41 lib/web/templates/email/email_anonymous_activity.text.eex:5 msgid "%{profile} has posted an announcement under event %{event}." msgstr "" #, elixir-format #: lib/service/activity/renderer/comment.ex:24 -#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:31 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4 lib/web/templates/email/activity/_comment_activity_item.text.eex:1 msgid "%{profile} mentionned you in a comment under event %{event}." msgstr "" @@ -252,31 +254,50 @@ msgid "%{profile} mentionned you in the discussion %{discussion}." msgstr "" #, elixir-format -#: lib/web/templates/email/email_direct_activity.html.eex:153 +#: lib/web/templates/email/email_direct_activity.html.eex:155 msgid "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}." msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:42 +#: lib/web/templates/email/email_direct_activity.text.eex:5 msgid "Here's your weekly activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:101 lib/web/email/activity.ex:122 +#: lib/web/email/activity.ex:117 lib/web/email/activity.ex:138 msgid "Activity notification for %{instance}" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:108 +#: lib/web/email/activity.ex:124 msgid "Daily activity recap for %{instance}" msgstr "" #, elixir-format #: lib/web/templates/email/email_direct_activity.html.eex:40 +#: lib/web/templates/email/email_direct_activity.text.eex:4 msgid "Here's your daily activity recap" msgstr "" #, elixir-format -#: lib/web/email/activity.ex:115 +#: lib/web/email/activity.ex:131 msgid "Weekly activity recap for %{instance}" msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:66 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:51 lib/web/templates/email/activity/_comment_activity_item.text.eex:19 +msgid "%{profile} has posted a new comment under your event %{event}." +msgstr "" + +#, elixir-format, fuzzy +#: lib/service/activity/renderer/comment.ex:53 +#: lib/web/templates/email/activity/_comment_activity_item.html.eex:36 lib/web/templates/email/activity/_comment_activity_item.text.eex:13 +msgid "%{profile} has posted a new reply under your event %{event}." +msgstr "" + +#, elixir-format +#: lib/web/email/activity.ex:44 +msgid "Announcement for your event %{event}" +msgstr "" diff --git a/priv/gettext/sv/LC_MESSAGES/default.po b/priv/gettext/sv/LC_MESSAGES/default.po index 4ed5bffaf..dd9704f4a 100644 --- a/priv/gettext/sv/LC_MESSAGES/default.po +++ b/priv/gettext/sv/LC_MESSAGES/default.po @@ -989,8 +989,8 @@ msgid "View report:" msgstr "Visa anmälan:" #, elixir-format -#: lib/web/templates/email/event_participation_approved.html.eex:58 -#: lib/web/templates/email/event_participation_confirmed.html.eex:58 +#: lib/web/templates/email/email_anonymous_activity.html.eex:67 +#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_participation_confirmed.html.eex:58 msgid "Visit event page" msgstr "" diff --git a/test/service/notifier/email_test.exs b/test/service/notifier/email_test.exs index cd4040a1d..07045a0f0 100644 --- a/test/service/notifier/email_test.exs +++ b/test/service/notifier/email_test.exs @@ -146,4 +146,16 @@ defmodule Mobilizon.Service.Notifier.EmailTest do ) end end + + describe "send_anonymous_activity" do + @email "someone@somewhere.tld" + + test "send activity notification to anonymous user" do + %Activity{} = activity = insert(:mobilizon_activity, inserted_at: DateTime.utc_now()) + + Email.send_anonymous_activity(@email, activity, locale: "en") + + assert_delivered_email(EmailActivity.anonymous_activity(@email, activity, locale: "en")) + end + end end From 8ecfd111c533cbbfca18767058404b9fa50fa10e Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 27 Jun 2021 18:17:02 +0200 Subject: [PATCH 2/3] Show a different message when we can't save anonymous participation token in browser Signed-off-by: Thomas Citharel --- .../Participation/ConfirmParticipation.vue | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/js/src/components/Participation/ConfirmParticipation.vue b/js/src/components/Participation/ConfirmParticipation.vue index 2a8bd5424..edbe15803 100644 --- a/js/src/components/Participation/ConfirmParticipation.vue +++ b/js/src/components/Participation/ConfirmParticipation.vue @@ -4,7 +4,7 @@ {{ $t("Your participation request is being validated") }}
-
+
+
+ + {{ + $t( + "We couldn't save your participation inside this browser. Not to worry, you have successfully confirmed your participation, we just couldn't save it's status in this browser because of a technical issue." + ) + }} + +
Date: Sun, 27 Jun 2021 18:17:24 +0200 Subject: [PATCH 3/3] Fix editing subproperties of an event Signed-off-by: Thomas Citharel --- js/src/views/Event/Edit.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/src/views/Event/Edit.vue b/js/src/views/Event/Edit.vue index 94b83c491..d0a617f19 100644 --- a/js/src/views/Event/Edit.vue +++ b/js/src/views/Event/Edit.vue @@ -486,6 +486,7 @@ import "intersection-observer"; import { CONFIG } from "../../graphql/config"; import { IConfig } from "../../types/config.model"; import { ApolloCache, FetchResult } from "@apollo/client/core"; +import cloneDeep from "lodash/cloneDeep"; const DEFAULT_LIMIT_NUMBER_OF_PLACES = 10; @@ -645,7 +646,7 @@ export default class EditEvent extends Vue { } else { this.event = { ...this.event, - options: this.event.options, + options: cloneDeep(this.event.options), description: this.event.description || "", }; }