Skip to content
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.

Sign up for GitHub

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

Jump to bottom

use correct l10n string (#31487) #31490

Merged
merged 4 commits into from
Jun 26, 2024
Merged

use correct l10n string (#31487) #31490

merged 4 commits into from
Jun 26, 2024

Conversation

GiteaBot
Copy link
Contributor

Backport #31487 by @CyberFlameGO

Uses the correct string for searching - this is what it looks like prior to the change:
image
(observe how the top box has "Search teams" even though collaborator would be user

@CyberFlameGO @GiteaBot
use correct l10n string (go-gitea#31487)
3f5369c 
Uses the correct string for searching - this is what it looks like prior
to the change:

![image](https://github.com/go-gitea/gitea/assets/24910512/38519825-c347-44d6-85d4-6fa3c71ddb7c)
(observe how the top box has "Search teams" even though collaborator
would be user
@GiteaBot GiteaBot added modifies/templates This PR modifies the template files type/bug lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jun 25, 2024
@GiteaBot GiteaBot added this to the 1.22.1 milestone Jun 25, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 25, 2024
@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 Jun 25, 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 Jun 26, 2024
@wxiaoguang wxiaoguang enabled auto-merge (squash) June 26, 2024 01:58
@6543 6543 added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 26, 2024
@wxiaoguang wxiaoguang disabled auto-merge June 26, 2024 03:01
@wxiaoguang wxiaoguang enabled auto-merge (squash) June 26, 2024 03:01
@silverwind
Copy link
Member

Vuln failure will be fixed with #31499.

@silverwind silverwind removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jun 26, 2024
@silverwind
Copy link
Member

#31499 needs to merge first.

@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 26, 2024
@wxiaoguang wxiaoguang merged commit 3cecfa3 into go-gitea:release/v1.22 Jun 26, 2024
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 26, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@lunny lunny lunny approved these changes

@delvh delvh Awaiting requested review from delvh

@wxiaoguang wxiaoguang Awaiting requested review from wxiaoguang

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/templates This PR modifies the template files size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.1
Development

Successfully merging this pull request may close these issues.
6 participants
@GiteaBot @silverwind @lunny @wxiaoguang @6543 @CyberFlameGO