X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fplugs%2Fset_locale_plug.ex;h=e78917199bf9e3695c579a4dd28ccae75ff83f28;hb=ff89d4526a4783fc5283e1d4814f55c2a87d94b1;hp=a9387ba7e11a07c3e93a28ccf583b98bf2116618;hpb=8f08c902a5602cd6181e001d6d71a99f400fa9ef;p=akkoma

diff --git a/lib/pleroma/web/plugs/set_locale_plug.ex b/lib/pleroma/web/plugs/set_locale_plug.ex
index a9387ba7e..e78917199 100644
--- a/lib/pleroma/web/plugs/set_locale_plug.ex
+++ b/lib/pleroma/web/plugs/set_locale_plug.ex
@@ -11,21 +11,33 @@ defmodule Pleroma.Web.Plugs.SetLocalePlug do
   def init(_), do: nil
 
   def call(conn, _) do
-    locale = get_locale_from_header(conn) || Gettext.get_locale()
-    Gettext.put_locale(locale)
-    assign(conn, :locale, locale)
+    locales = get_locales_from_header(conn)
+    first_locale = Enum.at(locales, 0, Gettext.get_locale())
+
+    Pleroma.Web.Gettext.put_locales(locales)
+
+    conn
+    |> assign(:locale, first_locale)
+    |> assign(:locales, locales)
   end
 
-  defp get_locale_from_header(conn) do
+  defp get_locales_from_header(conn) do
     conn
     |> extract_preferred_language()
     |> normalize_language_codes()
-    |> Enum.find(&supported_locale?/1)
+    |> all_supported()
+    |> Enum.uniq()
+  end
+
+  defp all_supported(locales) do
+    locales
+    |> Pleroma.Web.Gettext.ensure_fallbacks()
+    |> Enum.filter(&supported_locale?/1)
   end
 
   defp normalize_language_codes(codes) do
     codes
-    |> Enum.map(fn code -> String.replace(code, "-", "_") end)
+    |> Enum.map(fn code -> Pleroma.Web.Gettext.normalize_locale(code) end)
   end
 
   defp extract_preferred_language(conn) do
@@ -42,8 +54,7 @@ defmodule Pleroma.Web.Plugs.SetLocalePlug do
         []
 
       fe_lang ->
-        [fe_lang]
-        |> ensure_language_fallbacks()
+        String.split(fe_lang, ",")
     end
   end
 
@@ -56,7 +67,6 @@ defmodule Pleroma.Web.Plugs.SetLocalePlug do
         |> Enum.sort(&(&1.quality > &2.quality))
         |> Enum.map(& &1.tag)
         |> Enum.reject(&is_nil/1)
-        |> ensure_language_fallbacks()
 
       _ ->
         []
@@ -64,9 +74,7 @@ defmodule Pleroma.Web.Plugs.SetLocalePlug do
   end
 
   defp supported_locale?(locale) do
-    Pleroma.Web.Gettext
-    |> Gettext.known_locales()
-    |> Enum.member?(locale)
+    Pleroma.Web.Gettext.supports_locale?(locale)
   end
 
   defp parse_language_option(string) do
@@ -80,11 +88,4 @@ defmodule Pleroma.Web.Plugs.SetLocalePlug do
 
     %{tag: captures["tag"], quality: quality}
   end
-
-  defp ensure_language_fallbacks(tags) do
-    Enum.flat_map(tags, fn tag ->
-      [language | _] = String.split(tag, "-")
-      if Enum.member?(tags, language), do: [tag], else: [tag, language]
-    end)
-  end
 end