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

Optimize installation-page experience #32558

Merged
merged 3 commits into from
Nov 20, 2024
Merged

Optimize installation-page experience #32558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9035ca5
Update install.tmpl
kerwin612 Nov 19, 2024
d8c913a
Merge branch 'main' into patch-15
kerwin612 Nov 20, 2024
3ec757c
add translation
kerwin612 Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

gitea/templates/install.tmpl

Lines 341 to 342 in cd598bf

{{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 •
edited
Loading

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)


[home]
nav_menu = Navigation Menu
Expand Down
2 changes: 1 addition & 1 deletion templates/install.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@

<div class="inline field">
<div class="right-content">
These configuration options will be written into: {{.CustomConfFile}}
{{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>
<div class="tw-mt-4 tw-mb-2 tw-text-center">
<button class="ui primary button">{{ctx.Locale.Tr "install.install_btn_confirm"}}</button>
Expand Down
Loading