From 0faefb65f20dd999d892de2382115ea6dd2e17cb Mon Sep 17 00:00:00 2001
From: Roger Shimizu <rosh@debian.org>
Date: Mon, 21 Jun 2021 02:59:49 +0200
Subject: [PATCH] Rebuild paths in case force_en-US was set

---
 torbrowser_launcher/common.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
index 7c1a42d..cbebce0 100644
--- a/torbrowser_launcher/common.py
+++ b/torbrowser_launcher/common.py
@@ -63,6 +63,8 @@ class Common(object):
             self.mkdir(self.paths["dirs"][d])
         self.load_mirrors()
         self.load_settings()
+        # some settings require a path rebuild, like force_en-US
+        self.build_paths()
         self.mkdir(self.paths["download_dir"])
         self.mkdir(self.paths["tbb"]["dir"])
         self.init_gnupg()
@@ -167,6 +169,11 @@ class Common(object):
         )
         old_tbb_data = "{0}/.torbrowser".format(homedir)
 
+        if hasattr(self, "settings") and self.settings["force_en-US"]:
+            language = "en-US"
+        else:
+            language = self.language
+
         if tbb_version:
             # tarball filename
             if self.architecture == "x86_64":
@@ -174,10 +181,6 @@ class Common(object):
             else:
                 arch = "linux32"
 
-            if hasattr(self, "settings") and self.settings["force_en-US"]:
-                language = "en-US"
-            else:
-                language = self.language
             tarball_filename = (
                 "tor-browser-" + arch + "-" + tbb_version + "_" + language + ".tar.xz"
             )
@@ -230,19 +233,19 @@ class Common(object):
                     + "/tbb/"
                     + self.architecture
                     + "/tor-browser_"
-                    + self.language
+                    + language
                     + "/Browser/TorBrowser/Docs/ChangeLog.txt",
                     "dir": tbb_local + "/tbb/" + self.architecture,
                     "dir_tbb": tbb_local
                     + "/tbb/"
                     + self.architecture
                     + "/tor-browser_"
-                    + self.language,
+                    + language,
                     "start": tbb_local
                     + "/tbb/"
                     + self.architecture
                     + "/tor-browser_"
-                    + self.language
+                    + language
                     + "/start-tor-browser.desktop",
                 },
             }
-- 
2.44.0