detect(nil) return error

This commit is contained in:
Danil Negrienko 2020-07-06 17:21:23 +03:00
parent 0743f21847
commit 3fa056a1a3
4 changed files with 12 additions and 12 deletions

View File

@ -10,7 +10,7 @@ by adding `localizator` to your list of dependencies in `mix.exs`:
```elixir ```elixir
def deps do def deps do
[ [
{:localizator, "~> 0.1.15"} {:localizator, "~> 0.1.16"}
] ]
end end
``` ```

View File

@ -8,6 +8,10 @@ defmodule Localizator.Translator.Microsoft do
@behaviour Localizator.Translator.Base @behaviour Localizator.Translator.Base
@impl true
@spec detect(nil) :: {:error, message}
def detect(nil), do: {:error, "Couldn't detect language"}
@impl true @impl true
@spec detect(text) :: {:ok, locale} | {:error, message} @spec detect(text) :: {:ok, locale} | {:error, message}
def detect(text) when is_bitstring(text) do def detect(text) when is_bitstring(text) do
@ -21,11 +25,7 @@ defmodule Localizator.Translator.Microsoft do
@spec detect(map) :: {:ok, locale} | {:error, message} @spec detect(map) :: {:ok, locale} | {:error, message}
def detect(map) when is_map(map) do def detect(map) when is_map(map) do
{:ok, sample} = Map.fetch(map, List.first(Map.keys(map))) {:ok, sample} = Map.fetch(map, List.first(Map.keys(map)))
detect(sample)
case MicrosoftTranslator.detect(sample) do
%{languageCode: locale} -> {:ok, locale}
%{} -> {:error, "Couldn't detect language"}
end
end end
@impl true @impl true

View File

@ -8,6 +8,10 @@ defmodule Localizator.Translator.Yandex do
@behaviour Localizator.Translator.Base @behaviour Localizator.Translator.Base
@impl true
@spec detect(nil) :: {:error, message}
def detect(nil), do: {:error, "Couldn't detect language"}
@impl true @impl true
@spec detect(text) :: {:ok, locale} | {:error, message} @spec detect(text) :: {:ok, locale} | {:error, message}
def detect(text) when is_bitstring(text) do def detect(text) when is_bitstring(text) do
@ -21,11 +25,7 @@ defmodule Localizator.Translator.Yandex do
@spec detect(map) :: {:ok, locale} | {:error, message} @spec detect(map) :: {:ok, locale} | {:error, message}
def detect(map) when is_map(map) do def detect(map) when is_map(map) do
{:ok, sample} = Map.fetch(map, List.first(Map.keys(map))) {:ok, sample} = Map.fetch(map, List.first(Map.keys(map)))
detect(sample)
case YandexTranslate.detect(sample) do
%{languageCode: locale} -> {:ok, locale}
%{} -> {:error, "Couldn't detect language"}
end
end end
@impl true @impl true

View File

@ -4,7 +4,7 @@ defmodule Localizator.MixProject do
def project do def project do
[ [
app: :localizator, app: :localizator,
version: "0.1.15", version: "0.1.16",
elixir: "~> 1.10", elixir: "~> 1.10",
start_permanent: Mix.env() == :prod, start_permanent: Mix.env() == :prod,
deps: deps() deps: deps()