Skip to content

Conversation

@GiteaBot
Copy link
Collaborator

Backport #29859 by @buckybytes

The error message:

editor.file_changed_while_editing = The file contents have changed since you started editing. <a target="_blank" rel="noopener noreferrer" href="%s">Click here</a> to see them or <strong>Commit Changes again</strong> to overwrite them.

Is re-used in inappropriate contexts. The link in the key goes to a 404 when the key is used in a situation where the file contents have not changed.

Added two new keys to differentiate commit id mismatch and push out of date conditions.

The error message:

`editor.file_changed_while_editing = The file contents have changed
since you started editing. <a target="_blank" rel="noopener noreferrer"
href="%s">Click here</a> to see them or <strong>Commit Changes
again</strong> to overwrite them.`

Is re-used in inappropriate contexts. The link in the key goes to a 404
when the key is used in a situation where the file contents have not
changed.

Added two new keys to differentiate commit id mismatch and push out of
date conditions.
@GiteaBot GiteaBot added modifies/go Pull requests that update Go code modifies/translation labels Mar 18, 2024
@GiteaBot GiteaBot added this to the 1.21.9 milestone Mar 18, 2024
@GiteaBot GiteaBot requested a review from lunny March 18, 2024 02:23
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 18, 2024
@GiteaBot GiteaBot requested a review from silverwind March 18, 2024 02:23
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Mar 18, 2024
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 18, 2024
@lunny lunny merged commit 00ea9af into go-gitea:release/v1.21 Mar 18, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code modifies/translation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants