From f0507b7fc0b0d3b09dc181770c22bac18628f5ae Mon Sep 17 00:00:00 2001 From: Tim McCormack Date: Wed, 24 Jul 2024 20:50:07 +0000 Subject: [PATCH] fix: Delete translations more conservatively (#35169) This was deleting `conf/locale/en/LC_MESSAGES/.gitignore` which was introduced in https://github.com/openedx/edx-platform/pull/34628 such that `make pull_translations` (which depends on `clean_translations`) was leaving the git working directory dirty. Deleting just the mo/po files will avoid this. Relates to https://github.com/edx/edx-arch-experiments/issues/732 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 098236fed8..c70de65fb4 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ pull_xblock_translations: ## pull xblock translations via atlas clean_translations: ## Remove existing translations to prepare for a fresh pull # Removes core edx-platform translations but keeps config files and Esperanto (eo) test translations - find conf/locale -mindepth 1 -maxdepth 1 -type d -a ! -name eo -exec rm -rf {} + + find conf/locale/ -type f \! -path '*/eo/*' \( -name '*.mo' -o -name '*.po' \) -delete # Removes the xblocks/plugins and js-compiled translations rm -rf conf/plugins-locale cms/static/js/i18n/ lms/static/js/i18n/ cms/static/js/xblock.v1-i18n/ lms/static/js/xblock.v1-i18n/