summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-11-10 10:07:29 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-11-10 10:07:29 +0300
commitffa1b00fa1d961b85730fd6067ff988257702c55 (patch)
treece820134183fd70dc45040930173fe5517b2b988
parent122e487274f3bf5dde33a0ed417fd75e4ca114cb (diff)
fix ecto helpersissue/2205
-rw-r--r--lib/pleroma/ecto_helper.ex13
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/pleroma/ecto_helper.ex b/lib/pleroma/ecto_helper.ex
index b174ea41c..3bc5d9d79 100644
--- a/lib/pleroma/ecto_helper.ex
+++ b/lib/pleroma/ecto_helper.ex
@@ -22,19 +22,14 @@ defmodule Pleroma.EctoHelper do
end
defp do_prettify({field_name, {msg, variables}}, mapping_fields) do
- compound_message = do_interpolate(msg, variables)
- do_prettify({field_name, compound_message}, mapping_fields)
+ do_prettify({field_name, do_interpolate(msg, variables)}, mapping_fields)
end
defp do_interpolate(string, [{name, value} | rest]) do
- n = Atom.to_string(name)
- msg = String.replace(string, "%{#{n}}", do_to_string(value))
- do_interpolate(msg, rest)
+ string
+ |> String.replace("%{#{name}}", to_string(value))
+ |> do_interpolate(rest)
end
defp do_interpolate(string, []), do: string
-
- defp do_to_string(value) when is_integer(value), do: Integer.to_string(value)
- defp do_to_string(value) when is_bitstring(value), do: value
- defp do_to_string(value) when is_atom(value), do: Atom.to_string(value)
end