Skip to content

🧑‍💻 (frontend): add placeholder translation to mitigate merge conflicts #832

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

Conversation

dakshesh14
Copy link

Added a placeholder translation entry at the end of each language file to reduce merge conflicts when multiple contributors are working on translations. This change also helps minimize unnecessary diff sizes.
Address: #831

Purpose

Introduce a placeholder translation entry to prevent merge conflicts in translation files and reduce unnecessary diff size during collaborative work.

Added a placeholder translation entry at the end of each language file to reduce merge conflicts when multiple contributors work on translations.
@lunika
Copy link
Member

lunika commented Apr 6, 2025

Hi,
Thanks for your contribution.
All the translation process is automated and for now we didn't have any conflict.

Can you describe a bit how you work and how this lead to a conflict ?

Thank you

@dakshesh14
Copy link
Author

Hi, thanks for the clarification. I wasn’t aware that the translation process here is fully automated.

In some other projects I've contributed to, we encountered merge conflicts when multiple contributors added translations to the last line of a language file. Because JSON doesn’t allow trailing commas, adding a new entry requires modifying the previous line to append a comma, which results in unnecessary diffs and occasional merge conflicts. For reference, this commit shows a case where there's an unnecessary diff.

To prevent that, some teams add a placeholder translation at the end of the file—something I adopted in this PR.

That said, if translations here are handled exclusively by automation, this PR might not be necessary. I’m happy to close both the PR and the issue if that’s the case. Thanks again for taking the time to review!

@lunika
Copy link
Member

lunika commented Apr 14, 2025

Hi,
Yes I can you can close it.
Thanks

@dakshesh14 dakshesh14 closed this Apr 14, 2025
@dakshesh14 dakshesh14 deleted the refactor/translation-placeholder branch April 14, 2025 07:48
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