feat: standardize make extract_translations (#105)

Refs: FC-0012 OEP-58

Makefile

@@ -4,9 +4,10 @@
 .DEFAULT_GOAL := help
 
 WORKING_DIR := image_explorer
-EXTRACT_DIR := $(WORKING_DIR)/translations/en/LC_MESSAGES
-EXTRACTED_DJANGO := $(EXTRACT_DIR)/django-partial.po
-EXTRACTED_TEXT := $(EXTRACT_DIR)/text.po
+EXTRACT_DIR := $(WORKING_DIR)/conf/locale/en/LC_MESSAGES
+EXTRACTED_DJANGO_PARTIAL := $(EXTRACT_DIR)/django-partial.po
+EXTRACTED_DJANGOJS_PARTIAL := $(EXTRACT_DIR)/djangojs-partial.po
+EXTRACTED_DJANGO := $(EXTRACT_DIR)/django.po
 
 help: ## display this help message
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -25,9 +26,14 @@ clean: ## remove generated byte code, coverage reports, and build artifacts
 
 extract_translations: ## extract strings to be translated, outputting .po files
 	cd $(WORKING_DIR) && i18n_tool extract
-	mv $(EXTRACTED_DJANGO) $(EXTRACTED_TEXT)
-	sed -i'' -e 's/nplurals=INTEGER/nplurals=2/' $(EXTRACTED_TEXT)
-	sed -i'' -e 's/plural=EXPRESSION/plural=\(n != 1\)/' $(EXTRACTED_TEXT)
+	mv $(EXTRACTED_DJANGO_PARTIAL) $(EXTRACTED_DJANGO)
+	# Safely concatenate djangojs if it exists
+	( test -f $(EXTRACTED_DJANGOJS_PARTIAL) && \
+	  msgcat $(EXTRACTED_DJANGO) $(EXTRACTED_DJANGOJS_PARTIAL) -o $(EXTRACTED_DJANGO) \
+	) || ! test -f $(EXTRACTED_DJANGOJS_PARTIAL)
+	rm -rf $(EXTRACTED_DJANGOJS_PARTIAL)
+	sed -i'' -e 's/nplurals=INTEGER/nplurals=2/' $(EXTRACTED_DJANGO)
+	sed -i'' -e 's/plural=EXPRESSION/plural=\(n != 1\)/' $(EXTRACTED_DJANGO)
 
 compile_translations: ## compile translation files, outputting .mo files for each supported language
 	cd $(WORKING_DIR) && i18n_tool generate

image_explorer/conf/locale/en/LC_MESSAGES/text.po

@@ -0,0 +1 @@
+django.po

image_explorer/locale

@@ -1 +1 @@
-translations/
+conf/locale

image_explorer/translations

@@ -0,0 +1 @@
+conf/locale