From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 90DAF1FF138 for ; Mon, 20 Jul 2026 13:14:19 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 7571F2148A; Mon, 20 Jul 2026 13:14:18 +0200 (CEST) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-i18n 2/7] make: simplify msgmerge commands Date: Mon, 20 Jul 2026 13:13:36 +0200 Message-ID: <20260720111343.353644-3-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260720111343.353644-1-m.sandoval@proxmox.com> References: <20260720111343.353644-1-m.sandoval@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1784545999661 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.289 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_LOW -0.7 Sender listed at https://www.dnswl.org/, low trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: WBK32TUDIE3MTFMOXVMACTNUJ4BVVZGM X-Message-ID-Hash: WBK32TUDIE3MTFMOXVMACTNUJ4BVVZGM X-MailFrom: m.sandoval@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: msgmerge has a --for-msgfmt which produces the same output ass filtering via msgattrib. This removes the need for temporal files. Some differences are that --for-msgfmt will also strip file location and comments which do not serve any purpose when generating .mo files. Signed-off-by: Maximiliano Sandoval --- Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index b233828b..dcd742ea 100644 --- a/Makefile +++ b/Makefile @@ -126,25 +126,21 @@ pbs-lang-%.js: %.po ./po2js.pl -t pbs -v "$(DEB_VERSION)" -o pbs-lang-$*.js $? catalog-%.mo: %.po messages.pot - msgmerge $*.po messages.pot | msgattrib --no-fuzzy --no-obsolete | msgfmt --verbose --output-file $@ $<; + msgmerge $*.po messages.pot --for-msgfmt | msgfmt --verbose --output-file $@ - .INTERMEDIATE: pve-yew-mobile-all.pot pve-yew-mobile-all.pot: pve-yew-mobile-gui.pot proxmox-yew-comp.pot proxmox-yew-widget-toolkit.pot xgettext $^ --output $@ pve-yew-mobile-catalog-%.mo: %.po pve-yew-mobile-all.pot - msgmerge $*.po pve-yew-mobile-all.pot| msgattrib --no-fuzzy --no-obsolete > $@.tmp - msgfmt --verbose --output-file $@ $@.tmp; - rm -rf $@.tmp + msgmerge $*.po pve-yew-mobile-all.pot --for-msgfmt | msgfmt --verbose --output-file $@ - .INTERMEDIATE: pmg-yew-quarantine-all.pot pmg-yew-quarantine-all.pot: pmg-yew-quarantine-gui.pot proxmox-yew-comp.pot proxmox-yew-widget-toolkit.pot xgettext $^ --output $@ pmg-yew-quarantine-catalog-%.mo: %.po pmg-yew-quarantine-all.pot - msgmerge $*.po pmg-yew-quarantine-all.pot| msgattrib --no-fuzzy --no-obsolete > $@.tmp - msgfmt --verbose --output-file $@ $@.tmp; - rm -rf $@.tmp + msgmerge $*.po pmg-yew-quarantine-all.pot --for-msgfmt | msgfmt --verbose --output-file $@ - # parameter 1 is the name # parameter 2 is the directory -- 2.47.3