From 32a4a7bb8d926daeae432648e2c3131794f8fbd7 Mon Sep 17 00:00:00 2001 From: Rodion Borisov Date: Tue, 25 Jul 2023 02:55:51 +0300 Subject: [PATCH] [BRANDING] Replace links to GitHub with Codeberg guides about adding SSH/GPG keys (cherry picked from commit f409deabe6e45d9300b6195ec37868cdf3e3c65f) (cherry picked from commit a62a3d0cf6b9a0bd119739c69086f25d61a66bd3) (cherry picked from commit a28d2ddd5e4a0bff6a911f5c2cf1c4dedbea1fff) (cherry picked from commit 2f8ac92a1772f388f2b491dab92c097e9271602c) (cherry picked from commit d43c158a2fc68864898b4a9622462a5becf734ff) (cherry picked from commit a2fc2dd1e28c9ec555b67c2f0271ab83749ef709) (cherry picked from commit 00e6fa60d788d84c9a30f0fb3ef9f2ef7fcc5d52) (cherry picked from commit 350f14bc8a1d88a2b0f9aaec6fbb36ac6fa908c4) Conflicts: templates/user/settings/keys_gpg.tmpl templates/user/settings/keys_ssh.tmpl https://codeberg.org/forgejo/forgejo/pulls/1420 (cherry picked from commit b325b2653faa5e7069b1bf611363e91a6c403390) (cherry picked from commit cb5f0513f27eb407818a20ce6d9689a535887fb9) (cherry picked from commit 4d0fd211e007a275a92836e76e34a2dff06d536e) (cherry picked from commit 91037812c363d8c698708ce896eeb7e2bf3ad11f) (cherry picked from commit 636c505ad462f3524d0abd6cbc544e993e9386c1) (cherry picked from commit 3a97587bd14f7b2fb05a62e85173644acbf54151) (cherry picked from commit 17cdb0ec236f9865cc110161dd2aefde6e0ac99b) --- options/locale/locale_en-US.ini | 4 ++-- templates/user/settings/keys_gpg.tmpl | 2 +- templates/user/settings/keys_ssh.tmpl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index eb145b871a..211dee221c 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -736,8 +736,8 @@ add_key = Add Key ssh_desc = These public SSH keys are associated with your account. The corresponding private keys allow full access to your repositories. principal_desc = These SSH certificate principals are associated with your account and allow full access to your repositories. gpg_desc = These public GPG keys are associated with your account. Keep your private keys safe as they allow commits to be verified. -ssh_helper = Need help? Have a look at GitHub's guide to create your own SSH keys or solve common problems you may encounter using SSH. -gpg_helper = Need help? Have a look at GitHub's guide about GPG. +ssh_helper = Need help? Have a look at the guide to create your own SSH keys or solve common problems you may encounter using SSH. +gpg_helper = Need help? Have a look at the guide about GPG. add_new_key = Add SSH Key add_new_gpg_key = Add GPG Key key_content_ssh_placeholder = Begins with 'ssh-ed25519', 'ssh-rsa', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', 'ecdsa-sha2-nistp521', 'sk-ecdsa-sha2-nistp256@openssh.com', or 'sk-ssh-ed25519@openssh.com' diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index bd560fa325..be3089ba52 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -43,7 +43,7 @@

{{ctx.Locale.Tr "settings.gpg_desc"}}
- {{ctx.Locale.Tr "settings.gpg_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/about-commit-signature-verification#gpg-commit-signature-verification" | Str2html}} + {{ctx.Locale.Tr "settings.gpg_helper" "https://docs.codeberg.org/security/gpg-key/" | Str2html}}

{{range .GPGKeys}} diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index f4aa7ef968..7b8c97f7b1 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -31,7 +31,7 @@

{{ctx.Locale.Tr "settings.ssh_desc"}}
- {{ctx.Locale.Tr "settings.ssh_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/connecting-to-github-with-ssh" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/troubleshooting-ssh" | Str2html}} + {{ctx.Locale.Tr "settings.ssh_helper" "https://docs.codeberg.org/security/ssh-key/" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/troubleshooting-ssh" | Str2html}}

{{if .DisableSSH}}