From 95ebbb93604f48c103fe7331b635c0bcbb2a997d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Fri, 14 Feb 2020 22:11:27 +0100
Subject: [PATCH] Update hint texts of all entries

The design team discussed the ellipses at the end of the hint text of
our entries and, even though they are present in most mockups, it turned
out they don't like them, so remove them.

It also turned out they don't like the prefixes like "Enter" before it,
so remove those, too.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/977
---
 js/gdm/loginDialog.js           | 2 +-
 js/ui/components/polkitAgent.js | 8 ++++----
 js/ui/overview.js               | 2 +-
 js/ui/shellMountOperation.js    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index c7bb7b06e..92cb256ef 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -914,7 +914,7 @@ var LoginDialog = GObject.registerClass({
 
     _askForUsernameAndBeginVerification() {
         this._authPrompt.setUser(null);
-        this._authPrompt.setQuestion(_('Username…'));
+        this._authPrompt.setQuestion(_('Username'));
 
         this._showRealmLoginHint(this._realmManager.loginFormat);
 
diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js
index 4228cac4b..7fdfd1006 100644
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -271,12 +271,12 @@ var AuthenticationDialog = GObject.registerClass({
         }
 
         // Hack: The request string comes directly from PAM, if it's "Password:"
-        // we replace it with our own, if it's something else we replace the
-        // last colon and any trailing spaces with a "…".
+        // we replace it with our own to allow localization, if it's something
+        // else we remove the last colon and any trailing or leading spaces.
         if (request === 'Password:' || request === 'Password: ')
-            this._passwordEntry.hint_text = _('Enter Password…');
+            this._passwordEntry.hint_text = _('Password');
         else
-            this._passwordEntry.hint_text = request.replace(/: *$/, '…');
+            this._passwordEntry.hint_text = request.replace(/: *$/, '').trim();
 
         this._passwordEntry.password_visible = echoOn;
 
diff --git a/js/ui/overview.js b/js/ui/overview.js
index 10703e300..62a3c0917 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -104,7 +104,7 @@ class OverviewActor extends St.BoxLayout {
                in the search entry when no search is
                active; it should not exceed ~30
                characters. */
-            hint_text: _("Type to search…"),
+            hint_text: _('Type to search'),
             track_hover: true,
             can_focus: true,
         });
diff --git a/js/ui/shellMountOperation.js b/js/ui/shellMountOperation.js
index c6e6def8c..702f2c2b6 100644
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -303,7 +303,7 @@ var ShellMountPasswordDialog = GObject.registerClass({
 
             this._pimEntry = new St.PasswordEntry({
                 style_class: 'prompt-dialog-password-entry',
-                hint_text: _('Enter PIM Number…'),
+                hint_text: _('PIM Number'),
                 can_focus: true,
                 x_expand: true,
             });
@@ -323,7 +323,7 @@ var ShellMountPasswordDialog = GObject.registerClass({
 
         this._passwordEntry = new St.PasswordEntry({
             style_class: 'prompt-dialog-password-entry',
-            hint_text: _('Enter Password…'),
+            hint_text: _('Password'),
             can_focus: true,
             x_expand: true,
         });