diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 16836543d0..14cecd26ed 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -230,7 +230,7 @@ string.desc = Z - A [error] occurred = An error occurred -report_message = If you believe that this is a Forgejo bug, please search for issues on Codeberg or open a new issue if necessary. +report_message = If you believe that this is a Forgejo bug, please search for issues on Codeberg or open a new issue if necessary. invalid_csrf = Bad Request: invalid CSRF token not_found = The target couldn't be found. network_error = Network error @@ -239,13 +239,13 @@ server_internal = Internal server error [startpage] app_desc = A painless, self-hosted Git service install = Easy to install -install_desc = Simply run the binary for your platform, ship it with Docker, or get it packaged. +install_desc = Simply run the binary for your platform, ship it with Docker, or get it packaged. platform = Cross-platform platform_desc = Forgejo is confirmed to run on libre operating systems like Linux and FreeBSD, as well as different CPU architectures. Choose the one you love! lightweight = Lightweight lightweight_desc = Forgejo has low minimal requirements and can run on an inexpensive Raspberry Pi. Save your machine energy! license = Open Source -license_desc = Go get Forgejo! Join us by contributing to make this project even better. Don't be shy to be a contributor! +license_desc = Go get Forgejo! Join us by contributing to make this project even better. Don't be shy to be a contributor! [install] install = Installation @@ -468,7 +468,7 @@ authorize_application_description = If you grant the access, it will be able to authorize_title = Authorize "%s" to access your account? authorization_failed = Authorization failed authorization_failed_desc = The authorization failed because we detected an invalid request. Please contact the maintainer of the app you have tried to authorize. -password_pwned = The password you chose is on a list of stolen passwords previously exposed in public data breaches. Please try again with a different password and consider changing this password elsewhere too. +password_pwned = The password you chose is on a list of stolen passwords previously exposed in public data breaches. Please try again with a different password and consider changing this password elsewhere too. password_pwned_err = Could not complete request to HaveIBeenPwned last_admin = You cannot remove the last admin. There must be at least one admin. back_to_sign_in = Back to Sign in @@ -983,7 +983,7 @@ passcode_invalid = The passcode is incorrect. Try again. twofa_enrolled = Your account has been successfully enrolled. Store your single-use recovery key (%s) in a safe place, as it will not be shown again. twofa_failed_get_secret = Failed to get secret. -webauthn_desc = Security keys are hardware devices containing cryptographic keys. They can be used for two-factor authentication. Security keys must support the WebAuthn Authenticator standard. +webauthn_desc = Security keys are hardware devices containing cryptographic keys. They can be used for two-factor authentication. Security keys must support the WebAuthn Authenticator standard. webauthn_register_key = Add security key webauthn_nickname = Nickname webauthn_delete_key = Remove security key @@ -2409,7 +2409,7 @@ settings.event_pull_request_enforcement = Enforcement settings.event_package = Package settings.event_package_desc = Package created or deleted in a repository. settings.branch_filter = Branch filter -settings.branch_filter_desc = Branch whitelist for push, branch creation and branch deletion events, specified as glob pattern. If empty or *, events for all branches are reported. See github.com/gobwas/glob documentation for syntax. Examples: master, {master,release*}. +settings.branch_filter_desc = Branch whitelist for push, branch creation and branch deletion events, specified as glob pattern. If empty or *, events for all branches are reported. See %[2]s documentation for syntax. Examples: master, {master,release*}. settings.authorization_header = Authorization header settings.authorization_header_desc = Will be included as authorization header for requests when present. Examples: %s. settings.active = Active @@ -2504,12 +2504,12 @@ settings.ignore_stale_approvals_desc = Do not count approvals that were made on settings.require_signed_commits = Require signed commits settings.require_signed_commits_desc = Reject pushes to this branch if they are unsigned or unverifiable. settings.protect_branch_name_pattern = Protected branch name pattern -settings.protect_branch_name_pattern_desc = Protected branch name patterns. See the documentation for pattern syntax. Examples: main, release/** +settings.protect_branch_name_pattern_desc = Protected branch name patterns. See the documentation for pattern syntax. Examples: main, release/** settings.protect_patterns = Patterns settings.protect_protected_file_patterns = Protected file patterns (separated using semicolon ";") -settings.protect_protected_file_patterns_desc = Protected files are not allowed to be changed directly even if user has rights to add, edit, or delete files in this branch. Multiple patterns can be separated using semicolon (";"). See github.com/gobwas/glob documentation for pattern syntax. Examples: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns_desc = Protected files are not allowed to be changed directly even if user has rights to add, edit, or delete files in this branch. Multiple patterns can be separated using semicolon (";"). See %[2]s documentation for pattern syntax. Examples: .drone.yml, /docs/**/*.txt. settings.protect_unprotected_file_patterns = Unprotected file patterns (separated using semicolon ";") -settings.protect_unprotected_file_patterns_desc = Unprotected files that are allowed to be changed directly if user has write access, bypassing push restriction. Multiple patterns can be separated using semicolon (";"). See github.com/gobwas/glob documentation for pattern syntax. Examples: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns_desc = Unprotected files that are allowed to be changed directly if user has write access, bypassing push restriction. Multiple patterns can be separated using semicolon (";"). See %[2]s documentation for pattern syntax. Examples: .drone.yml, /docs/**/*.txt. settings.update_protect_branch_success = Branch protection for rule "%s" has been updated. settings.remove_protected_branch_success = Branch protection for rule "%s" has been removed. settings.remove_protected_branch_failed = Removing branch protection rule "%s" failed. @@ -2541,7 +2541,7 @@ settings.tags.protection.allowed.teams = Allowed teams settings.tags.protection.allowed.noone = No one settings.tags.protection.create = Add rule settings.tags.protection.none = There are no protected tags. -settings.tags.protection.pattern.description = You can use a single name or a glob pattern or regular expression to match multiple tags. Read more in the protected tags guide. +settings.tags.protection.pattern.description = You can use a single name or a glob pattern or regular expression to match multiple tags. Read more in the protected tags guide. settings.bot_token = Bot token settings.chat_id = Chat ID settings.thread_id = Thread ID @@ -2916,7 +2916,7 @@ last_page = Last total = Total: %d settings = Admin settings -dashboard.new_version_hint = Forgejo %s is now available, you are running %s. Check the blog for more details. +dashboard.new_version_hint = Forgejo %[1]s is now available, you are running %s. Check the blog for more details. dashboard.statistic = Summary dashboard.operations = Maintenance operations dashboard.system_status = System status @@ -3113,12 +3113,12 @@ packages.size = Size packages.published = Published defaulthooks = Default webhooks -defaulthooks.desc = Webhooks automatically make HTTP POST requests to a server when certain Forgejo events trigger. Webhooks defined here are defaults and will be copied into all new repositories. Read more in the webhooks guide. +defaulthooks.desc = Webhooks automatically make HTTP POST requests to a server when certain Forgejo events trigger. Webhooks defined here are defaults and will be copied into all new repositories. Read more in the webhooks guide. defaulthooks.add_webhook = Add Default Webhook defaulthooks.update_webhook = Update Default Webhook systemhooks = System webhooks -systemhooks.desc = Webhooks automatically make HTTP POST requests to a server when certain Forgejo events trigger. Webhooks defined here will act on all repositories on the system, so please consider any performance implications this may have. Read more in the webhooks guide. +systemhooks.desc = Webhooks automatically make HTTP POST requests to a server when certain Forgejo events trigger. Webhooks defined here will act on all repositories on the system, so please consider any performance implications this may have. Read more in the webhooks guide. systemhooks.add_webhook = Add System Webhook systemhooks.update_webhook = Update System Webhook @@ -3214,18 +3214,18 @@ auths.tips.gmail_settings = Gmail settings: auths.tips.oauth2.general = OAuth2 authentication auths.tips.oauth2.general.tip = When registering a new OAuth2 authentication, the callback/redirect URL should be: auths.tip.oauth2_provider = OAuth2 provider -auths.tip.bitbucket = Register a new OAuth consumer on https://bitbucket.org/account/user//oauth-consumers/new and add the permission "Account" - "Read" +auths.tip.bitbucket = Register a new OAuth consumer on %s and add the permission "Account" - "Read" auths.tip.nextcloud = Register a new OAuth consumer on your instance using the following menu "Settings -> Security -> OAuth 2.0 client" -auths.tip.dropbox = Create a new application at https://www.dropbox.com/developers/apps -auths.tip.facebook = Register a new application at https://developers.facebook.com/apps and add the product "Facebook Login" -auths.tip.github = Register a new OAuth application on https://github.com/settings/applications/new -auths.tip.gitlab_new = Register a new application on https://gitlab.com/-/profile/applications -auths.tip.google_plus = Obtain OAuth2 client credentials from the Google API console at https://console.developers.google.com/ +auths.tip.dropbox = Create a new application at %s +auths.tip.facebook = Register a new application at %s and add the product "Facebook Login" +auths.tip.github = Register a new OAuth application on %s +auths.tip.gitlab_new = Register a new application on %s +auths.tip.google_plus = Obtain OAuth2 client credentials from the Google API console at %s auths.tip.openid_connect = Use the OpenID Connect Discovery URL (/.well-known/openid-configuration) to specify the endpoints -auths.tip.twitter = Go to https://dev.twitter.com/apps, create an application and ensure that the “Allow this application to be used to Sign in with Twitter” option is enabled -auths.tip.discord = Register a new application on https://discordapp.com/developers/applications/me -auths.tip.gitea = Register a new OAuth2 application. Guide can be found at https://forgejo.org/docs/latest/user/oauth2-provider -auths.tip.yandex = Create a new application at https://oauth.yandex.com/client/new. Select following permissions from the "Yandex.Passport API" section: "Access to email address", "Access to user avatar" and "Access to username, first name and surname, gender" +auths.tip.twitter = Go to %s, create an application and ensure that the “Allow this application to be used to Sign in with Twitter” option is enabled +auths.tip.discord = Register a new application on %s +auths.tip.gitea = Register a new OAuth2 application. Guide can be found at %s +auths.tip.yandex = Create a new application at %s. Select following permissions from the "Yandex.Passport API" section: "Access to email address", "Access to user avatar" and "Access to username, first name and surname, gender" auths.tip.mastodon = Input a custom instance URL for the mastodon instance you want to authenticate with (or use the default one) auths.edit = Edit authentication source auths.activated = This authentication source is activated diff --git a/routers/web/admin/hooks.go b/routers/web/admin/hooks.go index c1f42c0061..cdca0a5c2d 100644 --- a/routers/web/admin/hooks.go +++ b/routers/web/admin/hooks.go @@ -34,7 +34,7 @@ func DefaultOrSystemWebhooks(ctx *context.Context) { } sys["Title"] = ctx.Tr("admin.systemhooks") - sys["Description"] = ctx.Tr("admin.systemhooks.desc") + sys["Description"] = ctx.Tr("admin.systemhooks.desc", "https://forgejo.org/docs/latest/user/webhooks/") sys["Webhooks"], err = webhook.GetSystemWebhooks(ctx, false) sys["BaseLink"] = setting.AppSubURL + "/admin/hooks" sys["BaseLinkNew"] = setting.AppSubURL + "/admin/system-hooks" @@ -45,7 +45,7 @@ func DefaultOrSystemWebhooks(ctx *context.Context) { } def["Title"] = ctx.Tr("admin.defaulthooks") - def["Description"] = ctx.Tr("admin.defaulthooks.desc") + def["Description"] = ctx.Tr("admin.defaulthooks.desc", "https://forgejo.org/docs/latest/user/webhooks/") def["Webhooks"], err = webhook.GetDefaultWebhooks(ctx) def["BaseLink"] = setting.AppSubURL + "/admin/hooks" def["BaseLinkNew"] = setting.AppSubURL + "/admin/default-hooks" diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index ddd7045eb7..25fef5fa2e 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -166,7 +166,7 @@ func NewUserPost(ctx *context.Context) { } if err := password.IsPwned(ctx, form.Password); err != nil { ctx.Data["Err_Password"] = true - errMsg := ctx.Tr("auth.password_pwned") + errMsg := ctx.Tr("auth.password_pwned", "https://haveibeenpwned.com/Passwords") if password.IsErrIsPwnedRequest(err) { log.Error(err.Error()) errMsg = ctx.Tr("auth.password_pwned_err") @@ -401,7 +401,7 @@ func EditUserPost(ctx *context.Context) { ctx.RenderWithErr(password.BuildComplexityError(ctx.Locale), tplUserEdit, &form) case errors.Is(err, password.ErrIsPwned): ctx.Data["Err_Password"] = true - ctx.RenderWithErr(ctx.Tr("auth.password_pwned"), tplUserEdit, &form) + ctx.RenderWithErr(ctx.Tr("auth.password_pwned", "https://haveibeenpwned.com/Passwords"), tplUserEdit, &form) case password.IsErrIsPwnedRequest(err): ctx.Data["Err_Password"] = true ctx.RenderWithErr(ctx.Tr("auth.password_pwned_err"), tplUserEdit, &form) diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index 3f1ed54bda..785b99173c 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -500,7 +500,7 @@ func SignUpPost(ctx *context.Context) { return } if err := password.IsPwned(ctx, form.Password); err != nil { - errMsg := ctx.Tr("auth.password_pwned") + errMsg := ctx.Tr("auth.password_pwned", "https://haveibeenpwned.com/Passwords") if password.IsErrIsPwnedRequest(err) { log.Error(err.Error()) errMsg = ctx.Tr("auth.password_pwned_err") diff --git a/routers/web/auth/password.go b/routers/web/auth/password.go index d15a8b814c..d25bd682e2 100644 --- a/routers/web/auth/password.go +++ b/routers/web/auth/password.go @@ -212,7 +212,7 @@ func ResetPasswdPost(ctx *context.Context) { case errors.Is(err, password.ErrComplexity): ctx.RenderWithErr(password.BuildComplexityError(ctx.Locale), tplResetPassword, nil) case errors.Is(err, password.ErrIsPwned): - ctx.RenderWithErr(ctx.Tr("auth.password_pwned"), tplResetPassword, nil) + ctx.RenderWithErr(ctx.Tr("auth.password_pwned", "https://haveibeenpwned.com/Passwords"), tplResetPassword, nil) case password.IsErrIsPwnedRequest(err): ctx.RenderWithErr(ctx.Tr("auth.password_pwned_err"), tplResetPassword, nil) default: @@ -295,7 +295,7 @@ func MustChangePasswordPost(ctx *context.Context) { ctx.RenderWithErr(password.BuildComplexityError(ctx.Locale), tplMustChangePassword, &form) case errors.Is(err, password.ErrIsPwned): ctx.Data["Err_Password"] = true - ctx.RenderWithErr(ctx.Tr("auth.password_pwned"), tplMustChangePassword, &form) + ctx.RenderWithErr(ctx.Tr("auth.password_pwned", "https://haveibeenpwned.com/Passwords"), tplMustChangePassword, &form) case password.IsErrIsPwnedRequest(err): ctx.Data["Err_Password"] = true ctx.RenderWithErr(ctx.Tr("auth.password_pwned_err"), tplMustChangePassword, &form) diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go index d2d2d5bc4c..3a2527cdc0 100644 --- a/routers/web/user/setting/account.go +++ b/routers/web/user/setting/account.go @@ -72,7 +72,7 @@ func AccountPost(ctx *context.Context) { case errors.Is(err, password.ErrComplexity): ctx.Flash.Error(password.BuildComplexityError(ctx.Locale)) case errors.Is(err, password.ErrIsPwned): - ctx.Flash.Error(ctx.Tr("auth.password_pwned")) + ctx.Flash.Error(ctx.Tr("auth.password_pwned", "https://haveibeenpwned.com/Passwords")) case password.IsErrIsPwnedRequest(err): ctx.Flash.Error(ctx.Tr("auth.password_pwned_err")) default: diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 0ba207215d..47fa82825c 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -91,29 +91,29 @@
{{ctx.Locale.Tr "admin.auths.tip.oauth2_provider"}}
  • Bitbucket
    • - {{ctx.Locale.Tr "admin.auths.tip.bitbucket"}} + {{ctx.Locale.Tr "admin.auths.tip.bitbucket" "https://bitbucket.org/account/user/{your-username}/oauth-consumers/new"}}
  • Dropbox
    • - {{ctx.Locale.Tr "admin.auths.tip.dropbox"}} + {{ctx.Locale.Tr "admin.auths.tip.dropbox" "https://www.dropbox.com/developers/apps"}}
  • Facebook
    • - {{ctx.Locale.Tr "admin.auths.tip.facebook"}} + {{ctx.Locale.Tr "admin.auths.tip.facebook" "https://developers.facebook.com/apps"}}
  • GitHub
    • - {{ctx.Locale.Tr "admin.auths.tip.github"}} + {{ctx.Locale.Tr "admin.auths.tip.github" "https://github.com/settings/applications/new"}}
  • GitLab
    • - {{ctx.Locale.Tr "admin.auths.tip.gitlab_new"}} + {{ctx.Locale.Tr "admin.auths.tip.gitlab_new" "https://gitlab.com/-/profile/applications"}}
  • Google
    • - {{ctx.Locale.Tr "admin.auths.tip.google_plus"}} + {{ctx.Locale.Tr "admin.auths.tip.google_plus" "https://console.developers.google.com/"}}
  • OpenID Connect
    • {{ctx.Locale.Tr "admin.auths.tip.openid_connect"}}
  • Twitter
    • - {{ctx.Locale.Tr "admin.auths.tip.twitter"}} + {{ctx.Locale.Tr "admin.auths.tip.twitter" "https://dev.twitter.com/apps"}}
  • Discord
    • - {{ctx.Locale.Tr "admin.auths.tip.discord"}} + {{ctx.Locale.Tr "admin.auths.tip.discord" "https://discordapp.com/developers/applications/me"}}
  • Gitea
    • - {{ctx.Locale.Tr "admin.auths.tip.gitea"}} + {{ctx.Locale.Tr "admin.auths.tip.gitea" "https://forgejo.org/docs/latest/user/oauth2-provider"}}
  • Nextcloud
    • {{ctx.Locale.Tr "admin.auths.tip.nextcloud"}}
  • Yandex
    • - {{ctx.Locale.Tr "admin.auths.tip.yandex"}} + {{ctx.Locale.Tr "admin.auths.tip.yandex" "https://oauth.yandex.com/client/new"}}
  • Mastodon
    • {{ctx.Locale.Tr "admin.auths.tip.mastodon"}}
    diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 9b89b8335f..b61de666b8 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -2,7 +2,7 @@
    {{if .NeedUpdate}}
    -

    {{ctx.Locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer}}

    +

    {{ctx.Locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer "https://forgejo.org/news"}}

    {{end}}

    diff --git a/templates/home.tmpl b/templates/home.tmpl index 23b1feae21..11e2ea06c3 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -17,7 +17,7 @@ {{svg "octicon-flame"}} {{ctx.Locale.Tr "startpage.install"}}

    - {{ctx.Locale.Tr "startpage.install_desc"}} + {{ctx.Locale.Tr "startpage.install_desc" "https://forgejo.org/download/#installation-from-binary" "https://forgejo.org/download/#container-image" "https://forgejo.org/download"}}

    @@ -25,7 +25,7 @@ {{svg "octicon-device-desktop"}} {{ctx.Locale.Tr "startpage.platform"}}

    - {{ctx.Locale.Tr "startpage.platform_desc"}} + {{ctx.Locale.Tr "startpage.platform_desc" "https://go.dev/"}}

    @@ -43,7 +43,7 @@ {{svg "octicon-code"}} {{ctx.Locale.Tr "startpage.license"}}

    - {{ctx.Locale.Tr "startpage.license_desc"}} + {{ctx.Locale.Tr "startpage.license_desc" "https://forgejo.org/download" "https://codeberg.org/forgejo/forgejo"}}

    diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index 3e0f626922..ce7016e3a3 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -14,15 +14,15 @@ {{ctx.Locale.Tr "repo.settings.protect_patterns"}} diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl index c9efb7b67e..e7a7aaa845 100644 --- a/templates/repo/settings/tags.tmpl +++ b/templates/repo/settings/tags.tmpl @@ -21,7 +21,7 @@
    -
    {{ctx.Locale.Tr "repo.settings.tags.protection.pattern.description"}}
    +
    {{ctx.Locale.Tr "repo.settings.tags.protection.pattern.description" "https://forgejo.org/docs/latest/user/protection/#protected-tags"}}
    diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl index e5fdaec0cf..59f7c25688 100644 --- a/templates/status/500.tmpl +++ b/templates/status/500.tmpl @@ -46,7 +46,7 @@ {{end}}
    {{if or .SignedUser.IsAdmin .ShowFooterVersion}}

    {{ctx.Locale.Tr "admin.config.app_ver"}}: {{AppVer}}

    {{end}} - {{if .SignedUser.IsAdmin}}

    {{ctx.Locale.Tr "error.report_message"}}

    {{end}} + {{if .SignedUser.IsAdmin}}

    {{ctx.Locale.Tr "error.report_message" "https://codeberg.org/forgejo/forgejo/issues"}}

    {{end}}
    diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl index 764844b23b..346f61c2ad 100644 --- a/templates/user/settings/security/webauthn.tmpl +++ b/templates/user/settings/security/webauthn.tmpl @@ -1,6 +1,6 @@

    {{ctx.Locale.Tr "settings.webauthn"}}

    -

    {{ctx.Locale.Tr "settings.webauthn_desc"}}

    +

    {{ctx.Locale.Tr "settings.webauthn_desc" "https://w3c.github.io/webauthn/#webauthn-authenticator"}}

    {{ctx.Locale.Tr "settings.webauthn_key_loss_warning"}} {{ctx.Locale.Tr "settings.webauthn_alternative_tip"}}

    {{template "user/auth/webauthn_error" .}}
    diff --git a/templates/webhook/shared-settings.tmpl b/templates/webhook/shared-settings.tmpl index be3a8755d4..b6c05b78ed 100644 --- a/templates/webhook/shared-settings.tmpl +++ b/templates/webhook/shared-settings.tmpl @@ -161,7 +161,7 @@
    - {{ctx.Locale.Tr "repo.settings.branch_filter_desc"}} + {{ctx.Locale.Tr "repo.settings.branch_filter_desc" "https://pkg.go.dev/github.com/gobwas/glob#Compile" "github.com/gobwas/glob"}}
    {{$skipAuthorizationHeader := or (eq .HookType "sourcehut_builds") (eq .HookType "matrix")}}