fix: improve gettext translations and deduplicate email formatting in member views
Some checks reported errors
continuous-integration/drone/push Build was killed
Some checks reported errors
continuous-integration/drone/push Build was killed
This commit is contained in:
parent
ed961f7585
commit
2542bcf9e4
5 changed files with 1477 additions and 186 deletions
|
|
@ -238,8 +238,8 @@ defmodule MvWeb.MemberLive.Form do
|
|||
id -> Ash.get!(Mv.Membership.Member, id)
|
||||
end
|
||||
|
||||
action = if is_nil(member), do: gettext("New"), else: gettext("Edit")
|
||||
page_title = "#{action} #{gettext("Member")}"
|
||||
page_title =
|
||||
if is_nil(member), do: gettext("Create Member"), else: gettext("Edit Member")
|
||||
|
||||
{:ok,
|
||||
socket
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ defmodule MvWeb.MemberLive.Show do
|
|||
<div>
|
||||
<.data_field label={gettext("Email")}>
|
||||
<a
|
||||
href={"mailto:#{format_email_mailto(@member.first_name, @member.last_name, @member.email)}"}
|
||||
href={"mailto:#{MvWeb.MemberLive.Index.format_member_email(@member)}"}
|
||||
class="text-blue-700 hover:text-blue-800 underline"
|
||||
>
|
||||
{@member.email}
|
||||
|
|
@ -240,23 +240,10 @@ defmodule MvWeb.MemberLive.Show do
|
|||
# Helper Functions
|
||||
# -----------------------------------------------------------------
|
||||
|
||||
defp display_value(nil), do: "—"
|
||||
defp display_value(""), do: "—"
|
||||
defp display_value(nil), do: ""
|
||||
defp display_value(""), do: ""
|
||||
defp display_value(value), do: value
|
||||
|
||||
defp format_email_mailto(first_name, last_name, email) do
|
||||
name =
|
||||
[first_name, last_name]
|
||||
|> Enum.filter(&(&1 && &1 != ""))
|
||||
|> Enum.join(" ")
|
||||
|
||||
if name != "" do
|
||||
"#{name} <#{email}>"
|
||||
else
|
||||
email
|
||||
end
|
||||
end
|
||||
|
||||
defp format_address(member) do
|
||||
street_part =
|
||||
[member.street, member.house_number]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue