foster/forgejo-docs
0
0
Fork 0
mirror of https://codeberg.org/forgejo/docs.git synced 2024-11-21 17:36:59 -05:00
Code Issues Activity

contributor: localization admin: clarify squash-merge, use bold text for button names (#873)

Browse source
This commit is contained in:
0ko 2024-09-27 12:38:42 +00:00
parent 577e8791c3
commit fe7d2b2459
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
docs/contributor/localization-admin.md
View file

@ -15,17 +15,22 @@ development branch as follows:
- announce in the chatroom: `@room the translations will be locked for maintenance in about 15 minutes. Make sure you don't try to save a translation when that happens as it will be lost.`
- go to the [Weblate repository admin page](https://translate.codeberg.org/projects/forgejo/forgejo/#repository)
- click `Commit`. This is done optionally to make tests run before interrupting anyone, to reduce the total maintenance time
- click **Commit**. This is done optionally to make tests run before interrupting anyone, to reduce the total maintenance time
- post a "Warning" [announcement in Weblate](https://translate.codeberg.org/projects/forgejo/forgejo/#announcement): `The translations will be locked for maintenance soon. Make sure you don't try to save a translation when that happens as it will be lost.`. Make sure to unckeck the notification option.
- wait 15 minutes
- click `Lock`
- click **Lock**
- reload the page
- check the number of commits
- verify there are 0 pending changes
- go to the pull request and wait until it is rebased and has the same number of commits
- squash-merge the pending `[I18N]` pull request ([similar to this example](https://codeberg.org/forgejo/forgejo/pulls/2317))
- click `Reset`
- click `Unlock`
- squash-merge the pending `[I18N]` pull request ([similar to this example](https://codeberg.org/forgejo/forgejo/pulls/2317)).
- on the pull request page, find the merge button
- use the button with an arrow to change it to **Create squash commit**
- click **Create squash commit**
- click **Clear merge message** button to remove noise from the commit message
- click **Create squash commit** again
- click **Reset**
- click **Unlock**
- remove Weblate announcement
## Merging a pull request that changes translations
@ -36,10 +41,15 @@ request](https://codeberg.org/forgejo/forgejo/pulls) modifies files in
authoritative, it must be merged after all pending changes in Weblate
are merged as explained above. Only the end of the sequence changes:
- squash merge the pending `[I18N]` pull request ([similar to this example](https://codeberg.org/forgejo/forgejo/pulls/2317))
- squash-merge the pending `[I18N]` pull request ([similar to this example](https://codeberg.org/forgejo/forgejo/pulls/2317)).
- on the pull request page, find the merge button
- use the button with an arrow to change it to **Create squash commit**
- click **Create squash commit**
- click **Clear merge message** button to remove noise from the commit message
- click **Create squash commit** again
- merge the PR (after resolving conflicts due to the merge of the Weblate changes)
- click `Reset`
- click `Unlock`
- click **Reset**
- click **Unlock**
## Resolving failures