projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix atom leak in AdminAPIController
[akkoma]
/
lib
/
pleroma
/
web
/
translation_helpers.ex
diff --git
a/lib/pleroma/web/translation_helpers.ex
b/lib/pleroma/web/translation_helpers.ex
index 7a2ddc00894551dc9c72061bca6a8a47abb1124f..7f78ce1b9effa899c0616540d61bdb7fb2389748 100644
(file)
--- a/
lib/pleroma/web/translation_helpers.ex
+++ b/
lib/pleroma/web/translation_helpers.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TranslationHelpers do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TranslationHelpers do
@@
-13,12
+13,17
@@
defmodule Pleroma.Web.TranslationHelpers do
quote do
require Pleroma.Web.Gettext
quote do
require Pleroma.Web.Gettext
+ error_map =
+ %{
+ error: Pleroma.Web.Gettext.dgettext("errors", unquote(msgid), unquote(bindings)),
+ identifier: unquote(identifier)
+ }
+ |> Enum.reject(fn {_k, v} -> v == "" end)
+ |> Map.new()
+
unquote(conn)
|> Plug.Conn.put_status(unquote(status))
unquote(conn)
|> Plug.Conn.put_status(unquote(status))
- |> Phoenix.Controller.json(%{
- error: Pleroma.Web.Gettext.dgettext("errors", unquote(msgid), unquote(bindings)),
- identifier: unquote(identifier)
- })
+ |> Phoenix.Controller.json(error_map)
end
end
end
end
end
end