From d380299917f0942d411d9323288a94af36105b10 Mon Sep 17 00:00:00 2001
From: Norisz Fay <nfay@mozilla.com>
Date: Fri, 13 Sep 2024 21:06:13 +0300
Subject: [PATCH] Backed out changeset 8cbe1aad4c5c (bug 1918304) for causing
 l10n and android bustages CLOSED TREE

---
 build/docs/locales.rst  | 16 +++++++++-------
 toolkit/locales/l10n.mk | 11 ++---------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/build/docs/locales.rst b/build/docs/locales.rst
index 502563e8b79e..ddd41826bfc9 100644
--- a/build/docs/locales.rst
+++ b/build/docs/locales.rst
@@ -39,13 +39,15 @@ find the available localizations from `firefox-l10n <https://github.com/mozilla-
 
       ./mach build installers-$AB_CD
 
-You should find a re-packaged build at ``OBJDIR/dist/``, and a runnable binary
-in ``OBJDIR/dist/l10n-stage/``. The ``installers`` target runs quite a few
-things for you, including getting the localizations from
-https://github.com/mozilla-l10n/firefox-l10n (or updating it if already
-present). It will clone them into ``~/.mozbuild/l10n-central``. If you prefer to
-have the l10n repositories at a different location on your disk, you can point
-to the directory via
+You should find a re-packaged build at ``OBJDIR/dist/``, and a
+runnable binary in ``OBJDIR/dist/l10n-stage/``.
+The ``installers`` target runs quite a few things for you, including getting
+the localizations from https://github.com/mozilla-l10n/firefox-l10n.
+It will clone them into ``~/.mozbuild/l10n-central``.
+If you have an existing repository there, you
+may want to occasionally update that via ``git pull``. If you prefer
+to have the l10n repositories at a different location on your disk, you
+can point to the directory via
 
    .. code-block:: shell
 
diff --git a/toolkit/locales/l10n.mk b/toolkit/locales/l10n.mk
index 815e14bf7763..f32094244873 100644
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -145,7 +145,6 @@ repackage-zip-%: unpack
 # check DIST_SUBDIR, and if that isn't present, just package the default
 # chrome directory and top-level localization for Fluent.
 PKG_ZIP_DIRS = chrome localization $(or $(DIST_SUBDIRS),$(DIST_SUBDIR))
-GIT ?= git
 
 merge-%: IS_LANGUAGE_REPACK=1
 merge-%: AB_CD=$*
@@ -163,13 +162,7 @@ endif
 ifdef NIGHTLY_BUILD
 	if  ! test -d $(L10NBASEDIR)/$(AB_CD) ; then \
 		$(NSINSTALL) -D $(L10NBASEDIR) ; \
-		$(GIT) clone https://github.com/mozilla-l10n/firefox-l10n.git $(L10NBASEDIR) --depth 1 ; \
-	fi
-	if  test -d $(L10NBASEDIR)/.git ; then \
-		$(GIT) -C $(L10NBASEDIR) pull --quiet ; \
-	else \
-		echo 'Error: folder is not a git repository $(L10NBASEDIR)' ; \
-		exit 1 ; \
+		$(GIT) clone https://github.com/mozilla-l10n/firefox-l10n.git $(L10NBASEDIR) ; \
 	fi
 endif
 	$(RM) -rf $(REAL_LOCALE_MERGEDIR)
@@ -204,7 +197,7 @@ package-langpack-%:
 	$(call py_action,zip $(PKG_LANGPACK_BASENAME).xpi,-C $(DIST)/xpi-stage/locale-$(AB_CD) -x **/*.manifest -x **/*.js -x **/*.ini $(LANGPACK_FILE) $(PKG_ZIP_DIRS) manifest.json)
 
 # This variable is to allow the wget-en-US target to know which ftp server to download from
-ifndef EN_US_BINARY_URL
+ifndef EN_US_BINARY_URL 
 EN_US_BINARY_URL = $(error You must set EN_US_BINARY_URL)
 endif