From 00d012162f8dae5f7b80e64c78dc83ad77d3a881 Mon Sep 17 00:00:00 2001
From: Claus <claus@claus.nu>
Date: Fri, 5 Feb 2016 10:38:15 +0100
Subject: [PATCH] Added a bunch of missing translations in user overlay.

---
 .../mocks/services/localization.mocks.js      |  3 +-
 .../src/views/common/overlays/user/user.html  | 63 +++++++++++--------
 .../changepassword/changepassword.html        | 26 +++++---
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml |  4 +-
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml |  4 +-
 .../umbraco/config/lang/en_us.xml             |  4 +-
 6 files changed, 64 insertions(+), 40 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 aefb678ffe..6365606a5a 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
@@ -716,7 +716,7 @@ angular.module('umbraco.mocks').
                   "user_administrators": "Administrator",
                   "user_categoryField": "Category field",
                   "user_changePassword": "Change Your Password",
-                  "user_newPassword": "Change Your Password",
+                  "user_newPassword": "New password",
                   "user_confirmNewPassword": "Confirm new password",
                   "user_changePasswordDescription": "You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button",
                   "user_contentChannel": "Content Channel",
@@ -730,6 +730,7 @@ angular.module('umbraco.mocks').
                   "user_mediastartnode": "Start Node in Media Library",
                   "user_modules": "Sections",
                   "user_noConsole": "Disable Umbraco Access",
+                  "user_oldPassword": "Old password",
                   "user_password": "Password",
                   "user_resetPassword": "Reset password",
                   "user_passwordChanged": "Your password has been changed!",
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
index 12d77d20ca..96e78b4d92 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
@@ -10,23 +10,32 @@
            </small>
        </p>
 
-       <a href="#/users/framed/%252Fumbraco%252Fusers%252Fedituser.aspx%253Fid%253D{{user.id}}"
-          class="btn btn-primary"
-          ng-click="closeOverLay()"
-          ng-if="canEditProfile">
-          <localize key="general_edit">Edit</localize>
-       </a>
-
-       <umb-button
-          type="button"
-          action="togglePasswordFields()"
-          label="Change password"
-          button-style="success">
+        <umb-button
+            type="link"
+            href="#/users/framed/%252Fumbraco%252Fusers%252Fedituser.aspx%253Fid%253D{{user.id}}"
+            button-style="primary"
+            action="closeOverLay()"
+            label="Edit"
+            label-key="general_edit"
+            ng-if="canEditProfile">
        </umb-button>
 
-       <button ng-click="logout()" hotkey="ctrl+shift+l" class="btn btn-warning">
-           <localize key="general_logout">Log out</localize>
-       </button>
+        <umb-button
+            type="button"
+            action="togglePasswordFields()"
+            label="Change password"
+            label-key="general_changePassword"
+            button-style="success">
+       </umb-button>
+
+        <umb-button
+            type="button"
+            action="logout()"
+            shortcut="ctrl+shift+l"
+            button-style="warning"
+            label="Log out"
+            label-key="general_logout">
+        </umb-button>
 
     </div>
 
@@ -91,19 +100,21 @@
 
           <umb-editor model="changePasswordModel"></umb-editor>
 
-          <umb-button
-             type="button"
-             action="togglePasswordFields()"
-             label="Back"
-             button-style="Cancel">
+           <umb-button
+               type="button"
+               action="togglePasswordFields()"
+               label="Back"
+               label-key="general_back"
+               button-style="cancel">
           </umb-button>
 
-          <umb-button
-             type="submit"
-             label="Change password"
-             state="changePasswordButtonState"
-             button-style="success">
-          </umb-button>
+           <umb-button
+               type="submit"
+               label="Change password"
+               label-key="general_changePassword"
+               state="changePasswordButtonState"
+               button-style="success">
+           </umb-button>
 
        </form>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html
index c6c9bb115f..78ae6afa6b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html
@@ -5,12 +5,14 @@
         <strong>{{model.value.generatedPassword}}</strong>
     </div>
     <div ng-switch="changing">
-        <div ng-switch-when="false">        
-            <a href="" ng-click="doChange()" class="btn btn-small">Change password</a>         
+        <div ng-switch-when="false">
+            <a href="" ng-click="doChange()" class="btn btn-small">
+                <localize key="general_changePassword">Change password</localize>
+            </a>         
         </div>
         <div ng-switch-when="true">
         
-            <umb-control-group alias="resetPassword" label="Reset password?" ng-show="$parent.showReset()">
+            <umb-control-group alias="resetPassword" label="@user_resetPassword" ng-show="$parent.showReset()">
                 <input type="checkbox" ng-model="$parent.model.value.reset" 
                        id="Checkbox1" 
                        name="resetPassword"
@@ -19,7 +21,7 @@
             </umb-control-group>
 
             <!-- we need to show the old pass field when the provider cannot retrieve the password -->
-            <umb-control-group alias="oldPassword" label="Old password" ng-show="$parent.showOldPass()">            
+            <umb-control-group alias="oldPassword" label="@user_oldPassword" ng-show="$parent.showOldPass()">            
                 <input type="password" name="oldPassword" ng-model="$parent.model.value.oldPassword"
                        class="input-large umb-textstring textstring" 
                        ng-required="$parent.showOldPass()"
@@ -29,7 +31,7 @@
                 <span class="help-inline" val-msg-for="oldPassword" val-toggle-msg="valServer"></span>
             </umb-control-group>
 
-            <umb-control-group alias="password" label="New password" ng-show="$parent.showNewPass()">            
+            <umb-control-group alias="password" label="@user_newPassword" ng-show="$parent.showNewPass()">            
                 <input type="password" name="password" ng-model="$parent.model.value.newPassword"
                        class="input-large umb-textstring textstring"
                        ng-required="!$parent.model.value.reset"
@@ -41,16 +43,20 @@
                 <span class="help-inline" val-msg-for="password" val-toggle-msg="valServer"></span>     
             </umb-control-group>
 
-            <umb-control-group alias="confirmpassword" label="Confirm password" ng-show="$parent.showConfirmPass()">
+            <umb-control-group alias="confirmpassword" label="@user_confirmNewPassword" ng-show="$parent.showConfirmPass()">
                 <input type="password" name="confirmpassword" ng-model="$parent.model.confirm"
                        class="input-large umb-textstring textstring"
                        val-compare="password" no-dirty-check
-                       autocomplete="off" />
+                       autocomplete="off"/>
 
-                <span class="help-inline" val-msg-for="confirmpassword" val-toggle-msg="valCompare">Passwords must match</span>     
-            </umb-control-group> 
+                <span class="help-inline" val-msg-for="confirmpassword" val-toggle-msg="valCompare">
+                    <localize key="user_passwordMismatch">The confirmed password doesn't match the new password!</localize>
+                </span>
+            </umb-control-group>
 
-            <a href="" ng-click="cancelChange()" ng-show="showCancelBtn()" class="btn btn-small">Cancel</a> 
+            <a href="" ng-click="cancelChange()" ng-show="showCancelBtn()" class="btn btn-small">
+                <localize key="general_cancel">Cancel</localize>
+            </a> 
         </div>      
     </div>  
 </div>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 3d27ca1c56..85bc30b4f5 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -319,6 +319,7 @@
     <key alias="add">Tilføj</key>
     <key alias="alias">Alias</key>
     <key alias="areyousure">Er du sikker?</key>
+    <key alias="back">Tilbage</key>
     <key alias="border">Kant</key>
     <key alias="by">af</key>
     <key alias="cancel">Fortryd</key>
@@ -1007,7 +1008,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="administrators">Administrator</key>
     <key alias="categoryField">Kategorifelt</key>
     <key alias="changePassword">Skift dit kodeord</key>
-    <key alias="newPassword">Skift dit kodeord</key>
+    <key alias="newPassword">Nyt kodeord</key>
     <key alias="confirmNewPassword">Gentag dit nye kodeord</key>
     <key alias="changePasswordDescription">Du kan ændre dit kodeord, som giver dig adgang til Umbraco Back Office ved at udfylde formularen og klikke på knappen 'Skift dit kodeord'</key>
     <key alias="contentChannel">Indholdskanal</key>
@@ -1021,6 +1022,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="mediastartnode">Startnode i mediearkivet</key>
     <key alias="modules">Moduler</key>
     <key alias="noConsole">Deaktivér adgang til Umbraco</key>
+    <key alias="oldPassword">Gammelt kodeord</key>
     <key alias="password">Adgangskode</key>
     <key alias="resetPassword">Nulstil kodeord</key>
     <key alias="passwordChanged">Dit kodeord er blevet ændret!</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 719cdac51d..6acbd06127 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -374,6 +374,7 @@
     <key alias="alias">Alias</key>
     <key alias="all">All</key>
     <key alias="areyousure">Are you sure?</key>
+    <key alias="back">Back</key>
     <key alias="border">Border</key>
     <key alias="by">by</key>
     <key alias="cancel">Cancel</key>
@@ -1193,7 +1194,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="administrators">Administrator</key>
     <key alias="categoryField">Category field</key>
     <key alias="changePassword">Change Your Password</key>
-    <key alias="newPassword">Change Your Password</key>
+    <key alias="newPassword">New password</key>
     <key alias="confirmNewPassword">Confirm new password</key>
     <key alias="changePasswordDescription">You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button</key>
     <key alias="contentChannel">Content Channel</key>
@@ -1207,6 +1208,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="mediastartnode">Start Node in Media Library</key>
     <key alias="modules">Sections</key>
     <key alias="noConsole">Disable Umbraco Access</key>
+    <key alias="oldPassword">Old password</key>
     <key alias="password">Password</key>
     <key alias="resetPassword">Reset password</key>
     <key alias="passwordChanged">Your password has been changed!</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index b94a6b4dab..a813a67307 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -375,6 +375,7 @@
     <key alias="alias">Alias</key>
     <key alias="all">All</key>
     <key alias="areyousure">Are you sure?</key>
+    <key alias="back">Back</key>
     <key alias="border">Border</key>
     <key alias="by">by</key>
     <key alias="cancel">Cancel</key>
@@ -1189,7 +1190,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="administrators">Administrator</key>
     <key alias="categoryField">Category field</key>
     <key alias="changePassword">Change Your Password</key>
-    <key alias="newPassword">Change Your Password</key>
+    <key alias="newPassword">New password</key>
     <key alias="confirmNewPassword">Confirm new password</key>
     <key alias="changePasswordDescription">You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button</key>
     <key alias="contentChannel">Content Channel</key>
@@ -1203,6 +1204,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="mediastartnode">Start Node in Media Library</key>
     <key alias="modules">Sections</key>
     <key alias="noConsole">Disable Umbraco Access</key>
+    <key alias="oldPassword">Old password</key>
     <key alias="password">Password</key>
     <key alias="resetPassword">Reset password</key>
     <key alias="passwordChanged">Your password has been changed!</key>