From d553eb297802eb41a552c5929703d0b6a7136e3f Mon Sep 17 00:00:00 2001
From: Niels Hartvig <nh@umbraco.dk>
Date: Fri, 28 Apr 2017 13:57:29 +0200
Subject: [PATCH] Change it back to username and then with a hint for email
 (for backwards compat.)

---
 src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html | 4 ++--
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml                 | 1 +
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml                 | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
index e4e0ea8d91..65ce1c3ecb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
@@ -49,8 +49,8 @@
                         </div>
 
                         <div class="control-group" ng-class="{error: loginForm.username.$invalid}">
-                            <label><localize key="general_email">E-mail</localize></label>
-                            <input type="text" ng-model="login" name="username" class="-full-width-input" localize="placeholder" placeholder="@placeholders_email" />
+                            <label><localize key="general_username">Username</localize></label>
+                            <input type="text" ng-model="login" name="username" class="-full-width-input" localize="placeholder" placeholder="@placeholders_usernameHint" />
                         </div>
 
                         <div class="control-group" ng-class="{error: loginForm.password.$invalid}">
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index b0c2995f07..00580ba17e 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -321,6 +321,7 @@
     <key alias="search">Søg...</key>
     <key alias="filter">Filtrer...</key>
     <key alias="enterTags">Indtast nøgleord (tryk på Enter efter hvert nøgleord)...</key>
+    <key alias="usernameHint">Dit brugernavn er typisk din e-mail adresse</key>
   </area>
   <area alias="editcontenttype">
     <key alias="allowAtRoot" version="7.2">Tillad på rodniveau</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 21984a93d4..ecea653650 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -348,6 +348,7 @@
     <key alias="filter">Type to filter...</key>
     <key alias="enterTags">Type to add tags (press enter after each tag)...</key>
     <key alias="email">Enter your email</key>
+    <key alias="usernameHint">Your username is usually your email</key>
   </area>
   <area alias="editcontenttype">
     <key alias="allowAtRoot" version="7.2">Allow at root</key>