-
-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Resolve duplicate local string key related to PR comments #32073
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
techknowlogick
merged 2 commits into
go-gitea:main
from
kemzeb:template-fix-locale-naming-conflict
Sep 18, 2024
Merged
Resolve duplicate local string key related to PR comments #32073
techknowlogick
merged 2 commits into
go-gitea:main
from
kemzeb:template-fix-locale-naming-conflict
Sep 18, 2024
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lunny
approved these changes
Sep 18, 2024
kemzeb
commented
Sep 18, 2024
@@ -247,7 +247,7 @@ func (r *Review) TooltipContent() string { | |||
} | |||
return "repo.issues.review.official" | |||
case ReviewTypeComment: | |||
return "repo.issues.review.comment" | |||
return "repo.issues.review.commented" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't want to change the older repo.issues.review.comment
as it has been there for a long time and it will affect users with custom templates. Open to other ways of handling this.
techknowlogick
approved these changes
Sep 18, 2024
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Sep 19, 2024
* giteaofficial/main: [skip ci] Updated translations via Crowdin Fix: database not update release when using `git push --tags --force` (go-gitea#32040) Resolve duplicate local string key related to PR comments (go-gitea#32073) Refactor CSRF protector (go-gitea#32057)
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
skip-changelog
This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A regression in #31924 caused there to be two
issues.review.comment
keys in the English language locale file, leading to a problem when reading PR review histories that contain comments.This snapshot addresses this by making the newer key unique.