[PATCH proxmox-i18n v3 00/12] Makefile simplifications and improvements

[PATCH proxmox-i18n v3 00/12] Makefile simplifications and improvements

[Maximiliano Sandoval]

The main difference in behavior is that we add --previous to the msgmerge
command used to update the PO files. This can add some extra information to
translations, which can make it easier to determine whether the previous
translation is still valid or what kind of modifications it needs.

See individual commits and their notes.

Additionally:
 - there are a couple of cleanups
 - we move the LINGUAS to a dedicated file
 - check LINGUAS and add languages to it on the init-%.po target
 - split the do_update target on a per-language basis

Differences from v2:
 - Rename check-% to check-%.po for consistency
 - Use sort --unique instead of --uniq
 - Fix typo
 - Simplify check-linguas test
 - check: add check-linguas as a prerequisite
 - use $< on the msgmerge commands

Differences from v1:
 - Move LINGUAS to a dedicated file
 - split the do_update target on a per-language basis

Maximiliano Sandoval (12):
  make: catalog-%.mo: explicitly set template file
  make: simplify msgmerge commands
  make: clean: remove *.mo files
  make: use long options for msgmerge and msginit
  make: do_update: add --update for msgmerge
  make: do_update: add --previous flag to msgmerge
  gitignore: remove proxmox-datacenter-manager.pot
  make: move linguas to a file
  make: add check-linguas target
  make: init-%.po: add language to linguas
  make: add targets to update specific PO files
  make: rename check-% target to check-%.po

 .gitignore |  1 -
 LINGUAS    | 32 +++++++++++++++++++++++++
 Makefile   | 70 ++++++++++++++++++------------------------------------
 3 files changed, 55 insertions(+), 48 deletions(-)
 create mode 100644 LINGUAS

-- 
2.47.3

[PATCH proxmox-i18n v3 01/12] make: catalog-%.mo: explicitly set template file

[Maximiliano Sandoval]

msgmerge takes exactly two arguments. Fixes a regression from aacd4e7a.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 86f81e9b..b233828b 100644
--- a/Makefile
+++ b/Makefile
@@ -125,8 +125,8 @@ pve-lang-%.js: %.po
 pbs-lang-%.js: %.po
 	./po2js.pl -t pbs -v "$(DEB_VERSION)" -o pbs-lang-$*.js $?
 
-catalog-%.mo: %.po
-	msgmerge $^ | msgattrib --no-fuzzy --no-obsolete | msgfmt --verbose --output-file $@ $<;
+catalog-%.mo: %.po messages.pot
+	msgmerge $*.po messages.pot | msgattrib --no-fuzzy --no-obsolete | 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
-- 
2.47.3

[PATCH proxmox-i18n v3 02/12] make: simplify msgmerge commands

[Maximiliano Sandoval]

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

[PATCH proxmox-i18n v3 03/12] make: clean: remove *.mo files

[Maximiliano Sandoval]

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index bc196c3a..ac3f812b 100644
--- a/Makefile
+++ b/Makefile
@@ -215,7 +215,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf $(DEB_SOURCE)-[0-9]*/ *.po.tmp *.js.tmp *.deb *.dsc *.tar.* *.build *.buildinfo *.changes *.js messages.pot
+	rm -rf $(DEB_SOURCE)-[0-9]*/ *.po.tmp *.js.tmp *.deb *.dsc *.tar.* *.build *.buildinfo *.changes *.js messages.pot *.mo
 
 .PHONY: upload-pve upload-pmg upload-pbs upload-pdm upload
 upload-%: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
-- 
2.47.3

[PATCH proxmox-i18n v3 04/12] make: use long options for msgmerge and msginit

[Maximiliano Sandoval]

For improved readability and being consisten with the other commands.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ac3f812b..d654e28a 100644
--- a/Makefile
+++ b/Makefile
@@ -189,7 +189,7 @@ update_pot: submodule
 do_update:
 	$(MAKE) update_pot
 	$(MAKE) messages.pot
-	for i in $(LINGUAS); do echo -n "$$i: "; msgmerge -s -v $$i.po messages.pot >$$i.po.tmp && mv $$i.po.tmp $$i.po; done;
+	for i in $(LINGUAS); do echo -n "$$i: "; msgmerge --sort-output --verbose $$i.po messages.pot >$$i.po.tmp && mv $$i.po.tmp $$i.po; done;
 
 update:
 	git submodule foreach 'git pull --ff-only origin master'
@@ -199,7 +199,7 @@ stats:
 	@for i in $(LINGUAS); do echo -n "$$i: "; msgfmt --statistics -o /dev/null $$i.po; done
 
 init-%.po: messages.pot
-	msginit -i $^ -l $^ -o $*.po --no-translator
+	msginit --input $^ --locale $^ --output-file $*.po --no-translator
 
 .INTERMEDIATE: messages.pot
 messages.pot: proxmox-widget-toolkit.pot proxmox-mailgateway.pot pve-manager.pot proxmox-backup.pot proxmox-datacenter-manager-ui.pot pve-yew-mobile-gui.pot pmg-yew-quarantine-gui.pot proxmox-yew-comp.pot proxmox-yew-widget-toolkit.pot
-- 
2.47.3

[PATCH proxmox-i18n v3 05/12] make: do_update: add --update for msgmerge

[Maximiliano Sandoval]

Removes the need for temporary files.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d654e28a..94becc20 100644
--- a/Makefile
+++ b/Makefile
@@ -189,7 +189,7 @@ update_pot: submodule
 do_update:
 	$(MAKE) update_pot
 	$(MAKE) messages.pot
-	for i in $(LINGUAS); do echo -n "$$i: "; msgmerge --sort-output --verbose $$i.po messages.pot >$$i.po.tmp && mv $$i.po.tmp $$i.po; done;
+	for i in $(LINGUAS); do echo -n "$$i: "; msgmerge --sort-output --verbose --update --backup=none $$i.po messages.pot; done;
 
 update:
 	git submodule foreach 'git pull --ff-only origin master'
@@ -215,7 +215,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf $(DEB_SOURCE)-[0-9]*/ *.po.tmp *.js.tmp *.deb *.dsc *.tar.* *.build *.buildinfo *.changes *.js messages.pot *.mo
+	rm -rf $(DEB_SOURCE)-[0-9]*/ *.js.tmp *.deb *.dsc *.tar.* *.build *.buildinfo *.changes *.js messages.pot *.mo
 
 .PHONY: upload-pve upload-pmg upload-pbs upload-pdm upload
 upload-%: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
-- 
2.47.3

[PATCH proxmox-i18n v3 06/12] make: do_update: add --previous flag to msgmerge

[Maximiliano Sandoval]

When marking a string as fuzzy, this adds a hint with the previous msgid, e.g.

    #: pve-manager/www/manager6/ceph/OSD.js:557
    #, fuzzy
    #| msgid "Apply"
    msgid "Apply to"
    msgstr "Aplicar"

would show that the previous msgid was Apply. This might be picked up by the
translator editor.

This provides context to translators and help determining if and how the msgstr
should be adjusted.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 94becc20..42d9a40a 100644
--- a/Makefile
+++ b/Makefile
@@ -189,7 +189,7 @@ update_pot: submodule
 do_update:
 	$(MAKE) update_pot
 	$(MAKE) messages.pot
-	for i in $(LINGUAS); do echo -n "$$i: "; msgmerge --sort-output --verbose --update --backup=none $$i.po messages.pot; done;
+	for i in $(LINGUAS); do echo -n "$$i: "; msgmerge --sort-output --verbose --update --backup=none --previous $$i.po messages.pot; done;
 
 update:
 	git submodule foreach 'git pull --ff-only origin master'
-- 
2.47.3

[PATCH proxmox-i18n v3 07/12] gitignore: remove proxmox-datacenter-manager.pot

[Maximiliano Sandoval]

This file was removed at aacd4e7a.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6a318aae..96633ff3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,4 @@
 /pmg-lang-*.js
 /pve-lang-*.js
 /messages.pot
-/proxmox-datacenter-manager.pot
 /build-debs
-- 
2.47.3

[PATCH proxmox-i18n v3 08/12] make: move linguas to a file

[Maximiliano Sandoval]

Similarly how this is handled by meson's i18n module [1]. This allows
automatically adding linguas as part of the init-%.po target or validating we
are not missing any.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 LINGUAS  | 32 ++++++++++++++++++++++++++++++++
 Makefile | 34 +---------------------------------
 2 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 LINGUAS

diff --git a/LINGUAS b/LINGUAS
new file mode 100644
index 00000000..b157d968
--- /dev/null
+++ b/LINGUAS
@@ -0,0 +1,32 @@
+ar
+bg
+ca
+cs
+da
+de
+el_GR
+es
+eu
+fa
+fr
+ga
+gl
+he
+hr
+hu
+it
+ja
+ka
+ko
+nb
+nl
+nn
+pl
+pt_BR
+ru
+sl
+sv
+tr
+ukr
+zh_CN
+zh_TW
diff --git a/Makefile b/Makefile
index 42d9a40a..6b655eb6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,38 +1,6 @@
 include /usr/share/dpkg/pkg-info.mk
 
-LINGUAS ?= \
-	ar \
-	bg \
-	ca \
-	cs \
-	da \
-	de \
-	el_GR \
-	es \
-	eu \
-	fa \
-	fr \
-	ga \
-	gl \
-	he \
-	hr \
-	hu \
-	it \
-	ja \
-	ka \
-	ko \
-	nb \
-	nl \
-	nn \
-	pl \
-	pt_BR \
-	ru \
-	sl \
-	sv \
-	tr \
-	ukr \
-	zh_CN \
-	zh_TW \
+LINGUAS ?= $(shell xargs --arg-file LINGUAS)
 
 BUILDDIR ?= $(DEB_SOURCE)-$(DEB_VERSION)
 
-- 
2.47.3

Re: [PATCH proxmox-i18n v3 08/12] make: move linguas to a file

[Maximiliano Sandoval]

Maximiliano Sandoval <m.sandoval@proxmox.com> writes:

> Similarly how this is handled by meson's i18n module [1]. This allows
> automatically adding linguas as part of the init-%.po target or validating we
> are not missing any.
>
> Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>

This could be used to verify that the list of languages at
proxmox-yew-comp and proxmox-widget-toolkit are complete.

-- 
Maximiliano

[PATCH proxmox-i18n v3 09/12] make: add check-linguas target

[Maximiliano Sandoval]

Cross-references the list of languages in LINGUAS and the *.po files. Note that
the check-%.po check already checks that all LINGUAS have a respective PO file.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---

Notes:
    This should be equivalent to the less-verbose:
    
        test "$(ls *.po | sed 's/.po//')" = "$(cat LINGUAS)"
    
    but easier to understand why it fails on failure.

 Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6b655eb6..94aa3eef 100644
--- a/Makefile
+++ b/Makefile
@@ -202,5 +202,13 @@ upload: upload-pve upload-pmg upload-pbs upload-pdm
 check-%: %.po
 	msgfmt --check $*.po
 
+.PHONY: check-linguas
+check-linguas:
+	sort --check --unique LINGUAS
+	set -e; for lang in $(shell ls *.po | sed 's/\.po//'); do \
+	    echo "checking if $$lang is in LINGUAS"; \
+	    grep --quiet --line-regexp $$lang LINGUAS; \
+	done
+
 .PHONY: check
-check: $(addprefix check-, $(LINGUAS))
+check: $(addprefix check-, $(LINGUAS)) check-linguas
-- 
2.47.3

[PATCH proxmox-i18n v3 10/12] make: init-%.po: add language to linguas

[Maximiliano Sandoval]

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---

Notes:
    The command avoids writing to LINGUAS until we have a final output, e.g. we
    avoid
    
        echo $* >> LINGUAS && sort LINGUAS --uniq --output LINGUAS

 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 94aa3eef..d1b92ad4 100644
--- a/Makefile
+++ b/Makefile
@@ -168,6 +168,7 @@ stats:
 
 init-%.po: messages.pot
 	msginit --input $^ --locale $^ --output-file $*.po --no-translator
+	echo $* | cat LINGUAS - | sort --unique --output LINGUAS
 
 .INTERMEDIATE: messages.pot
 messages.pot: proxmox-widget-toolkit.pot proxmox-mailgateway.pot pve-manager.pot proxmox-backup.pot proxmox-datacenter-manager-ui.pot pve-yew-mobile-gui.pot pmg-yew-quarantine-gui.pot proxmox-yew-comp.pot proxmox-yew-widget-toolkit.pot
-- 
2.47.3

[PATCH proxmox-i18n v3 11/12] make: add targets to update specific PO files

[Maximiliano Sandoval]

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---

Notes:
    Taken from https://lore.proxmox.com/all/20260302095125.146700-2-m.sandoval@proxmox.com/T/#u but different in that the target is named update-%.po and only depends on messages.pot.

 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d1b92ad4..8b3f0098 100644
--- a/Makefile
+++ b/Makefile
@@ -153,11 +153,14 @@ update_pot: submodule
 	$(call xtrpotupdate,proxmox-yew-widget-toolkit,proxmox-yew-widget-toolkit/src/lib.rs)
 	for i in $(EXCLUDED_PWT_FILES); do mv -f proxmox-yew-widget-toolkit/src/$$i.org proxmox-yew-widget-toolkit/src/$$i; done
 
+.PHONY: update-%.po
+update-%.po: %.po messages.pot
+	msgmerge --sort-output --verbose --update --backup=none --previous $*.po messages.pot
 
 do_update:
 	$(MAKE) update_pot
 	$(MAKE) messages.pot
-	for i in $(LINGUAS); do echo -n "$$i: "; msgmerge --sort-output --verbose --update --backup=none --previous $$i.po messages.pot; done;
+	$(MAKE) $(patsubst %, update-%.po, $(LINGUAS))
 
 update:
 	git submodule foreach 'git pull --ff-only origin master'
-- 
2.47.3

[PATCH proxmox-i18n v3 12/12] make: rename check-% target to check-%.po

[Maximiliano Sandoval]

For consistency with init-%.po and update-%.po.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 8b3f0098..beda6461 100644
--- a/Makefile
+++ b/Makefile
@@ -202,8 +202,8 @@ upload-pdm: $(PDM_I18N_DEB)
 
 upload: upload-pve upload-pmg upload-pbs upload-pdm
 
-.PHONY: check-%
-check-%: %.po
+.PHONY: check-%.po
+check-%.po: %.po
 	msgfmt --check $*.po
 
 .PHONY: check-linguas
@@ -215,4 +215,4 @@ check-linguas:
 	done
 
 .PHONY: check
-check: $(addprefix check-, $(LINGUAS)) check-linguas
+check: $(patsubst %, check-%.po, $(LINGUAS)) check-linguas
-- 
2.47.3