hamlab/mobilizon-frontend
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add missing group name to activity notifications

Browse Source 
Closes #799

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2021-11-17 16:25:21 +01:00
parent cc9c2c878c
commit ba7f03610c
75 changed files with 5341 additions and 2310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/service/activity/renderer/member.ex
View File

@@ -20,54 +20,63 @@ defmodule Mobilizon.Service.Activity.Renderer.Member do
body:
text(activity.subject, %{
profile: profile(activity),
member: member(activity)
member: member(activity),
group: group(activity)
}),
url: member_url(activity)
}
end
defp text(:member_request, args) do
dgettext("activity", "%{member} requested to join the group.", args)
dgettext("activity", "%{member} requested to join the group %{group}.", args)
end
defp text(:member_invited, args) do
dgettext("activity", "%{member} was invited by %{profile}.", args)
dgettext("activity", "%{member} was invited by %{profile} to group %{group}.", args)
end
defp text(:member_accepted_invitation, args) do
dgettext("activity", "%{member} accepted the invitation to join the group.", args)
dgettext("activity", "%{member} accepted the invitation to join the group %{group}.", args)
end
defp text(:member_rejected_invitation, args) do
dgettext("activity", "%{member} rejected the invitation to join the group.", args)
dgettext("activity", "%{member} rejected the invitation to join the group %{group}.", args)
end
defp text(:member_joined, args) do
dgettext("activity", "%{member} joined the group.", args)
dgettext("activity", "%{member} joined the group %{group}.", args)
end
defp text(:member_added, args) do
dgettext("activity", "%{profile} added the member %{member}.", args)
dgettext("activity", "%{profile} added the member %{member} to group %{group}.", args)
end
defp text(:member_approved, args) do
dgettext("activity", "%{profile} approved the membership request from %{member}.", args)
dgettext(
"activity",
"%{profile} approved the membership request from %{member} for group %{group}.",
args
)
end
defp text(:member_rejected, args) do
dgettext("activity", "%{profile} rejected the membership request from %{member}.", args)
dgettext(
"activity",
"%{profile} rejected the membership request from %{member} for group %{group}.",
args
)
end
defp text(:member_updated, args) do
dgettext("activity", "%{profile} updated the member %{member}.", args)
dgettext("activity", "%{profile} updated the member %{member} in group %{group}.", args)
end
defp text(:member_removed, args) do
dgettext("activity", "%{profile} excluded member %{member}.", args)
dgettext("activity", "%{profile} excluded member %{member} from the group %{group}.", args)
end
defp text(:member_quit, args) do
dgettext("activity", "%{profile} quit the group.", args)
dgettext("activity", "%{profile} quit the group %{group}.", args)
end
defp member_url(activity) do
@@ -88,4 +97,6 @@ defmodule Mobilizon.Service.Activity.Renderer.Member do
do:
activity.subject_params["member_actor_name"] ||
activity.subject_params["member_actor_federated_username"]
defp group(%Activity{group: group}), do: Actor.display_name(group)
end