Deepl: use :base_url
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
parent
19885d9347
commit
4f042374d8
3 changed files with 10 additions and 17 deletions
|
@ -3567,10 +3567,10 @@
|
||||||
},
|
},
|
||||||
%{
|
%{
|
||||||
group: {:subgroup, Pleroma.Language.Translation.Deepl},
|
group: {:subgroup, Pleroma.Language.Translation.Deepl},
|
||||||
key: :plan,
|
key: :base_url,
|
||||||
label: "DeepL plan",
|
label: "DeepL base URL",
|
||||||
type: {:dropdown, :atom},
|
type: :string,
|
||||||
suggestions: [:free, :pro]
|
suggestions: ["https://api-free.deepl.com", "https://api.deepl.com"]
|
||||||
},
|
},
|
||||||
%{
|
%{
|
||||||
group: {:subgroup, Pleroma.Language.Translation.Deepl},
|
group: {:subgroup, Pleroma.Language.Translation.Deepl},
|
||||||
|
@ -3582,7 +3582,7 @@
|
||||||
%{
|
%{
|
||||||
group: {:subgroup, Pleroma.Language.Translation.Libretranslate},
|
group: {:subgroup, Pleroma.Language.Translation.Libretranslate},
|
||||||
key: :base_url,
|
key: :base_url,
|
||||||
label: "LibreTranslate plan",
|
label: "LibreTranslate instance URL",
|
||||||
type: :string,
|
type: :string,
|
||||||
suggestions: ["https://libretranslate.com"]
|
suggestions: ["https://libretranslate.com"]
|
||||||
},
|
},
|
||||||
|
|
|
@ -11,12 +11,12 @@ defmodule Pleroma.Language.Translation.Deepl do
|
||||||
|
|
||||||
@impl Provider
|
@impl Provider
|
||||||
def configured? do
|
def configured? do
|
||||||
is_atom(get_plan()) and not_empty_string(get_api_key())
|
is_atom(get_base_url()) and not_empty_string(get_api_key())
|
||||||
end
|
end
|
||||||
|
|
||||||
@impl Provider
|
@impl Provider
|
||||||
def translate(content, source_language, target_language) do
|
def translate(content, source_language, target_language) do
|
||||||
endpoint = endpoint_url()
|
endpoint = get_base_url()
|
||||||
|
|
||||||
case Pleroma.HTTP.post(
|
case Pleroma.HTTP.post(
|
||||||
endpoint <>
|
endpoint <>
|
||||||
|
@ -58,15 +58,8 @@ def translate(content, source_language, target_language) do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defp endpoint_url do
|
defp get_base_url do
|
||||||
case get_plan() do
|
Pleroma.Config.get([__MODULE__, :base_url])
|
||||||
:free -> "https://api-free.deepl.com/v2/translate"
|
|
||||||
_ -> "https://api.deepl.com/v2/translate"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
defp get_plan do
|
|
||||||
Pleroma.Config.get([__MODULE__, :plan])
|
|
||||||
end
|
end
|
||||||
|
|
||||||
defp get_api_key do
|
defp get_api_key do
|
||||||
|
|
|
@ -9,7 +9,7 @@ defmodule Pleroma.Language.Translation.DeeplTest do
|
||||||
|
|
||||||
test "it translates text" do
|
test "it translates text" do
|
||||||
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
|
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
|
||||||
clear_config([Pleroma.Language.Translation.Deepl, :plan], :free)
|
clear_config([Pleroma.Language.Translation.Deepl, :base_url], "https://api-free.deepl.com")
|
||||||
clear_config([Pleroma.Language.Translation.Deepl, :api_key], "API_KEY")
|
clear_config([Pleroma.Language.Translation.Deepl, :api_key], "API_KEY")
|
||||||
|
|
||||||
{:ok, res} =
|
{:ok, res} =
|
||||||
|
|
Loading…
Reference in a new issue