# HG changeset patch # User Mads Kiilerich # Date 2019-12-19 20:47:55 # Node ID 30e137b4ff1858d8218d05d92ab666e9361a7dbe # Parent 5553ecc962e0d41bc82904ff974436aa5124e441 scripts/i18n: also normalize casing of UTF-8 in Content-Type f626260a376c introduced invariant msgmerge casing. Do the same when normalizing to ensure consistency also without msgmerge and to avoid unnecessary conflicts. diff --git a/scripts/i18n_utils.py b/scripts/i18n_utils.py --- a/scripts/i18n_utils.py +++ b/scripts/i18n_utils.py @@ -133,6 +133,9 @@ def _normalize_po(raw_content): .strip(), '', header_normalize_re.sub('', raw_content[header_start:header_end]) + .replace( + r'"Content-Type: text/plain; charset=utf-8\n"', + r'"Content-Type: text/plain; charset=UTF-8\n"') # maintain msgmerge casing .strip(), ''] # preserve normalized header # all chunks are separated by empty line