diff --git a/docs/developer/index.md b/docs/developer/index.md index 62258dd3..6da343e9 100644 --- a/docs/developer/index.md +++ b/docs/developer/index.md @@ -21,6 +21,7 @@ their needs. - [next.forgejo.org](./next-forgejo-org/) - [Forgejo runner implementation notes](https://code.forgejo.org/forgejo/runner/#hacking) - [Localization](./localization/) + - [Localization admin duties](./localization-admin/) - For maintainers - [Hardware infrastructure](./infrastructure/) - [Release management](./release/) diff --git a/docs/developer/localization-admin.md b/docs/developer/localization-admin.md new file mode 100644 index 00000000..6d375108 --- /dev/null +++ b/docs/developer/localization-admin.md @@ -0,0 +1,23 @@ +--- +title: Localization admin duties +license: 'CC-BY-SA-4.0' +--- + +Localization team members with admin rights on both Forgejo and Weblate +are expected to make sure the translations land in the Forgejo +repository and resolve conflicts when they arise. + +## Merging translations in Forgejo + +Weblate is [configured to propose pull requests](https://translate.codeberg.org/settings/forgejo/forgejo/#vcs) +to the Forgejo repository with new translations. These pull requests should be **squash merged** into the Forgejo +development branch as follows: + +- go to the [weblate repository admin page](https://translate.codeberg.org/projects/forgejo/forgejo/#repository) +- click lock +- click commit +- click push +- squash merge the pending pull request ([similar to this example](https://codeberg.org/forgejo/forgejo/pulls/2317)) +- click reset +- click update (should not be necessary, but just in case) +- click unlock