Make cms.pot string order consistent, update .pot and .po files #1512
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By default,
./setup.py extract_messageswill generate the .pot file in basically a random order (depending on the order of os.listdir, which returns the files in whichever order they are actually stored on disk). This means running extract_messages effectively shuffles the .pot file, generating an unnecessarily large diff and introducing merge conflicts.To fix this, I added
sort_by_file: 1to the extract_messages settings in setup.cfg, which sorts the strings in the .pot file by the filepath they are used in.I then also ran extract_messages. Of course, because the order changed again, this commit once again does some arbitrary shuffling of the strings, but hopefully this is the last time it happens :)
I also ran update_catalog for all languages; hopefully this makes new strings show up on Weblate properly.