projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'match-file-name' into 'develop'
[akkoma]
/
lib
/
pleroma
/
uploaders
/
uploader.ex
diff --git
a/lib/pleroma/uploaders/uploader.ex
b/lib/pleroma/uploaders/uploader.ex
index bf15389fcde3c46ed9ecf9f8a1c5f3ebcd514813..0af76bc593f4e69d245678686885cf7a5f32268e 100644
(file)
--- a/
lib/pleroma/uploaders/uploader.ex
+++ b/
lib/pleroma/uploaders/uploader.ex
@@
-3,6
+3,8
@@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Uploaders.Uploader do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Uploaders.Uploader do
+ import Pleroma.Web.Gettext
+
@moduledoc """
Defines the contract to put and get an uploaded file to any backend.
"""
@moduledoc """
Defines the contract to put and get an uploaded file to any backend.
"""
@@
-66,7
+68,7
@@
defmodule Pleroma.Uploaders.Uploader do
{:error, error}
end
after
{:error, error}
end
after
- 30_000 -> {:error,
"Uploader callback timeout"
}
+ 30_000 -> {:error,
dgettext("errors", "Uploader callback timeout")
}
end
end
end
end
end
end