mistercrunch commented on PR #28572: URL: https://github.com/apache/superset/pull/28572#issuecomment-2150934757
[I think] It should always be safe to run `./scripts/translations/babel_update.sh` and merge what comes out. So I'm fine with this PR as is. As we do this, we should expect the `.po` files to change a lot as if you were to only add a single line at the top some files, it'll change all of the "which line of code" references. As much as it's useful to have the references, it's a pain from a source control standpoint as the moment anyone adds a line of code, the .po files change a lot, which can lead to merge conflicts and such. @goldjee , in terms of handling merge conflicts, I think it should always be safe to: - before the imminent merge conflict, set aside the `.po` file(s) you've altered/improved in a temp folder someplace - rebase/merge the upstream changes - copy your `.po`back into their place in the repo - re-run ./scripts/translations/babel_update.sh I think we may want to capture this ^^^ into the docs. Now another thing we may want to do would be to tell people submitting translation PRs to NOT run ./scripts/translations/babel_update.sh as part of their PR, so that they're actually reviewable... In this PR it seems impossible to review the changes you've made because GitHub is overwhelmed by number of changes. Even if it were to expose them, it would still be hard to review as it's a mix of legit changes + .po files bookkeeping. I wonder if we could set the .po files to NOT hold the references (?) -- 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]
