femsci/forgejo
femsci/forgejo
1
0
Fork 0
forked from NYANDEV/forgejo
Code Pull requests Activity

[BRANDING] Replace links to GitHub with Codeberg guides about adding SSH/GPG keys

Browse source 
(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 f9cb937256b711570a35f642d7237040b53ef754)
(cherry picked from commit 72dd0c3cf2eb4b0d24d45565ce09e029b6cb3b0a)
(cherry picked from commit 66bf26533d8c7777bc64461bf3103073c877055e)
(cherry picked from commit 37e1d03331)
(cherry picked from commit fb04781877)
(cherry picked from commit dfe491bf091b31de0e95fd9ece16c08e7d1bebfe)
(cherry picked from commit 2d40c7ad8578999d843613f4016de61afd03798e)
(cherry picked from commit d7ca25f53461f0ec58963e1a1ec1c567db0184a8)
(cherry picked from commit 723deea27c8d1c77a666bf3881659c982a217b01)
(cherry picked from commit 8320ea3e527edc5ca08df2631916f63caf0c37ad)
(cherry picked from commit 503c8ff3e24ff35e8893c0a242474095113ca28c)
(cherry picked from commit 73036c22d330b1fc6b0dc0f98c9166b5a4ca393f)
This commit is contained in:
Rodion Borisov 2023-07-25 02:55:51 +03:00 committed by Earl Warren
parent 61e80ffb1f
commit cf3bbc38b3
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
options/locale/locale_en-US.ini
View file

@ -739,8 +739,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 = <strong>Need help?</strong> Have a look at GitHub's guide to <a href="%s">create your own SSH keys</a> or solve <a href="%s">common problems</a> you may encounter using SSH.
gpg_helper = <strong>Need help?</strong> Have a look at GitHub's guide <a href="%s">about GPG</a>.
ssh_helper = <strong>Need help?</strong> Have a look at the guide to <a href="%s">create your own SSH keys</a> or solve <a href="%s">common problems</a> you may encounter using SSH.
gpg_helper = <strong>Need help?</strong> Have a look at the guide <a href="%s">about GPG</a>.
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'

2
templates/user/settings/keys_gpg.tmpl
View file

@ -43,7 +43,7 @@
<div class="flex-item">
<p>
{{ctx.Locale.Tr "settings.gpg_desc"}}<br>
{{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}}
</p>
</div>
{{range .GPGKeys}}

2
templates/user/settings/keys_ssh.tmpl
View file

@ -31,7 +31,7 @@
<div class="flex-item">
<p>
{{ctx.Locale.Tr "settings.ssh_desc"}}<br>
{{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}}
</p>
</div>
{{if .DisableSSH}}