glaterza commented on PR #44395: URL: https://github.com/apache/superset/pull/44395#issuecomment-5816926985
Rebased onto current master (`2ac6e2468d`) to clear the `messages.pot` conflict. Three upstream changes had touched the template since the last push: #44467, #44574 and #44584. **How I resolved it:** by regenerating, not by hand-merging. I took master's template, stripped the ASF licence block, ran this PR's repaired normalization (`msgcat --sort-output --no-wrap --no-location`), and put the block back with its blank line. Git then dropped the old "regenerate with babel_update.sh" commit as already-applied, so the branch is down to five commits. Checks after the rebase: - msgid set is identical to master's template: 5,465 before, 5,465 after, none lost or gained. - Normalization is stable — running it again changes nothing. - `check_pot_drift.py`: "messages.pot matches a fresh extraction." - `pre-commit` passes on every changed file, mypy included. One gap to be straight about: I could not run `tests/unit_tests/scripts/translations/babel_update_test.py` locally. My environment's pinned dependencies are behind the repo's and the test fixture fails to build before collection. The tests are unchanged by this rebase and CI runs them here. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
