From 32db8d67d7837d2e66999dfd4841cd4920a9e3db Mon Sep 17 00:00:00 2001 From: Ralf Schmid Date: Tue, 15 Sep 2026 08:23:09 +0200 Subject: [PATCH] Maintenance: keep POT-Creation-Date empty to avoid Weblate merge conflicts A timestamp in the POT header churns on every catalog regeneration, gets copied into all .po headers by msgmerge on the Weblate side and causes rebase conflicts there. Follow the convention of the zammad/zammad i18n catalog and keep the field empty. --- Makefile | 4 ++++ locale/user-docs.pot | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 245ec72b..a89e9222 100644 --- a/Makefile +++ b/Makefile @@ -179,6 +179,10 @@ info: .PHONY: gettext gettext: $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) locale + # Keep POT-Creation-Date empty, following the convention of the zammad/zammad + # i18n catalog: a timestamp here churns on every regeneration, gets copied + # into all .po headers by msgmerge and causes Weblate rebase conflicts. + perl -pi -e 's/^"POT-Creation-Date: .*/"POT-Creation-Date: \\n"/' locale/user-docs.pot @echo @echo "Created or updated POT file in locale." diff --git a/locale/user-docs.pot b/locale/user-docs.pot index a939d23e..abe05d08 100644 --- a/locale/user-docs.pot +++ b/locale/user-docs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Zammad User Documentation pre-release\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-08-28 15:08+0200\n" +"POT-Creation-Date: \n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"