diff --git a/lib/mv_web/live/member_live/show.ex b/lib/mv_web/live/member_live/show.ex index c9c92f0..7cdc875 100644 --- a/lib/mv_web/live/member_live/show.ex +++ b/lib/mv_web/live/member_live/show.ex @@ -175,11 +175,12 @@ defmodule MvWeb.MemberLive.Show do @impl true def handle_params(%{"id" => id}, _, socket) do # Load custom fields once using assign_new to avoid repeated queries - socket = assign_new(socket, :custom_fields, fn -> - Mv.Membership.CustomField - |> Ash.Query.sort(name: :asc) - |> Ash.read!() - end) + socket = + assign_new(socket, :custom_fields, fn -> + Mv.Membership.CustomField + |> Ash.Query.sort(name: :asc) + |> Ash.read!() + end) query = Mv.Membership.Member @@ -246,6 +247,7 @@ defmodule MvWeb.MemberLive.Show do if assigns.email && String.trim(assigns.email) != "" do assigns = %{email: assigns.email, display: display_text} + ~H""" cfv.custom_field_id == custom_field_id or (cfv.custom_field && cfv.custom_field.id == custom_field_id) end) end + defp find_custom_field_value(_custom_field_values, _custom_field_id), do: nil # Formats custom field value based on type @@ -330,6 +335,7 @@ defmodule MvWeb.MemberLive.Show do render_empty_value() else assigns = %{email: value} + ~H""" <.mailto_link email={@email} display={@email} /> """ @@ -351,6 +357,7 @@ defmodule MvWeb.MemberLive.Show do # The visual "—" is hidden from screen readers, while the translated text is only visible to screen readers defp render_empty_value do assigns = %{text: gettext("Not set")} + ~H""" diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index ec6812a..1c298e9 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -1422,6 +1422,11 @@ msgstr "Jährliches Intervall – Beitrittszeitraum nicht einbezogen" msgid "Yearly Interval - Joining Cycle Included" msgstr "Jährliches Intervall – Beitrittszeitraum einbezogen" +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Not set" +msgstr "Nicht gesetzt" + #~ #: lib/mv_web/live/custom_field_live/show.ex #~ #, elixir-autogen, elixir-format #~ msgid "Auto-generated identifier (immutable)" @@ -1494,12 +1499,6 @@ msgstr "Jährliches Intervall – Beitrittszeitraum einbezogen" #~ msgid "New Custom field" #~ msgstr "Benutzerdefiniertes Feld speichern" -#~ #: lib/mv_web/live/user_live/form.ex -#~ #: lib/mv_web/live/user_live/show.ex -#~ #, elixir-autogen, elixir-format -#~ msgid "Not set" -#~ msgstr "Nicht gesetzt" - #~ #: lib/mv_web/live/contribution_settings_live.ex #~ #, elixir-autogen, elixir-format #~ msgid "Quarterly Interval - Joining Period Excluded" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index e2bbf32..5450ee0 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -1422,3 +1422,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Yearly Interval - Joining Cycle Included" msgstr "" + +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format +msgid "Not set" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index d3ee646..095ec30 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -1423,6 +1423,11 @@ msgstr "" msgid "Yearly Interval - Joining Cycle Included" msgstr "" +#: lib/mv_web/live/member_live/show.ex +#, elixir-autogen, elixir-format, fuzzy +msgid "Not set" +msgstr "" + #~ #: lib/mv_web/live/custom_field_live/show.ex #~ #, elixir-autogen, elixir-format #~ msgid "Auto-generated identifier (immutable)" @@ -1495,11 +1500,6 @@ msgstr "" #~ msgid "New Custom field" #~ msgstr "" -#~ #: lib/mv_web/live/user_live/show.ex -#~ #, elixir-autogen, elixir-format, fuzzy -#~ msgid "Not set" -#~ msgstr "" - #~ #: lib/mv_web/live/contribution_settings_live.ex #~ #, elixir-autogen, elixir-format #~ msgid "Quarterly Interval - Joining Period Excluded"