From 63675a927eb65d4990179c12e7e1a4805a98e7c8 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Fri, 17 Jan 2020 22:06:01 +0530 Subject: translations: Run msgmerge when downloading translations The latest translations in the translationproject URL need to be merged in using msgmerge for the po files to be correctly updated, otherwise we may end up getting odd results, such as the previous translations update. This patch adds another step to the update-translations Makefile target which does a msgmerge of the downloaded po file with libc.pot and then uses that as the final result. --- po/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'po') diff --git a/po/Makefile b/po/Makefile index aa88aba405..882a54b025 100644 --- a/po/Makefile +++ b/po/Makefile @@ -96,6 +96,8 @@ WGET = wget update-translations: $(WGET) -qO- $(TRANSLATIONS_URL) | sed -n 's|.*href="\([^"]\+po\)".*|\1|p' | \ while read f; do \ - $(WGET) -O $(objdir)/$$f-tmp $(TRANSLATIONS_URL)/$$f && \ + $(WGET) -O $(objdir)/$$f-tmp2 $(TRANSLATIONS_URL)/$$f && \ + msgmerge --previous --no-wrap $(objdir)/$$f-tmp2 libc.pot > \ + $(objdir)/$$f-tmp && \ mv -f $(objdir)/$$f-tmp $$f; \ done -- cgit v1.2.1