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

Fix more "locale" usages #27259

Merged
merged 1 commit into from
Sep 25, 2023
Merged

Fix more "locale" usages #27259

merged 1 commit into from
Sep 25, 2023

Conversation

wxiaoguang
Copy link
Contributor

There are still a lot.

@wxiaoguang wxiaoguang added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Sep 25, 2023
@wxiaoguang wxiaoguang added this to the 1.22.0 milestone Sep 25, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 25, 2023
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 25, 2023
@github-actions github-actions bot added the topic/ui Change the appearance of the Gitea UI label Sep 25, 2023
@wxiaoguang wxiaoguang added the backport/v1.21 This PR should be backported to Gitea 1.21 label Sep 25, 2023
@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 Sep 25, 2023
@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 Sep 25, 2023
@denyskon denyskon added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 25, 2023
@wxiaoguang wxiaoguang merged commit 93bd435 into go-gitea:main Sep 25, 2023
@GiteaBot
Copy link
Collaborator

I was unable to create a backport for 1.21. @wxiaoguang, please send one manually. 🍵

go run ./contrib/backport 27259
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Sep 25, 2023
@wxiaoguang wxiaoguang deleted the fix-ctx-locale branch September 25, 2023 12:43
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Sep 25, 2023
@wxiaoguang
Fix more "locale" usages (go-gitea#27259)
bd58762
@denyskon
Copy link
Member

@wxiaoguang (cc @delvh) I don't think we should backport these refactorings.....

@wxiaoguang wxiaoguang mentioned this pull request Sep 25, 2023
Merged
@wxiaoguang
Copy link
Contributor Author

-> Backport ctx locale refactoring manually #27260

@wxiaoguang
Copy link
Contributor Author

I don't think we should backport these refactorings.....

It should. Otherwise there will be a lot of conflicts for new PRs when backporting.

wxiaoguang added a commit that referenced this pull request Sep 25, 2023
@wxiaoguang @delvh
Backport ctx locale refactoring manually (#27231) (#27259) (#27260)
597b04f 
Backport #27231 #27259 manually

---------

Co-authored-by: delvh <dev.lh@web.de>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 26, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
5598c66 
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Another round of `db.DefaultContext` refactor (go-gitea#27103)
  Fix more "locale" usages (go-gitea#27259)
  Always use `ctx.Locale.Tr` inside templates (go-gitea#27231)
  Disable `Test Delivery` and `Replay` webhook buttons when webhook is inactive (go-gitea#27211)

# Conflicts:
#	templates/base/footer_content.tmpl
#	templates/repo/issue/view_content/context_menu.tmpl
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 24, 2023
@lunny lunny added the backport/done All backports for this PR have been created label Feb 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@denyskon denyskon denyskon approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. topic/ui Change the appearance of the Gitea UI type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
4 participants
@wxiaoguang @GiteaBot @denyskon @lunny