From 6cddf6f7596585975d2d3982cf003eecb01891f6 Mon Sep 17 00:00:00 2001
From: Steve Jalim <stevejalim@mozilla.com>
Date: Tue, 3 May 2022 18:29:43 +0100
Subject: [PATCH] Explicitly redefine FLUENT_PATHS, to avoid pain later

---
 bedrock/settings/__init__.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/bedrock/settings/__init__.py b/bedrock/settings/__init__.py
index 7b897ff46e2..bfba1f48684 100644
--- a/bedrock/settings/__init__.py
+++ b/bedrock/settings/__init__.py
@@ -113,11 +113,15 @@
         "nav",
         "footer",
     ]
-
-    # Swap the default FLUENT_LOCAL_PATH for a Pocket-specific one
-    FLUENT_PATHS.pop(FLUENT_PATHS.index(FLUENT_LOCAL_PATH))
+    # Redefine the FLUENT_LOCAL_PATH for a Pocket-specific one and
+    # ensure it is the first one we check, because order matters.
     FLUENT_LOCAL_PATH = ROOT_PATH / "l10n-pocket"
-    FLUENT_PATHS.insert(0, FLUENT_LOCAL_PATH)
+    FLUENT_PATHS = [
+        # local FTL files
+        FLUENT_LOCAL_PATH,
+        # remote FTL files from l10n team
+        FLUENT_REPO_PATH,
+    ]
 
 else:
     ROOT_URLCONF = "bedrock.urls.mozorg_mode"