From 3e24a05e667912748731de4365cc52eb9c9018e0 Mon Sep 17 00:00:00 2001
From: Manas Jayaswal <101850957+mjmanas54@users.noreply.github.com>
Date: Thu, 9 Mar 2023 08:18:37 +0530
Subject: [PATCH] settings: Improve wording of "Show API key" modal.

This commit changes the "Show API key" modal to use a more intuitive
description of the user's password field, and also to put the reset password
option, which should be the less common case, at the end.

Fixes: #24506.
---
 api_docs/api-keys.md                     |  4 ++--
 web/templates/settings/api_key_modal.hbs | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/api_docs/api-keys.md b/api_docs/api-keys.md
index 2f986931ab..2c6dc2b1de 100644
--- a/api_docs/api-keys.md
+++ b/api_docs/api-keys.md
@@ -19,8 +19,8 @@ Anyone with your API key can impersonate you, so be doubly careful with it.
 
 1. Under **API key**, click **Show/change your API key**.
 
-1. Enter your password, and click **Get API key**. If you never had a
-   password, click **Never had one? Forgotten it?** and follow the
+1. Enter your password, and click **Get API key**. If you don't know your
+   password, click **reset it** and follow the
    instructions from there.
 
 1. Copy your API key.
diff --git a/web/templates/settings/api_key_modal.hbs b/web/templates/settings/api_key_modal.hbs
index fd558c78cd..53ba4f686a 100644
--- a/web/templates/settings/api_key_modal.hbs
+++ b/web/templates/settings/api_key_modal.hbs
@@ -11,16 +11,17 @@
                 <div id="password_confirmation">
                     <span class="alert-notification" id="api_key_status"></span>
                     <div id="api_key_form">
-                        <p>{{t "Please re-enter your password to confirm your identity." }}
-                            <a href="/accounts/password/reset/" target="_blank" rel="noopener noreferrer">
-                                {{t "Never had one? Forgotten it?" }}
-                            </a>
-                        </p>
+                        <p>{{t "Please re-enter your password to confirm your identity." }}</p>
                         <div class="password-div">
-                            <label for="password">{{t "Current password" }}</label>
+                            <label for="password">{{t "Your password" }}</label>
                             <input type="password" autocomplete="off" name="password" id="get_api_key_password" value="" />
                             <i class="fa fa-eye-slash password_visibility_toggle tippy-zulip-tooltip" role="button"></i>
                         </div>
+                        <p class="small">
+                            {{#tr}}If you don't know your password, you can <z-link>reset it</z-link>.
+                                {{#*inline "z-link"}}<a href="/accounts/password/reset/" target="_blank" rel="noopener noreferrer">{{> @partial-block}}</a>{{/inline}}
+                            {{/tr}}
+                        </p>
                     </div>
                 </div>
                 <div id="show_api_key">