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.

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

Optimize installation-page experience #32558

Merged
merged 3 commits into from
Nov 20, 2024
Merged

Optimize installation-page experience #32558

merged 3 commits into from
Nov 20, 2024

Conversation

kerwin612
Copy link
Member

3000-gogitea-gitea-kiagpwhqbx1 ws-us116 gitpod io_ (1)
Highlight the path of the configuration file with a label-style emphasis and provide a quick copy button.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 19, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 19, 2024
@github-actions github-actions bot added the modifies/templates This PR modifies the template files label Nov 19, 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 Nov 19, 2024
templates/install.tmpl Outdated Show resolved Hide resolved
@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 Nov 19, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 20, 2024
@lunny lunny enabled auto-merge (squash) November 20, 2024 00:25
@lunny lunny merged commit 69268ee into go-gitea:main Nov 20, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.24.0 milestone Nov 20, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 20, 2024
@lunny lunny modified the milestones: 1.24.0, 1.23.0 Nov 20, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Nov 20, 2024
* giteaofficial/main:
  Remove duplicate empty repo check in delete branch API (go-gitea#32569)
  Optimize installation-page experience (go-gitea#32558)
  Remove unnecessary code (go-gitea#32560)
  Fix a compilation error in the Gitpod environment (go-gitea#32559)
  Use user.FullName in Oauth2 id_token response (go-gitea#32542)
  Fix some places which doesn't repsect org full name setting (go-gitea#32243)
  Refactor push mirror find and add check for updating push mirror (go-gitea#32539)
  Refactor markup render system (go-gitea#32533)
  Refactor find forks and fix possible bugs that weak permissions check (go-gitea#32528)
  Use better name for userinfo structure (go-gitea#32544)
@@ -352,6 +352,7 @@ enable_update_checker = Enable Update Checker
enable_update_checker_helper = Checks for new version releases periodically by connecting to gitea.io.
env_config_keys = Environment Configuration
env_config_keys_prompt = The following environment variables will also be applied to your configuration file:
config_write_file_prompt = These configuration options will be written into:
Copy link
Contributor

Choose a reason for hiding this comment

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

To make it translatable ,it should be These .. into: %s

Copy link
Member Author

Choose a reason for hiding this comment

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

{{ctx.Locale.Tr "install.config_write_file_prompt"}} <span class="ui label">{{.CustomConfFile}}</span> <button class="btn interact-fg" data-clipboard-text="{{.CustomConfFile}}">{{svg "octicon-copy" 14}}</button>
</div>

I'm not sure if I understand correctly; The file path has already been changed into an element node, so it's not suitable to be passed as a placeholder to config_write_file_prompt, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

{{$html := HTMLFormat `<label>%s</label>` .CustomConfFile}}
{{ctx.Locale.Tr `tip` $html}}

Copy link
Member Author

@kerwin612 kerwin612 Nov 21, 2024

Choose a reason for hiding this comment

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

I understand the necessity of doing it this way now. I'll make the changes right away. Thank you for your reminder.

Copy link
Contributor

Choose a reason for hiding this comment

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

If you were doing i18n, then it needs to make it translatable for all languages, many languages do not use "A: b" syntax.

Otherwise, keep it in English if it doesn't matter (that's why I didn't translate it)

kerwin612 added a commit to kerwin612/gitea that referenced this pull request Nov 21, 2024
lunny pushed a commit that referenced this pull request Nov 21, 2024
Thank you for @wxiaoguang's reminders and suggestions:
#32558 (comment)
zjjhot added a commit to zjjhot/gitea that referenced this pull request Nov 22, 2024
* giteaofficial/main:
  Add line-through for deleted branch on pull request view page (go-gitea#32500)
  Fix issue sidebar regression (go-gitea#32598)
  Fix PR diff review form submit (go-gitea#32596)
  Fix some typescript issues (go-gitea#32586)
  Fix GetInactiveUsers (go-gitea#32540)
  disable gravatar in test (go-gitea#32529)
  Add 'Copy path' button to file view (go-gitea#32584)
  Improve issue sidebar UI (go-gitea#32587)
  Supplement and Improvement for go-gitea#32558 (go-gitea#32585)
  make search box in issue sidebar dropdown list always show when scrolling (go-gitea#32576)
  Fix submodule parsing (go-gitea#32571)
  allow the actions user to login via the jwt token (go-gitea#32527)
  Support HTTP POST requests to `/userinfo`, aligning to OpenID Core specification (go-gitea#32578)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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 modifies/translation size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants