Skip to content

Commit

Permalink
Document dict merge conflict resolution tool
Browse files Browse the repository at this point in the history
  • Loading branch information
seancolsen committed Jan 6, 2025
1 parent 4558930 commit b071280
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions DEVELOPER_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,11 @@ Django uses gettext, which require the `.po` files to be compiled into a more ef
- To handle pluralization and other complexities, the source translation strings may utilize a special syntax called [JSON with ICU Plurals](https://help.transifex.com/en/articles/6220806-json-with-icu-plurals) (a subset of the [ICU format](https://unicode-org.github.io/icu/userguide/icu/i18n.html)).
- After making changes to your code, ensure that the source `/en/dict.json` file contains new translation strings, if any.
- Do not update other translation files. They will be pulled from our translation service provider when the translation process is complete.
- If you encounter merge conflicts in `en/dict.json`, run this script to automatically resolve them:
```
python3 mathesar_ui/src/i18n/scripts/resolve_dict_merge_conflicts.py
```
## Translation process
Expand Down

0 comments on commit b071280

Please sign in to comment.