Skip to content

Typo with dependency to translation files in application/decorator #972

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

Merged

Conversation

anaschwendler
Copy link
Contributor

@anaschwendler anaschwendler commented Apr 21, 2024

In order to fix the typo from the issue we need to run django-admin makemessages --all to regenerate the translations :)
This PR looks forward to that, I hope.

Solves #910

Thanks!

@marksweb marksweb merged commit df9d76b into DjangoGirls:main Apr 21, 2024
@marksweb
Copy link
Collaborator

@anaschwendler I just looked to get these changes updated in the translation branch and there were lots of conflicts.

That branch is used to integrate the project with the people doing the translations on https://poeditor.com

I've resolved the conflicts by accepting the changes on that branch so we don't lose any translations.

I think what you've done here will need to be done again once we get that branch merged into main & everything is up to day - sorry!

@anaschwendler
Copy link
Contributor Author

I think what you've done here will need to be done again once we get that branch merged into main & everything is up to day - sorry!

I can do it after, no problems, just let me know, also I'm also trying to understand how can I solve the invalid locale, if you have a guess 🤔

@marksweb
Copy link
Collaborator

@anaschwendler Ok I've updated the main branch with the latest translations from poeditor and fixed the tests.

I also added an explanation of the Brazilian confusion on #910

So I think you can re-do this and raise a new PR.

@anaschwendler
Copy link
Contributor Author

Hey @marksweb thank you very for checking into that :)
I'll re-open it soon!

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.

2 participants