Merge branch 'main' into patch-17

pull/32565/head
Kerwin Bryant 3 days ago committed by GitHub
commit dca4bb10e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 1
      options/locale/locale_en-US.ini
  2. 2
      templates/install.tmpl

@ -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. enable_update_checker_helper = Checks for new version releases periodically by connecting to gitea.io.
env_config_keys = Environment Configuration env_config_keys = Environment Configuration
env_config_keys_prompt = The following environment variables will also be applied to your configuration file: 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:
[home] [home]
nav_menu = Navigation Menu nav_menu = Navigation Menu

@ -338,7 +338,7 @@
<div class="inline field"> <div class="inline field">
<div class="right-content"> <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>
<div class="tw-mt-4 tw-mb-2 tw-text-center"> <div class="tw-mt-4 tw-mb-2 tw-text-center">
<button class="ui primary button">{{ctx.Locale.Tr "install.install_btn_confirm"}}</button> <button class="ui primary button">{{ctx.Locale.Tr "install.install_btn_confirm"}}</button>

Loading…
Cancel
Save