Also remove "-" prefix from merge conflicts in .po files

This commit is contained in:
Rafael Epplée 2025-12-03 16:06:07 +01:00
parent 80a06c3609
commit a92771ffca
No known key found for this signature in database
GPG key ID: B4EFE6DC59FAE118

View file

@ -90,7 +90,7 @@ clean:
remove-gettext-conflicts:
#!/usr/bin/env bash
set -euo pipefail
find priv/gettext -type f -exec sed -i '/^<<<<<<</d; /^=======$/d; /^>>>>>>>/d; /^%%%%%%%/d; /^++++++/d; s/^+//' {} \;
find priv/gettext -type f -exec sed -i '/^<<<<<<</d; /^=======$/d; /^>>>>>>>/d; /^%%%%%%%/d; /^++++++/d; s/^+//; s/^-//' {} \;
# Production environment commands
# ================================