forgejo/options
Giteabot ee87a652e9
Editor error message misleading due to re-used key. (#29859) (#29876)
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.

Co-authored-by: buckybytes <158571971+buckybytes@users.noreply.github.com>
(cherry picked from commit 00ea9af8e118790a186b4cf78a0ce85ce986bf1d)
2024-03-21 17:09:50 +01:00
..
gitignore [skip ci] Updated licenses and gitignores 2022-12-25 00:19:36 +00:00
label Add loading yaml label template files (#22976) 2023-03-02 01:44:23 +02:00
license [skip ci] Updated licenses and gitignores 2023-09-18 00:23:39 +00:00
locale [GITEA] Detect file rename and show in history 2023-11-13 14:06:30 +01:00
locales Editor error message misleading due to re-used key. (#29859) (#29876) 2024-03-21 17:09:50 +01:00
readme