X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fgettext.ex;h=7afcd38f03892cf390bd8b2ca6bb99ff3cc911c9;hb=dc9f66749c85352e0d7761ae2b9b8663a3aa3e3a;hp=51e56939e4dad2b5c49d6d14b2357fe1307c8584;hpb=2df25e6666d0fb65a142b29becee9af0adce998b;p=akkoma

diff --git a/lib/pleroma/web/gettext.ex b/lib/pleroma/web/gettext.ex
index 51e56939e..7afcd38f0 100644
--- a/lib/pleroma/web/gettext.ex
+++ b/lib/pleroma/web/gettext.ex
@@ -161,10 +161,25 @@ defmodule Pleroma.Web.Gettext do
     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) do
+    if is_nil(next) or not should_fallback?(locale) do
       super(locale, domain, msgctxt, msgid, bindings)
     else
       {:ok,
@@ -185,7 +200,7 @@ defmodule Pleroma.Web.Gettext do
       ) do
     next = next_locale(locale, get_locales())
 
-    if is_nil(next) do
+    if is_nil(next) or not should_fallback?(locale) do
       super(locale, domain, msgctxt, msgid, msgid_plural, n, bindings)
     else
       {:ok,