From 51c459d6546ef753a7a9d7bb5aef2b08267e7374 Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Tue, 5 Nov 2013 12:38:01 +0100
Subject: [PATCH] Fixes placeholder label overriding name label

---
 .../src/common/mocks/services/localization.mocks.js             | 2 +-
 src/Umbraco.Web.UI.Client/src/views/content/edit.html           | 2 +-
 src/Umbraco.Web.UI.Client/src/views/media/edit.html             | 2 +-
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
index 261cb01fd9..286622e05e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
@@ -211,7 +211,7 @@ angular.module('umbraco.mocks').
                   "dictionaryItem_displayName": "Culture Name",
                   "placeholders_username": "Enter your username",
                   "placeholders_password": "Enter your password",
-                  "placeholders_name": "Enter a name...",
+                  "placeholders_entername": "Enter a name...",
                   "placeholders_search": "Type to search...",
                   "placeholders_filter": "Type to filter...",
                   "editcontenttype_allowedchildnodetypes": "Allowed child nodetypes",
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
index 0d37f5a20c..68c7626ae1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
@@ -8,7 +8,7 @@
 
             <div class="span4">
                 <umb-content-name 
-                    placeholder="@placeholders_name" 
+                    placeholder="@placeholders_entername" 
                     ng-model="content.name"></umb-content-name>
             </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/edit.html b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
index 81cf09dcd1..c9841b9e3c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
@@ -8,7 +8,7 @@
             
             <div class="span4">
                 <umb-content-name
-                    placeholder="@placeholders_name" 
+                    placeholder="@placeholders_entername" 
                     ng-model="content.name"></umb-content-name>
             </div>
 
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index e4c29db6aa..19b1af5933 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -242,7 +242,7 @@
     <key alias="username">Enter your username</key>
     <key alias="password">Enter your password</key>
 
-    <key alias="name">Enter a name...</key>
+    <key alias="entername">Enter a name...</key>
     <key alias="search">Type to search...</key>
     <key alias="filter">Type to filter...</key>
   </area>