README.md

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

lib/commons/commons.ex

@@ -5,17 +5,6 @@ defmodule Localizator.Commons do
     String.match?(string, @html_regex)
   end
 
-  def first_non_empty_longest_string(map) when is_map(map) do
-    map
-    |> Map.values()
-    |> Enum.reject(&is_nil(&1))
-    |> Enum.filter(&is_binary(&1))
-    |> Enum.map(&String.trim(&1))
-    |> Enum.reject(&(&1 == ""))
-    |> Enum.sort(&(String.length(&1) >= String.length(&2)))
-    |> List.first()
-  end
-
   def struct_from_map(a_map, as: a_struct) do
     # Find the keys within the map
     keys =

lib/translator/microsoft.ex

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

lib/translator/yandex.ex

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

mix.exs

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