translations: Run msgmerge when downloading translations
diff mbox series

Message ID
State New
Headers show
  • translations: Run msgmerge when downloading translations
Related show

Commit Message

Siddhesh Poyarekar Jan. 17, 2020, 5:10 p.m. UTC
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
 po/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff mbox series

diff --git a/po/Makefile b/po/Makefile
index ce12e1dd5b..882a54b025 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -97,6 +97,7 @@  update-translations:
 	$(WGET) -qO- $(TRANSLATIONS_URL) | sed -n 's|.*href="\([^"]\+po\)".*|\1|p' | \
 	  while read f; do \
 	    $(WGET) -O $(objdir)/$$f-tmp2 $(TRANSLATIONS_URL)/$$f && \
-	    msgmerge $$f-tmp2 libc.pot > $$ff-tmp && \
+	    msgmerge --previous --no-wrap $(objdir)/$$f-tmp2 libc.pot > \
+	      $(objdir)/$$f-tmp && \
 	    mv -f $(objdir)/$$f-tmp $$f; \