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

Fixed incorrect locale references #26218

Merged
merged 2 commits into from
Jul 29, 2023
Merged

Fixed incorrect locale references #26218

merged 2 commits into from
Jul 29, 2023

Conversation

kerwin612
Copy link
Member

Fixed two incorrect headers for setting the page navigation bar:

  • User settings page, should not use the title "org.settings"
  • Repo settings page, should not use the title "org.settings"

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 29, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 29, 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 Jul 29, 2023
@delvh delvh added type/bug topic/ui Change the appearance of the Gitea UI labels Jul 29, 2023
@puni9869
Copy link
Member

Any screenshots?

@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 Jul 29, 2023
@lunny
Copy link
Member

lunny commented Jul 29, 2023

Could you post screenshots before and after?

@kerwin612
Copy link
Member Author

before：
4UJL8P76PWV53Q0}~CJ81
}_KJ55V%@$A_WI(S@MX0UC5

after：
HLSM%4CK43~6$I@ZWRM1GO8
8IL~ 23DUDEG)P5JLPA%V6D

@lunny
Copy link
Member

lunny commented Jul 29, 2023

Should this be backport to v1.20?

@lunny lunny added the backport/v1.20 This PR should be backported to Gitea 1.20 label Jul 29, 2023
@lunny lunny added this to the 1.21.0 milestone Jul 29, 2023
@lunny lunny added skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jul 29, 2023
@lunny lunny merged commit 05d0b7c into go-gitea:main Jul 29, 2023
23 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 29, 2023
@kerwin612 kerwin612 deleted the patch-1 branch July 29, 2023 13:55
@GiteaBot GiteaBot mentioned this pull request Jul 29, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Jul 29, 2023
@kerwin612 @GiteaBot
Fixed incorrect locale references (go-gitea#26218)
359a9a6 
Fixed two incorrect headers for setting the page navigation bar:
* User settings page, should not use the title "`org.settings`"
* Repo settings page, should not use the title "`org.settings`"
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Jul 29, 2023
@puni9869
Copy link
Member

Should this be backport to v1.20?

Yes, we need this one to be backported.

silverwind pushed a commit that referenced this pull request Jul 29, 2023
@GiteaBot @kerwin612
Fixed incorrect locale references (#26218) (#26222)
2122743 
Backport #26218 by @kerwin612

Fixed two incorrect headers for setting the page navigation bar:
* User settings page, should not use the title "`org.settings`"
* Repo settings page, should not use the title "`org.settings`"

Co-authored-by: Kerwin Bryant <[email protected]>
silverwind added a commit to silverwind/gitea that referenced this pull request Jul 30, 2023
@silverwind
Merge remote-tracking branch 'origin/main' into uprof
6196e19 
* origin/main: (43 commits)
  Add `/public/assets` to `.ignore` (go-gitea#26232)
  Fix attachment clipboard copy on insecure origin (go-gitea#26224)
  Fix commit compare style (go-gitea#26209)
  Fix unable to display individual-level project (go-gitea#26198)
  Fix access check for org-level project (go-gitea#26182)
  Fixed incorrect locale references (go-gitea#26218)
  Use calendar icon for `Joined on...` in profiles (go-gitea#26215)
  Add changelog for 1.20.2 (go-gitea#26208)
  Add commits dropdown in PR files view and allow commit by commit review (go-gitea#25528)
  Warn instead of reporting an error when a webhook cannot be found (go-gitea#26039)
  Fixing the align of commit stats in commit_page template. (go-gitea#26161)
  Fix allowed user types setting problem (go-gitea#26200)
  Hide branch/tag icon if branches/tags are empty (go-gitea#26204)
  Prevent primary key update on migration (go-gitea#26192)
  improve unit test for caching (go-gitea#26185)
  Render plaintext task list items for markdown files (go-gitea#26186)
  Add tooltip to describe LFS table column and color `delete LFS file` button red (go-gitea#26181)
  Show branches and tags that contain a commit (go-gitea#25180)
  Release attachments duplicated check (go-gitea#26176)
  Calculate MAX_WORKERS default value by CPU number (go-gitea#26177)
  ...
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 31, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
baea445 
* upstream/main: (26 commits)
  Add 'Show on a map' button to Location in profile, fix layout (go-gitea#26214)
  Use shared template for webhook icons (go-gitea#26242)
  Reduce margins on user settings page, introduce `flex-container` (go-gitea#26046)
  Refactor and enhance issue indexer to support both searching, filtering and paging (go-gitea#26012)
  Show image size on view page (go-gitea#25884)
  Fix pull request check list is limited (go-gitea#26179)
  Fix API leaking Usermail if not logged in (go-gitea#25097)
  [skip ci] Updated licenses and gitignores
  Fix typo in metadata (go-gitea#26207)
  Update js and py dependencies (go-gitea#26243)
  De-emphasize issue sidebar buttons (go-gitea#26171)
  Don't autosize textarea in diff view (go-gitea#26233)
  Add `/public/assets` to `.ignore` (go-gitea#26232)
  Fix attachment clipboard copy on insecure origin (go-gitea#26224)
  Fix commit compare style (go-gitea#26209)
  Fix unable to display individual-level project (go-gitea#26198)
  Fix access check for org-level project (go-gitea#26182)
  Fixed incorrect locale references (go-gitea#26218)
  Use calendar icon for `Joined on...` in profiles (go-gitea#26215)
  Add changelog for 1.20.2 (go-gitea#26208)
  ...
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Oct 28, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@delvh delvh delvh approved these changes

@puni9869 puni9869 puni9869 approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.20 This PR should be backported to Gitea 1.20 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.
5 participants
@kerwin612 @puni9869 @lunny @delvh @GiteaBot