[PATCH proxmox-i18n 0/7] Makefile simplifications and improvements

[PATCH proxmox-i18n 0/7] Makefile simplifications and improvements

[Maximiliano Sandoval]

The main difference 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.

Addtionally, there are a couple of cleanups.

Maximiliano Sandoval (7):
  make: catalog-%.mo: explicitly set template file
  make: simplify msgmerge commands
  make: clean: Cleanup *.mo files
  make: do_update: use long options for msgmerge
  make: do_update: use --update for msgmerge
  make: add --previous flag to msgmerge
  gitignore: remove proxmox-datacenter-manager.pot

 .gitignore |  1 -
 Makefile   | 16 ++++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

-- 
2.47.3

[PATCH proxmox-i18n 1/7] 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 2/7] make: simplify msgmerge commands

[Maximiliano Sandoval]

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 <m.sandoval@proxmox.com>
---
 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

[PATCH proxmox-i18n 3/7] make: clean: Cleanup *.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 dcd742ea..1873de31 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 3/7] 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 dcd742ea..1873de31 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 4/7] make: do_update: use long options for msgmerge

[Maximiliano Sandoval]

For consistency with the other commands.

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 1873de31..98ecf4f7 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'
-- 
2.47.3

[PATCH proxmox-i18n 5/7] make: do_update: use --update for msgmerge

[Maximiliano Sandoval]

Removes the need for temporal 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 98ecf4f7..4934b360 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 $$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 6/7] make: 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 4934b360..24ef7e3b 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 $$i.po messages.pot; done;
+	for i in $(LINGUAS); do echo -n "$$i: "; msgmerge --sort-output --verbose --update --previous $$i.po messages.pot; done;
 
 update:
 	git submodule foreach 'git pull --ff-only origin master'
-- 
2.47.3

[PATCH proxmox-i18n 7/7] 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