summary refs log tree commit diff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@sourceware.org>2020-01-17 22:06:01 +0530
committerSiddhesh Poyarekar <siddhesh@sourceware.org>2020-01-19 10:45:49 +0530
commit63675a927eb65d4990179c12e7e1a4805a98e7c8 (patch)
tree6587c82e5dfc9e4eff1092fbece6a4a997874bbf
parent9f8b135f76ac7943d1e108b7f6e816f526b2208c (diff)
downloadglibc-63675a927eb65d4990179c12e7e1a4805a98e7c8.tar.gz
glibc-63675a927eb65d4990179c12e7e1a4805a98e7c8.tar.xz
glibc-63675a927eb65d4990179c12e7e1a4805a98e7c8.zip
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.
-rw-r--r--po/Makefile4
1 files changed, 3 insertions, 1 deletions
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