all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH proxmox-i18n v3 02/12] make: simplify msgmerge commands
Date: Mon, 27 Jul 2026 11:59:45 +0200	[thread overview]
Message-ID: <20260727095957.223209-3-m.sandoval@proxmox.com> (raw)
In-Reply-To: <20260727095957.223209-1-m.sandoval@proxmox.com>

msgmerge has a --for-msgfmt which produces the same output as filtering via
msgattrib. This removes the need for temporary 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 <m.sandoval@proxmox.com>
---
 Makefile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index b233828b..bc196c3a 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 $< 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 $< 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 $< pmg-yew-quarantine-all.pot --for-msgfmt | msgfmt --verbose --output-file $@ -
 
 # parameter 1 is the name
 # parameter 2 is the directory
-- 
2.47.3





  parent reply	other threads:[~2026-07-27 10:00 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-27  9:59 [PATCH proxmox-i18n v3 00/12] Makefile simplifications and improvements Maximiliano Sandoval
2026-07-27  9:59 ` [PATCH proxmox-i18n v3 01/12] make: catalog-%.mo: explicitly set template file Maximiliano Sandoval
2026-07-27  9:59 ` Maximiliano Sandoval [this message]
2026-07-27  9:59 ` [PATCH proxmox-i18n v3 03/12] make: clean: remove *.mo files Maximiliano Sandoval
2026-07-27  9:59 ` [PATCH proxmox-i18n v3 04/12] make: use long options for msgmerge and msginit Maximiliano Sandoval
2026-07-27  9:59 ` [PATCH proxmox-i18n v3 05/12] make: do_update: add --update for msgmerge Maximiliano Sandoval
2026-07-27  9:59 ` [PATCH proxmox-i18n v3 06/12] make: do_update: add --previous flag to msgmerge Maximiliano Sandoval
2026-07-27  9:59 ` [PATCH proxmox-i18n v3 07/12] gitignore: remove proxmox-datacenter-manager.pot Maximiliano Sandoval
2026-07-27  9:59 ` [PATCH proxmox-i18n v3 08/12] make: move linguas to a file Maximiliano Sandoval
2026-07-29  7:15   ` Maximiliano Sandoval
2026-07-27  9:59 ` [PATCH proxmox-i18n v3 09/12] make: add check-linguas target Maximiliano Sandoval
2026-07-27  9:59 ` [PATCH proxmox-i18n v3 10/12] make: init-%.po: add language to linguas Maximiliano Sandoval
2026-07-27  9:59 ` [PATCH proxmox-i18n v3 11/12] make: add targets to update specific PO files Maximiliano Sandoval
2026-07-27  9:59 ` [PATCH proxmox-i18n v3 12/12] make: rename check-% target to check-%.po Maximiliano Sandoval

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260727095957.223209-3-m.sandoval@proxmox.com \
    --to=m.sandoval@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal