diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index c7fc61be96..28fd71abe9 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2075,12 +2075,17 @@ settings.no_deploy_keys = There are no deploy keys yet. settings.secrets = Secrets settings.pull_request_read = Pull Request Read settings.pull_request_read_info = "If allow pull request read the secret, it's security related." +settings.pull_request_read_hint = Allow pull request read the secret settings.add_secret = Add Secret +settings.add_secret_success = The secret '%s' has been added. settings.secret_value_content_placeholder = Input any content settings.secret_desc = Secrets could be visited by repository events settings.secret_content = Value settings.secret_key = Key settings.no_secret = There are no secrets yet. +settings.secret_deletion = Remove secret +settings.secret_deletion_desc = Removing a secret will revoke its access to this repository. Continue? +settings.secret_deletion_success = The secret has been removed. settings.title = Title settings.deploy_key_content = Content settings.key_been_used = A deploy key with identical content is already in use. @@ -2399,6 +2404,7 @@ settings.update_setting_success = Organization settings have been updated. settings.change_orgname_prompt = Note: changing the organization name also changes the organization's URL. settings.change_orgname_redirect_prompt = The old name will redirect until it is claimed. settings.update_avatar_success = The organization's avatar has been updated. +settings.secrets = Secrets settings.delete = Delete Organization settings.delete_account = Delete This Organization settings.delete_prompt = The organization will be permanently removed. This CANNOT be undone! diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index fe4df094f4..7a86b52bcc 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -279,16 +279,16 @@ func SecretsPost(ctx *context.Context) { } log.Trace("Secret added: %d", ctx.Org.Organization.ID) - ctx.Flash.Success(ctx.Tr("repo.settings.add_key_success", form.Title)) + ctx.Flash.Success(ctx.Tr("repo.settings.add_secret_success", form.Title)) ctx.Redirect(ctx.Org.OrgLink + "/settings/secrets") } // SecretsDelete delete secrets func SecretsDelete(ctx *context.Context) { - if err := secret_service.DeleteSecretByID(ctx, ctx.ParamsInt64("id")); err != nil { + if err := secret_service.DeleteSecretByID(ctx, ctx.FormInt64("id")); err != nil { ctx.Flash.Error("DeleteSecretByID: " + err.Error()) } else { - ctx.Flash.Success(ctx.Tr("repo.settings.deploy_key_deletion_success")) + ctx.Flash.Success(ctx.Tr("repo.settings.secret_deletion_success")) } ctx.JSON(http.StatusOK, map[string]interface{}{ diff --git a/routers/web/repo/setting.go b/routers/web/repo/setting.go index 6836f8eed8..412b117b65 100644 --- a/routers/web/repo/setting.go +++ b/routers/web/repo/setting.go @@ -1133,7 +1133,7 @@ func SecretsPost(ctx *context.Context) { } log.Trace("Secret added: %d", ctx.Repo.Repository.ID) - ctx.Flash.Success(ctx.Tr("repo.settings.add_key_success", form.Title)) + ctx.Flash.Success(ctx.Tr("repo.settings.add_secret_success", form.Title)) ctx.Redirect(ctx.Repo.RepoLink + "/settings/keys") } @@ -1208,7 +1208,7 @@ func DeleteSecret(ctx *context.Context) { if err := secret_service.DeleteSecretByID(ctx, ctx.FormInt64("id")); err != nil { ctx.Flash.Error("DeleteSecretByID: " + err.Error()) } else { - ctx.Flash.Success(ctx.Tr("repo.settings.deploy_key_deletion_success")) + ctx.Flash.Success(ctx.Tr("repo.settings.secret_deletion_success")) } ctx.JSON(http.StatusOK, map[string]interface{}{ diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index 1d236a3d89..94a4bbbbea 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -26,7 +26,7 @@ {{.locale.Tr "repo.runners"}} - {{.locale.Tr "repo.secrets"}} + {{.locale.Tr "org.settings.secrets"}} {{.locale.Tr "org.settings.delete"}} diff --git a/templates/org/settings/secrets.tmpl b/templates/org/settings/secrets.tmpl index 9e8d9383fd..24605dfabc 100644 --- a/templates/org/settings/secrets.tmpl +++ b/templates/org/settings/secrets.tmpl @@ -25,7 +25,7 @@
- +
@@ -65,8 +65,8 @@ {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} - — {{svg "octicon-info"}} - - {{if .PullRequest}} {{$.locale.Tr "repo.settings.pull_request_read_info"}} {{end}} + {{if .PullRequest}} — {{svg "octicon-info"}} - + {{$.locale.Tr "repo.settings.pull_request_read_hint"}} {{end}}
@@ -85,10 +85,10 @@
{{svg "octicon-trash" 16 "mr-2"}} - delete + {{.locale.Tr "repo.settings.secret_deletion"}}
-

detail

+

{{.locale.Tr "repo.settings.secret_deletion_desc"}}

{{template "base/delete_modal_actions" .}}
diff --git a/templates/repo/settings/secrets.tmpl b/templates/repo/settings/secrets.tmpl index 888f8fb84e..1facd7ba0a 100644 --- a/templates/repo/settings/secrets.tmpl +++ b/templates/repo/settings/secrets.tmpl @@ -18,7 +18,7 @@
- +
@@ -55,7 +55,8 @@ {{Shadow .Data}}
- {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} — {{svg "octicon-info"}} - {{if .PullRequest}} {{$.locale.Tr "repo.settings.pull_request_read_info"}} {{end}} + {{$.locale.Tr "settings.add_on"}} {{.CreatedUnix.FormatShort}} + {{if .PullRequest}} — {{svg "octicon-info"}} - {{$.locale.Tr "repo.settings.pull_request_read_hint"}} {{end}}