Merge branch 'bjarnef-dev-v7-U4-8597' into dev-v7

src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js

@@ -79,7 +79,7 @@
         }
 
         $scope.loginSubmit = function (login, password) {
-
+            
             //if the login and password are not empty we need to automatically 
             // validate them - this is because if there are validation errors on the server
             // then the user has to change both username & password to resubmit which isn't ideal,
@@ -121,13 +121,18 @@
 
         $scope.requestPasswordResetSubmit = function (email) {
 
-            $scope.errorMsg = "";
+            if (email && email.length > 0) {
+                $scope.requestPasswordResetForm.email.$setValidity('auth', true);
+            }
+            
             $scope.showEmailResetConfirmation = false;
 
             if ($scope.requestPasswordResetForm.$invalid) {
                 return;
             }
 
+            $scope.errorMsg = "";
+
             authResource.performRequestPasswordReset(email)
                 .then(function () {
                     //remove the email entered

src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html

@@ -25,7 +25,7 @@
                                     id="{{login.authType}}" name="provider" value="{{login.authType}}"
                                     title="Log in using your {{login.caption}} account">
                                 <i class="fa" ng-class="login.properties.SocialIcon"></i>
-                                Sign in with {{login.caption}}
+                                <localize key="login_signInWith">Sign in with</localize> {{login.caption}}
                             </button>
 
                         </div>
@@ -33,7 +33,7 @@
 
                     <div id="hrOr">
                         <hr />
-                        <div>Or</div>
+                        <div><localize key="general_or">or</localize></div>
                     </div>
 
                 </div>