Merge remote-tracking branch 'remotes/origin/master' into geoknow (localize email messages, change password form, route restrictions)

Author: taleksashina

src/main/java/util/TLSEmailSender.java

@@ -50,14 +50,5 @@ protected PasswordAuthentication getPasswordAuthentication()
 		message.setText(msgText);
 
 		Transport.send(message);
-	}
-
-    @Override
-    public String toString() {
-        return "TLSEmailSender{" +
-                "smtpHost='" + smtpHost + '\'' +
-                ", smtpPort='" + smtpPort + '\'' +
-                ", fromEmail='" + fromEmail + '\'' +
-                '}';
     }
 }

src/main/resources/framework-components.ttl

@@ -138,12 +138,6 @@
 # Following triples describe required services for routes. It is used in conditional routing.
 # #######################################################################################
 
-:OntologyRouteRestriction
-      a     gkg:RouteRestriction;
-      gkg:partialUrl "/home/manual-revision-and-authoring/ontology"^^xsd:string;
-      gkg:requiredService :D2RQService;
-      gkg:requiredService :MiniDixService .
-
 :RolesRouteRestriction
       a     gkg:RouteRestriction;
       gkg:partialUrl "/settings/roles"^^xsd:string;

src/main/webapp/access-denied.html

@@ -1,3 +1,3 @@
 <div>
-    <h4 data-i18n="_access-denied-page-content_"></h4>
+    <h4>Access denied</h4>
 </div>

src/main/webapp/js/account/account.html

@@ -44,38 +44,38 @@ <h5 class="modal-title green bold">Change password</h5>
           </div>
           <div class="modal-body">
             <div class="form-group">
-              <label for="oldPassword" class="col-lg-2 control-label">Old password</label>
-              <div class="col-lg-10">
+              <label for="oldPassword" class="col-lg-4 control-label">Old password</label>
+              <div class="col-lg-8">
                 <input type="password" id="oldPassword" name="oldPassword" class="form-control" placeholder="Old password" ng-model="password.oldPassword" required/>
                 <div class="error" ng-show="changePasswordForm.oldPassword.$dirty && changePasswordForm.oldPassword.$invalid">Invalid:
                   <span ng-show="changePasswordForm.oldPassword.$error.required">Specify old password</span>
                 </div>
               </div>
             </div>
             <div class="form-group">
-              <label for="newPassword" class="col-lg-4 control-label" data-i18n="_new-password_"></label>
+              <label for="newPassword" class="col-lg-4 control-label">New password</label>
               <div class="col-lg-8">
                 <div class="row">
                     <div class="col-lg-10">
-                        <input type="password" id="newPassword" name="newPassword" class="form-control" data-i18n-attr="_new-password_|placeholder" ng-model="password.newPassword" regex-validate="basicPassword" required/>
+                        <input type="password" id="newPassword" name="newPassword" class="form-control" placeholder="New password" ng-model="password.newPassword" regex-validate="basicPassword" required/>
                     </div>
                     <div>
-                        <i class="glyphicon glyphicon-question-sign" style="margin-top: 10px;" data-toggle="tooltip" data-i18n-attr="_basic-password-guideline_|data-original-title" data-placement="bottom"></i>
+                        <i class="glyphicon glyphicon-question-sign" style="margin-top: 10px;" data-toggle="tooltip" data-original-title="6 symbols minimum (digits and latin letters): at least 1 digit, 1 lower case latin letter and 1 upper case latin letter" data-placement="bottom"></i>
                     </div>
                 </div>
-                <div class="error" ng-show="changePasswordForm.newPassword.$dirty && changePasswordForm.newPassword.$invalid">{{'_invalid-field-message_' | i18n}}:
-                  <span ng-show="changePasswordForm.newPassword.$error.required" data-i18n="_new-password-missed-message_"></span>
-                  <span ng-show="changePasswordForm.newPassword.$error.regexValidate && !changePasswordForm.newPassword.$error.required" data-i18n="_weak-password-message_"></span>
+                <div class="error" ng-show="changePasswordForm.newPassword.$dirty && changePasswordForm.newPassword.$invalid">Invalid:
+                  <span ng-show="changePasswordForm.newPassword.$error.required">Specify new password</span>
+                  <span ng-show="changePasswordForm.newPassword.$error.regexValidate && !changePasswordForm.newPassword.$error.required">Password is too weak</span>
                 </div>
               </div>
             </div>
               <div class="form-group">
-                  <label for="confirmPassword" class="col-lg-4 control-label" data-i18n="_confirm-password_"></label>
+                  <label for="confirmPassword" class="col-lg-4 control-label">Confirm password</label>
                   <div class="col-lg-8">
-                      <input type="password" id="confirmPassword" name="confirmPassword" class="form-control" data-i18n-attr="_confirm-password_|placeholder" ng-model="password.confirmPassword" confirm-field="newPassword" required/>
-                      <div class="error" ng-show="changePasswordForm.confirmPassword.$dirty && changePasswordForm.confirmPassword.$invalid">{{'_invalid-field-message_' | i18n}}:
-                          <span ng-show="changePasswordForm.confirmPassword.$error.required" data-i18n="_confirm-password-missed-message_"></span>
-                          <span ng-show="changePasswordForm.confirmPassword.$error.confirmField && !changePasswordForm.confirmPassword.$error.required" data-i18n="_confirm-password-invalid-message_"></span>
+                      <input type="password" id="confirmPassword" name="confirmPassword" class="form-control" placeholder="Confirm password" ng-model="password.confirmPassword" confirm-field="newPassword" required/>
+                      <div class="error" ng-show="changePasswordForm.confirmPassword.$dirty && changePasswordForm.confirmPassword.$invalid">Invalid:
+                          <span ng-show="changePasswordForm.confirmPassword.$error.required">Confirm password</span>
+                          <span ng-show="changePasswordForm.confirmPassword.$error.confirmField && !changePasswordForm.confirmPassword.$error.required">Invalid password confirmation</span>
                       </div>
                   </div>
               </div>

src/main/webapp/js/services/services.js

@@ -159,10 +159,10 @@ module.factory('AuthenticationErrorResponse', function() {
                     errorText = 'User already exists';
                     break;
                 case 2:
-                    errorText = localize.getLocalizedString("_incorrect-old-password-error_");
+                    errorText = "Incorrect old password";
                     break;
                 case 3:
-                    errorText = localize.getLocalizedString("_user-not-exists_");
+                    errorText = "User doesn't exist";
                     break;
                 default:
                     errorText = code;