Make lw translations work

assets/mozconfig.new

@@ -17,7 +17,7 @@ ac_add_options --with-branding=browser/branding/librewolf
 
 ac_add_options --with-unsigned-addon-scopes=app,system
 
-ac_add_options --with-l10n-base=$PWD/browser/locales/l10n
+ac_add_options --with-l10n-base=$PWD/browser/locales
 
 ac_add_options --enable-bootstrap
 

scripts/generate-locales.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/bash
-
-if [ ! -f browser/locales/shipped-locales ]; then
-  echo "ERROR: Run this script from the root of the LibreWolf source code"
-  exit 1
-fi
-
-echo "-> Downloading locales"
-rm -rf browser/locales/l10n
-curl -o browser/locales/l10n.zip "https://codeload.github.com/mozilla-l10n/firefox-l10n/zip/refs/heads/main"
-unzip -qo browser/locales/l10n.zip -d browser/locales/
-mv browser/locales/firefox-l10n-main browser/locales/l10n
-rm -f browser/locales/l10n.zip
-
-sourcedir="$(pwd)"
-set -x
-cd "../l10n/en-US"
-find . -name '*.ftl' -exec sh -c "mkdir -p \$(dirname $sourcedir/{}) && cat {} >> $sourcedir/{}" \;
-cd ..
-find . -name '*.ftl' -path en-US -prune -exec sh -c "mkdir -p \$(dirname $sourcedir/browser/locales/l10n/{}) && cat {} >> $sourcedir/browser/locales/l10n/{}" \;

scripts/librewolf-patches.py

@@ -9,6 +9,8 @@ import os
 import sys
 import optparse
 import time
+from pathlib import Path
+from tempfile import TemporaryDirectory
 
 
 #
@@ -145,8 +147,38 @@ def librewolf_patches():
         with open(file, "w") as f:
             f.write("{}-{}".format(version,release))
 
-    # generate locales
+    print("-> Downloading locales from https://github.com/mozilla-l10n/firefox-l10n")
-    exec("bash ../scripts/generate-locales.sh")
+    with TemporaryDirectory() as tmpdir:
+        exec(f"curl -o {tmpdir}/l10n.zip 'https://codeload.github.com/mozilla-l10n/firefox-l10n/zip/refs/heads/main'")
+        exec(f"unzip -qo {tmpdir}/l10n.zip -d {tmpdir}/l10n")
+        exec(f"mv {tmpdir}/l10n/firefox-l10n-main/* browser/locales")
+
+    print("-> Applying LibreWolf locales")
+    l10n_dir = Path("..", "l10n")
+    for source_path in l10n_dir.rglob("*"):
+        if source_path.is_dir() or source_path.name.endswith(".md"):
+            continue
+
+
+
+        rel_path = source_path.relative_to(l10n_dir)
+        target_path = Path(
+            "browser", "locales",
+            rel_path.parts[0], 
+            *([] if rel_path.parts[0] == "en-US" else ["browser"]) , 
+            *rel_path.parts[1:])
+        target_path.parent.mkdir(parents=True, exist_ok=True)
+
+        write_mode = "w"
+        if ".inc" in target_path.name:
+            target_path = target_path.with_name(target_path.name.replace(".inc", ""))
+            write_mode = "a"
+
+        print(f"{source_path} {">" if write_mode == "w" else ">>"} {target_path}")
+
+        with open(target_path, write_mode) as target_file:
+            with open(source_path, "r") as source_file:
+                target_file.write(("\n\n" if write_mode == "a" else "") + source_file.read())
 
     leave_srcdir()