X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fgettext.ex;h=7afcd38f03892cf390bd8b2ca6bb99ff3cc911c9;hb=87d5e5b06a9fff960c1918ba4256c43e2545abc5;hp=cd795008d07c5c1f8d69e64e3c4634508b1af84b;hpb=07bd35227af9a4f3eefd2cf0a7cefc6ea2d110b3;p=akkoma

diff --git a/lib/pleroma/web/gettext.ex b/lib/pleroma/web/gettext.ex
index cd795008d..7afcd38f0 100644
--- a/lib/pleroma/web/gettext.ex
+++ b/lib/pleroma/web/gettext.ex
@@ -58,7 +58,8 @@ defmodule Pleroma.Web.Gettext do
   def ensure_fallbacks(locales) do
     locales
     |> Enum.flat_map(fn locale ->
-      others = other_supported_variants_of_locale(locale)
+      others =
+        other_supported_variants_of_locale(locale)
         |> Enum.filter(fn l -> not Enum.member?(locales, l) end)
 
       [locale] ++ others
@@ -80,7 +81,7 @@ defmodule Pleroma.Web.Gettext do
     end
   end
 
-  def get_locales() do
+  def get_locales do
     Process.get({Pleroma.Web.Gettext, :locales}, [])
   end
 
@@ -117,6 +118,7 @@ defmodule Pleroma.Web.Gettext do
         put_locales(prev_locales)
       else
         Process.delete({Pleroma.Web.Gettext, :locales})
+        Process.delete(Gettext)
       end
     end
   end
@@ -148,4 +150,71 @@ defmodule Pleroma.Web.Gettext do
       )
     end
   end
+
+  defp next_locale(locale, list) do
+    index = Enum.find_index(list, fn item -> item == locale end)
+
+    if not is_nil(index) do
+      Enum.at(list, index + 1)
+    else
+      nil
+    end
+  end
+
+  # We do not yet have a proper English translation. The "English"
+  # version is currently but the fallback msgid. However, this
+  # will not work if the user puts English as the first language,
+  # and at the same time specifies other languages, as gettext will
+  # think the English translation is missing, and call
+  # handle_missing_translation functions. This may result in
+  # text in other languages being shown even if English is preferred
+  # by the user.
+  #
+  # To prevent this, we do not allow fallbacking when the current
+  # locale missing a translation is English.
+  defp should_fallback?(locale) do
+    locale != "en"
+  end
+
+  def handle_missing_translation(locale, domain, msgctxt, msgid, bindings) do
+    next = next_locale(locale, get_locales())
+
+    if is_nil(next) or not should_fallback?(locale) do
+      super(locale, domain, msgctxt, msgid, bindings)
+    else
+      {:ok,
+       Gettext.with_locale(next, fn ->
+         Gettext.dpgettext(Pleroma.Web.Gettext, domain, msgctxt, msgid, bindings)
+       end)}
+    end
+  end
+
+  def handle_missing_plural_translation(
+        locale,
+        domain,
+        msgctxt,
+        msgid,
+        msgid_plural,
+        n,
+        bindings
+      ) do
+    next = next_locale(locale, get_locales())
+
+    if is_nil(next) or not should_fallback?(locale) do
+      super(locale, domain, msgctxt, msgid, msgid_plural, n, bindings)
+    else
+      {:ok,
+       Gettext.with_locale(next, fn ->
+         Gettext.dpngettext(
+           Pleroma.Web.Gettext,
+           domain,
+           msgctxt,
+           msgid,
+           msgid_plural,
+           n,
+           bindings
+         )
+       end)}
+    end
+  end
 end