Merge branch 'fix-member-notification-language' into 'master'

Send the membership emails in the correct language

Closes #472

See merge request framasoft/mobilizon!735

lib/federation/activity_pub/activity_pub.ex

@@ -526,7 +526,8 @@ defmodule Mobilizon.Federation.ActivityPub do
              local
            ),
          :ok <- maybe_federate(activity),
-         :ok <- maybe_relay_if_group_activity(activity) do
+         :ok <- maybe_relay_if_group_activity(activity),
+         :ok <- Group.send_invite_to_user(member) do
       {:ok, activity, member}
     end
   end

lib/federation/activity_pub/transmogrifier.ex

@@ -674,8 +674,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
          {:ok, %Actor{} = target} <-
            target |> Utils.get_url() |> ActivityPub.get_or_fetch_actor_by_url(),
          {:ok, activity, %Member{} = member} <-
-           ActivityPub.invite(object, actor, target, false, %{url: id}),
-         :ok <- Group.send_invite_to_user(member) do
+           ActivityPub.invite(object, actor, target, false, %{url: id}) do
       {:ok, activity, member}
     end
   end

lib/web/email/group.ex

@@ -24,7 +24,8 @@ defmodule Mobilizon.Web.Email.Group do
           member,
         locale
       ) do
-    with %User{email: email} <- Users.get_user!(user_id) do
+    with %User{email: email} = user <- Users.get_user!(user_id) do
+      locale = Map.get(user, :locale, locale)
       Gettext.put_locale(locale)
       %Actor{name: invited_by_name} = inviter = Actors.get_actor(member.invited_by_id)