Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CHORE] Extract, update and compile Babel files on merge to main #4783

Merged
merged 6 commits into from
Nov 23, 2023

Conversation

jpelay
Copy link
Member

@jpelay jpelay commented Nov 21, 2023

Description

Adds 2 more command to the Babel GitHub action. Worth noting that in this commands adds the option --no-wrap that isn't specified on the wiki to avoid merge problems

**Fixes #4774 **

@Felienne
Copy link
Member

Description

Adds 2 more command to the Babel GitHub action. Worth noting that in this commands adds the option --no-wrap that isn't specified on the wiki to avoid merge problems

**Fixes #4774 **

I must admit I lost track of the path forward a bit with the wrapping/ not wrapping, sorry!

Let's document here. Is it this?

@hasan-sh
Copy link
Collaborator

On the one hand, with wrapping it's easier to read in the yml files. With no wrapping on the other hand is more structured since you don't split lines such as:

"The name {variable} needs to be set before you can use it on the right-"
"hand side of the {is} command."

The previous one may be read as after right- there's a new line, which isn't the case! Hence a potential important detail we might need to document is that devs should not rely on whether the keys have new lines or not. For instance, in the survey pr, annelein tried at first to split questions on \n (which made sense), but that wouldn't work unless the \n is embeded within the translation key. Annelein changed it now to have separate questions for the survey, but I'm mentioning it for future reference.

@hasan-sh
Copy link
Collaborator

Also whatever we choose, existing PRs must rerun with the chosen approach; e.g., I now run it with wrapping (so i don't supply --no-wrap).

@jpelay
Copy link
Member Author

jpelay commented Nov 23, 2023

I think we should always unwrap files, because that was what was causing many merge conflicts between us and Weblate. If we unwrap the files and don't tell people to unwrap them, won't that cause their po files to be wrapped and then that onto itslef cause more conflicts?

@Felienne
Copy link
Member

I think we should always unwrap files, because that was what was causing many merge conflicts between us and Weblate. If we unwrap the files and don't tell people to unwrap them, won't that cause their po files to be wrapped and then that onto itslef cause more conflicts?

Yes, totally agree, but we have now recently removed no-wrap for the wiki, right. So I just want to remember that we need to put it back after we have unwrapped.

Copy link
Contributor

mergify bot commented Nov 23, 2023

Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to allow changes to be pushed to your fork).

Copy link
Contributor

mergify bot commented Nov 23, 2023

Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to allow changes to be pushed to your fork).

Copy link
Contributor

mergify bot commented Nov 23, 2023

Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit 5829287 into hedyorg:main Nov 23, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CHORE] add pybabel extract on each PR and commit po(t) files to main
3 participants