Merge branch 'main' into lunny/split_migrations

go-gitea · Nov 2, 2022 · 5b7c76c · 5b7c76c
2 parents 4c3e1dd + 4827f42
commit 5b7c76c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -238,6 +238,8 @@ no_reply_address = Hidden Email Domain
 no_reply_address_helper = Domain name for users with a hidden email address. For example, the username 'joe' will be logged in Git as 'joe@noreply.example.org' if the hidden email domain is set to 'noreply.example.org'.
 password_algorithm = Password Hash Algorithm
 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.
+enable_update_checker = Enable Update Checker
+enable_update_checker_helper = Checks for new version releases periodically by connecting to gitea.io.
 
 [home]
 uname_holder = Username or Email Address

diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
@@ -451,7 +451,7 @@ SSPIDefaultLanguage=默认语言
 
 require_error=不能为空。
 alpha_dash_error=应该只包含字母数字、破折号 ('-') 和下划线 ('_') 字符。
-alpha_dash_dot_error=' 应该只包含字母数字, 破折号 ('-'), 下划线 ('_') 和点 ('. ') 。
+alpha_dash_dot_error=` 应该只包含字母数字, 破折号 ('-'), 下划线 ('_') 和点 ('. ') 。`
 git_ref_name_error=` 必须是格式良好的 git 引用名称。`
 size_error=长度必须为 %s。
 min_size_error=长度最小为 %s 个字符。

diff --git a/routers/install/install.go b/routers/install/install.go
@@ -457,6 +457,7 @@ func SubmitInstall(ctx *context.Context) {
 	cfg.Section("service").Key("DEFAULT_ALLOW_CREATE_ORGANIZATION").SetValue(fmt.Sprint(form.DefaultAllowCreateOrganization))
 	cfg.Section("service").Key("DEFAULT_ENABLE_TIMETRACKING").SetValue(fmt.Sprint(form.DefaultEnableTimetracking))
 	cfg.Section("service").Key("NO_REPLY_ADDRESS").SetValue(fmt.Sprint(form.NoReplyAddress))
+	cfg.Section("cron.update_checker").Key("ENABLED").SetValue(fmt.Sprint(form.EnableUpdateChecker))
 
 	cfg.Section("").Key("RUN_MODE").SetValue("prod")
 

diff --git a/services/forms/user_form.go b/services/forms/user_form.go
@@ -60,6 +60,7 @@ type InstallForm struct {
 	DefaultKeepEmailPrivate        bool
 	DefaultAllowCreateOrganization bool
 	DefaultEnableTimetracking      bool
+	EnableUpdateChecker            bool
 	NoReplyAddress                 string
 
 	PasswordAlgorithm string

diff --git a/templates/install.tmpl b/templates/install.tmpl
@@ -162,6 +162,13 @@
 						<input id="log_root_path" name="log_root_path" value="{{.log_root_path}}" placeholder="log" required>
 						<span class="help">{{.locale.Tr "install.log_root_path_helper"}}</span>
 					</div>
+					<div class="inline field">
+						<label for="enable_update_checker">{{.locale.Tr "install.enable_update_checker"}}</label>
+						<div class="ui checkbox">
+							<input name="enable_update_checker" type="checkbox">
+						</div>
+						<span class="help">{{.locale.Tr "install.enable_update_checker_helper"}}</span>
+					</div>
 
 
 					<!-- Optional Settings -->