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

Add cancel button to wiki #28261

Closed
wants to merge 1 commit into from
Closed

Add cancel button to wiki #28261

wants to merge 1 commit into from

Conversation

earl-warren
Copy link
Contributor

(cherry picked from commit 9f8bf83b0e7845a44ca91bc8497356dbab059374)

@Gusted @earl-warren
Add cancel button to wiki
b91b928 
- Add a cancel button to the Edit and New wiki pages.
- Resolves https://codeberg.org/forgejo/forgejo/issues/705

(cherry picked from commit 9f8bf83b0e7845a44ca91bc8497356dbab059374)
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 28, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 28, 2023
delvh
delvh reviewed Nov 28, 2023
View reviewed changes
options/locale/locale_en-US.ini
@@ -1882,6 +1882,7 @@ wiki.page_title = Page title
wiki.page_content = Page content
wiki.default_commit_message = Write a note about this page update (optional).
wiki.save_page = Save Page
wiki.cancel = Cancel
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Occurrence number 12 of the regex = Cancel$ in this file 🎉
Jokes aside, should we perhaps use one common key for it instead of adding the same key every time?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely! That's the plan for the locale cleanup anyway

@lunny
Copy link
Member

lunny commented Nov 29, 2023

Fix #24036

@wxiaoguang
Copy link
Contributor

Although this PR is +2, 0, there are at least 3 problems:

  1. The "cancel" translation is just duplicated.
  2. The "cancel" button shouldn't use "negative(red)" color, I am sure you seldom see such "red" cancel button in Gitea.
  3. The button order should be "cancel" / "save", if you are familiar with Gitea UI, that's how almost all other buttons layout.

@denyskon
Copy link
Member

@earl-warren Please make the requested changes

@denyskon denyskon added the issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail label Jan 14, 2024
@wxiaoguang wxiaoguang mentioned this pull request Mar 5, 2024
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@denyskon denyskon denyskon left review comments

@delvh delvh delvh left review comments

Assignees
No one assigned
Labels
issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. modifies/translation size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@earl-warren @lunny @wxiaoguang @denyskon @delvh @GiteaBot @Gusted