From fff0204cab4df3b36ed746536a1601d79a5a27a1 Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Thu, 20 Aug 2020 22:51:34 +0700 Subject: [PATCH] Add placeholder text for "Add SSH/GPG Key" forms (#12533) * Add placeholder text for "Add SSH/GPG Key" forms This commit add placeholder text for both Add SSH key and Add GPG key forms. * Localize placeholders Changes requested by @zeripath Co-authored-by: techknowlogick --- options/locale/locale_en-US.ini | 2 ++ templates/user/settings/keys_gpg.tmpl | 2 +- templates/user/settings/keys_ssh.tmpl | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 1cd94a46878..c31d77e1a58 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -500,6 +500,8 @@ ssh_helper = Need help? Have a look at GitHub's guide to Need help? Have a look at GitHub's 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', or 'ecdsa-sha2-nistp521' +key_content_gpg_placeholder = Begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----' ssh_key_been_used = This SSH key has already been added to the server. ssh_key_name_used = An SSH key with same name is already added to your account. gpg_key_id_used = A public GPG key with same ID already exists. diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index f86b44bef04..332f864dcfa 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -47,7 +47,7 @@
- +