From a6b180c6f3996dd5a4ed6ce7e226130f65472e71 Mon Sep 17 00:00:00 2001
From: Shadi Naif <shadinaif@gmail.com>
Date: Mon, 16 Oct 2023 09:38:57 +0300
Subject: [PATCH] feat: FC-0012 - add atlas pull behind a flag

(atlas pull) will be performed only if OPENEDX_ATLAS_PULL environment variable is set

Refs: FC-0012 OEP-58
---
 Dockerfile | 3 +++
 Makefile   | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index a159d32464..f4eba6fd66 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -147,6 +147,9 @@ COPY . .
 # Install Python requirements again in order to capture local projects
 RUN pip install -e .
 
+# Setting edx-platform directory as safe for git commands
+RUN git config --global --add safe.directory /edx/app/edxapp/edx-platform
+
 # Production target
 FROM base as production
 
diff --git a/Makefile b/Makefile
index 55252bf2af..ff03f36554 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,7 @@ push_translations: ## push source strings to Transifex for translation
 
 pull_translations:  ## pull translations from Transifex
 	git clean -fdX conf/locale
+ifeq ($(OPENEDX_ATLAS_PULL),)
 	i18n_tool transifex pull
 	i18n_tool extract
 	i18n_tool dummy
@@ -65,6 +66,12 @@ pull_translations:  ## pull translations from Transifex
 	git clean -fdX conf/locale/eo
 	i18n_tool validate --verbose
 	paver i18n_compilejs
+else
+	find conf/locale -mindepth 1 -maxdepth 1 -type d -exec rm -r {} \;
+	atlas pull $(OPENEDX_ATLAS_ARGS) translations/edx-platform/conf/locale:conf/locale
+	i18n_tool generate
+	paver i18n_compilejs
+endif
 
 
 detect_changed_source_translations: ## check if translation files are up-to-date