From patchwork Fri Jan 17 17:10:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 37423 Received: (qmail 74597 invoked by alias); 17 Jan 2020 17:11:41 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 74584 invoked by uid 89); 17 Jan 2020 17:11:41 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_NEUTRAL autolearn=ham version=3.3.1 spammy=nowrap, wget, no-wrap, msgmerge X-HELO: egyptian.birch.relay.mailchannels.net X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Spill-Shade: 6c4839cb7a18d4c7_1579281086780_1292956373 X-MC-Loop-Signature: 1579281086780:3394438486 X-MC-Ingress-Time: 1579281086779 X-DH-BACKEND: pdx1-sub0-mail-a9 From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Cc: carlos@redhat.com, digitalfreak@lingonborough.com Subject: [PATCH] translations: Run msgmerge when downloading translations Date: Fri, 17 Jan 2020 22:40:59 +0530 Message-Id: <20200117171059.109758-1-siddhesh@sourceware.org> MIME-Version: 1.0 X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: 0 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedugedrtdekgddtgecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucggtfgfnhhsuhgsshgtrhhisggvpdfftffgtefojffquffvnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefuihguughhvghshhcurfhohigrrhgvkhgrrhcuoehsihguughhvghshhesshhouhhrtggvfigrrhgvrdhorhhgqeenucfkphepuddvfedrvdehvddrvddtvddrudejvdenucfrrghrrghmpehmohguvgepshhmthhppdhhvghloheplhhinhgrrhhoqdhlrghpthhophdrihhnthhrrgdrrhgvshgvrhhvvgguqdgsihhtrdgtohhmpdhinhgvthepuddvfedrvdehvddrvddtvddrudejvddprhgvthhurhhnqdhprghthhepufhiugguhhgvshhhucfrohihrghrvghkrghruceoshhiugguhhgvshhhsehsohhurhgtvgifrghrvgdrohhrgheqpdhmrghilhhfrhhomhepshhiugguhhgvshhhsehsohhurhgtvgifrghrvgdrohhrghdpnhhrtghpthhtohepughighhithgrlhhfrhgvrghksehlihhnghhonhgsohhrohhughhhrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; \ done