Skip to content

Commit 0550c54

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: [skip ci] Updated translations via Crowdin Configure update checker on installation page (go-gitea#21655)
2 parents 869a13d + 4827f42 commit 0550c54

File tree

5 files changed

+12
-1
lines changed

5 files changed

+12
-1
lines changed

options/locale/locale_en-US.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,8 @@ no_reply_address = Hidden Email Domain
238238
no_reply_address_helper = Domain name for users with a hidden email address. For example, the username 'joe' will be logged in Git as '[email protected]' if the hidden email domain is set to 'noreply.example.org'.
239239
password_algorithm = Password Hash Algorithm
240240
password_algorithm_helper = Set the password hashing algorithm. Algorithms have differing requirements and strength. `argon2` whilst having good characteristics uses a lot of memory and may be inappropriate for small systems.
241+
enable_update_checker = Enable Update Checker
242+
enable_update_checker_helper = Checks for new version releases periodically by connecting to gitea.io.
241243

242244
[home]
243245
uname_holder = Username or Email Address

options/locale/locale_zh-CN.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ SSPIDefaultLanguage=默认语言
451451

452452
require_error=不能为空。
453453
alpha_dash_error=应该只包含字母数字、破折号 ('-') 和下划线 ('_') 字符。
454-
alpha_dash_dot_error=' 应该只包含字母数字, 破折号 ('-'), 下划线 ('_') 和点 ('. ') 。
454+
alpha_dash_dot_error=` 应该只包含字母数字, 破折号 ('-'), 下划线 ('_') 和点 ('. ') 。`
455455
git_ref_name_error=` 必须是格式良好的 git 引用名称。`
456456
size_error=长度必须为 %s。
457457
min_size_error=长度最小为 %s 个字符。

routers/install/install.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,7 @@ func SubmitInstall(ctx *context.Context) {
457457
cfg.Section("service").Key("DEFAULT_ALLOW_CREATE_ORGANIZATION").SetValue(fmt.Sprint(form.DefaultAllowCreateOrganization))
458458
cfg.Section("service").Key("DEFAULT_ENABLE_TIMETRACKING").SetValue(fmt.Sprint(form.DefaultEnableTimetracking))
459459
cfg.Section("service").Key("NO_REPLY_ADDRESS").SetValue(fmt.Sprint(form.NoReplyAddress))
460+
cfg.Section("cron.update_checker").Key("ENABLED").SetValue(fmt.Sprint(form.EnableUpdateChecker))
460461

461462
cfg.Section("").Key("RUN_MODE").SetValue("prod")
462463

services/forms/user_form.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ type InstallForm struct {
6060
DefaultKeepEmailPrivate bool
6161
DefaultAllowCreateOrganization bool
6262
DefaultEnableTimetracking bool
63+
EnableUpdateChecker bool
6364
NoReplyAddress string
6465

6566
PasswordAlgorithm string

templates/install.tmpl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,13 @@
162162
<input id="log_root_path" name="log_root_path" value="{{.log_root_path}}" placeholder="log" required>
163163
<span class="help">{{.locale.Tr "install.log_root_path_helper"}}</span>
164164
</div>
165+
<div class="inline field">
166+
<label for="enable_update_checker">{{.locale.Tr "install.enable_update_checker"}}</label>
167+
<div class="ui checkbox">
168+
<input name="enable_update_checker" type="checkbox">
169+
</div>
170+
<span class="help">{{.locale.Tr "install.enable_update_checker_helper"}}</span>
171+
</div>
165172

166173

167174
<!-- Optional Settings -->

0 commit comments

Comments
 (0)