flancian/docs.coopcloud.tech
0
0
Fork 0
forked from toolshed/docs.coopcloud.tech
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docs: i18n merge conflict resolutions

Browse Source
This commit is contained in:
decentral1se
2025-08-30 11:56:06 +02:00
parent df617f4951
commit 09b90a7b8e
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs/abra/hack.md
View File

@ -220,7 +220,7 @@ bats -Tp tests/integration --filter-status failed # re-run only failed
If you're running into issues and want to debug stuff, you can pass `-x` to `bats` to trace all commands run in the test. You can add `echo '...' >&3` debug statements to your test to output stuff also. If you're running into issues and want to debug stuff, you can pass `-x` to `bats` to trace all commands run in the test. You can add `echo '...' >&3` debug statements to your test to output stuff also.
## Internationalisation ## Internationalisation (`i18n`)
`abra` can be translated into other languages. We use a combination of [`gettext`](https://www.gnu.org/software/gettext/), [`weblate`](https://translate.coopcloud.tech) and some [intermediate automation](https://git.coopcloud.tech/toolshed/abra/src/commit/20909695e0e05c6251029dba270b3d4741aeb7a8/.drone.yml#L10-L29) to help developers and translators work together conveniently. `abra` can be translated into other languages. We use a combination of [`gettext`](https://www.gnu.org/software/gettext/), [`weblate`](https://translate.coopcloud.tech) and some [intermediate automation](https://git.coopcloud.tech/toolshed/abra/src/commit/20909695e0e05c6251029dba270b3d4741aeb7a8/.drone.yml#L10-L29) to help developers and translators work together conveniently.
@ -249,6 +249,16 @@ make i18n
Commit the changes. Ignore `*.mo` changes if they only update the generation timestamp. Commit the changes. Ignore `*.mo` changes if they only update the generation timestamp.
#### Resolving a merge conflict
```
git remote add weblate https://translate.coopcloud.tech/git/co-op-cloud/abra/
git remote update weblate
git merge weblate/main
```
Once you've resolved the conflict and pushed it, you'll need admin permissions on the Weblate repository to unlock it.
### Translator workflow ### Translator workflow
You can translate strings on [Weblate (`translate.coopcloud.tech`)](https://translate.coopcloud.tech). You can translate strings on [Weblate (`translate.coopcloud.tech`)](https://translate.coopcloud.tech).