projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job...
[akkoma]
/
lib
/
pleroma
/
plugs
/
uploaded_media.ex
diff --git
a/lib/pleroma/plugs/uploaded_media.ex
b/lib/pleroma/plugs/uploaded_media.ex
index be2c17c5f74e0066cb4dc6d0bfe51d936cc6f017..69c1ab942769ca657a076fe5072d6163c56dcbd8 100644
(file)
--- a/
lib/pleroma/plugs/uploaded_media.ex
+++ b/
lib/pleroma/plugs/uploaded_media.ex
@@
-8,7
+8,6
@@
defmodule Pleroma.Plugs.UploadedMedia do
import Plug.Conn
import Pleroma.Web.Gettext
import Plug.Conn
import Pleroma.Web.Gettext
- import Pleroma.Web.TranslationHelpers
require Logger
@behaviour Plug
require Logger
@behaviour Plug
@@
-66,7
+65,7
@@
defmodule Pleroma.Plugs.UploadedMedia do
conn
else
conn
conn
else
conn
- |>
render_error(:not_found, "Not found"
)
+ |>
send_resp(:not_found, dgettext("errors", "Not found")
)
|> halt()
end
end
|> halt()
end
end
@@
-86,7
+85,7
@@
defmodule Pleroma.Plugs.UploadedMedia do
Logger.error("#{__MODULE__}: Unknown get startegy: #{inspect(unknown)}")
conn
Logger.error("#{__MODULE__}: Unknown get startegy: #{inspect(unknown)}")
conn
- |>
render_error(:internal_server_error, "Internal Error"
)
+ |>
send_resp(:internal_server_error, dgettext("errors", "Internal Error")
)
|> halt()
end
end
|> halt()
end
end