summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorScott Shawcroft <scott@tannewt.org>2020-05-20 10:49:01 -0700
committerScott Shawcroft <scott@tannewt.org>2020-05-20 10:49:01 -0700
commit8a42c33dca577e827e31a212f2db6de1428ebc95 (patch)
treeb6cf2925a8ef6aca1a6f21f862d7e8e4c53eb5b4 /Makefile
parentba724fffb4e67dc37159c1371352e42e0bab7b4a (diff)
Add top level merge-translate target
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 842c18da5..b64217596 100644
--- a/Makefile
+++ b/Makefile
@@ -210,6 +210,12 @@ locale/circuitpython.pot: all-source
translate: locale/circuitpython.pot
for po in $(shell ls locale/*.po); do msgmerge -U $$po -s --no-fuzzy-matching --add-location=file locale/circuitpython.pot; done
+merge-translate:
+ git merge HEAD 1>&2 2> /dev/null; test $$? -eq 128
+ rm locale/*~ || true
+ git checkout --ours -- locale/*
+ make translate
+
check-translate: locale/circuitpython.pot $(wildcard locale/*.po)
$(PYTHON) tools/check_translations.py $^