[Coselmar-commits] 04/06: i18n users part

23 Jan 2015

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository coselmar.

See http://git.codelutin.com/coselmar.git

commit 987afe439f3e425bceafd8250e90d87dba11d395
Author: Yannick Martel <martel@©odelutin.com>
Date:   Fri Jan 23 10:45:19 2015 +0100

    i18n users part
---
 coselmar-ui/src/main/webapp/i18n/en.js             | 55 +++++++++++++++++++++-
 .../src/main/webapp/views/users/adminUsers.html    | 49 ++++++++++---------
 .../src/main/webapp/views/users/edituser.html      | 49 ++++++++++---------
 .../src/main/webapp/views/users/newuser.html       | 12 ++---
 .../main/webapp/views/users/supervisorUsers.html   | 48 +++++++++----------
 coselmar-ui/src/main/webapp/views/users/user.html  | 26 +++++-----
 coselmar-ui/src/main/webapp/views/users/users.html |  2 +-
 7 files changed, 143 insertions(+), 98 deletions(-)

diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js
index 5f9efa7..6ed10bb 100644
--- a/coselmar-ui/src/main/webapp/i18n/en.js
+++ b/coselmar-ui/src/main/webapp/i18n/en.js
@@ -112,6 +112,56 @@ var translateEN = {
 "question.message.delete"                       :   "Do you really want to delete this question ?",
 "question.message.closedOn"                     :   "Closed on ",
 
+//Users part
+
+"user.list.title"                               :   "All users",
+"user.create.title"                             :   "Add an user",
+"user.create.info"                              :   "Create new user, with one of following roles :\
+                                                     <ul>\
+                                                       <li>Supervisor : Kind of big manager, who relays member/client question and assigns expert on questions</li>\
+                                                       <li>Expert : Scientist, who can add new document in the repository and see other scientist documents (according file permission)</li>\
+                                                       <li>Member</li>\
+                                                       <li>Client</li>\
+                                                     </ul>",
+"user.create.client.info"                       :   "Create new user with Client role",
+
+"user.metadata.name"                            :   "Name",
+"user.metadata.firstName"                       :   "First name",
+"user.metadata.mail"                            :   "Contact",
+"user.metadata.phone"                           :   "Phone number",
+"user.metadata.qualification"                   :   "Qualification",
+"user.metadata.organization"                    :   "Organization",
+"user.metadata.role"                            :   "role",
+"user.metadata.status"                          :   "Status",
+"user.metadata.status.disable"                  :   "Disable",
+"user.metadata.status.enable"                   :   "Active",
+"user.metadata.password"                        :   "Password",
+"user.metadata.password.new"                    :   "New Password",
+"user.metadata.role.all"                        :   "All",
+"user.metadata.role.admin"                      :   "Admin",
+"user.metadata.role.supervisor"                 :   "Supervisor",
+"user.metadata.role.expert"                     :   "Expert",
+"user.metadata.role.member"                     :   "Member",
+"user.metadata.role.client"                     :   "Client",
+
+"user.message.disable"                          :   "Do you really want to disable this user ?",
+"user.message.delete"                           :   "Do you really want to delete this user ?",
+"user.message.requiredFirsName"                 :   "First name is required.",
+"user.message.requiredName"                     :   "Name is required.",
+"user.message.invalidMail"                      :   "Enter a valid mail.",
+"user.message.requiredQualification"            :   "Qualification is required.",
+"user.message.requiredPassword"                 :   "Password is required to validate modification.",
+"user.label.currentPasswordToValidate"          :   "Tape your current password to validate the modifications",
+"user.message.wannaChangePassword"              :   "I want to change the password",
+"user.message.tooShortPassword"                 :   "New password should contain at least 6 characters.",
+"user.message.passwordsNoMatch"                 :   "The two new passwords don't match.",
+
+"user.button.add"                               :   "Add an user",
+"user.button.add.client"                        :   "Add a client",
+"user.button.disable"                           :   "Disable",
+"user.button.enable"                            :   "Enable",
+"user.button.showDisable"                       :   "Show disable",
+
 //Common part
 
 "common.privacy.private"                        :   "Private",
@@ -121,7 +171,10 @@ var translateEN = {
 "common.button.delete"                          :   "Delete",
 "common.button.edit"                            :   "Modify",
 "common.button.add"                             :   "Add",
-"common.button.cancel"                             :   "Cancel",
+"common.button.cancel"                          :   "Cancel",
+"common.button.search"                          :   "Search",
+"common.button.advanceSearch"                   :   "Advance search",
+"common.button.simpleSearch"                    :   "Simple search",
 "common.message.missingMandatoryFields"         :   "Some mandatory field (*) have not been filled.",
 "common.message.notYetAvailable"                :   "Not yet available.",
 "common.message.mandatoryFieldsInfo"            :   "Field with <strong><big>*</big></strong> are mandatory.",
diff --git a/coselmar-ui/src/main/webapp/views/users/adminUsers.html b/coselmar-ui/src/main/webapp/views/users/adminUsers.html
index 766faa2..26dd36c 100644
--- a/coselmar-ui/src/main/webapp/views/users/adminUsers.html
+++ b/coselmar-ui/src/main/webapp/views/users/adminUsers.html
@@ -25,12 +25,12 @@
   <div class="table-responsive" ng-if="currentUser.role == 'ADMIN'">
     <div class="row">
       <div class="form-group col-md-5">
-        <a href="#/users/new" class="form-inline navbar-left btn btn-primary">Add an user</a>
+        <a href="#/users/new" class="form-inline navbar-left btn btn-primary">{{ 'user.button.add' | translate }}</a>
       </div>
       <form class="form-inline cold-md-7" name="userOptions" role="userOptions" ng-submit="searchUsers()" ng-if="!advanced">
         <div class="form-group">
           <input type="checkbox" class="form-control" ng-model="search.showDisable" />
-          <span>Show Disable</span>
+          <span>{{ 'user.button.showDisable' | translate }}</span>
         </div>
         <div class="form-group">
           <input type="search" class="form-control" placeholder="Search an user" ng-model="search.searchKeyword" />
@@ -42,10 +42,10 @@
     </div>
     <div class="row">
       <div class="form-group col-md-5" ng-show="!advanced">
-        <a ng-click="advanced=true" class="fa fa-sort-down">Advanced Search</a>
+        <a ng-click="advanced=true" class="fa fa-sort-down">{{ 'common.button.advanceSearch' | translate }}</a>
       </div>
       <div class="form-group col-md-5" ng-show="advanced">
-        <a ng-click="advanced=false" class="fa fa-sort-up">Simple Search</a>
+        <a ng-click="advanced=false" class="fa fa-sort-up">{{ 'common.button.simpleSearch' | translate }}</a>
       </div>
     </div>
 
@@ -67,18 +67,18 @@
           </td>
           <td class="form-group">
             <select class="form-control" name="role" ng-model="example.role" title="role" >
-              <option value="ALL">All</option>
-              <option value="ADMIN">Admin</option>
-              <option value="SUPERVISOR">Supervisor</option>
-              <option value="EXPERT">Expert</option>
-              <option value="MEMBER">Member</option>
-              <option value="CLIENT">Client</option>
+              <option value="ALL">{{ 'user.metadata.role.all' | translate }}</option>
+              <option value="ADMIN">{{ 'user.metadata.role.admin' | translate }}</option>
+              <option value="SUPERVISOR">{{ 'user.metadata.role.supervisor' | translate }}</option>
+              <option value="EXPERT">{{ 'user.metadata.role.expert' | translate }}</option>
+              <option value="MEMBER">{{ 'user.metadata.role.member' | translate }}</option>
+              <option value="CLIENT">{{ 'user.metadata.role.client' | translate }}</option>
             </select>
           </td>
           <td class="form-group">
             <select class="form-control" name="active" ng-model="example.active" title="active" >
-              <option value="true">Active</option>
-              <option value="false">Inactive</option>
+              <option value="true">{{ 'user.metadata.status.enable' | translate }}</option>
+              <option value="false">{{ 'user.metadata.status.disable' | translate }}</option>
             </select>
           </td>
           <td class="form-group text-center">
@@ -87,12 +87,12 @@
         </form>
     </tr>
       <tr>
-        <th class="col-md-2">Name</th>
-        <th class="col-md-2">Mail</th>
-        <th class="col-md-2">Qualification</th>
-        <th class="col-md-2">Organization</th>
-        <th class="col-md-2">Role</th>
-        <th class="col-md-1">Status</th>
+        <th class="col-md-2">{{ 'user.metadata.name' | translate }}</th>
+        <th class="col-md-2">{{ 'user.metadata.mail' | translate }}</th>
+        <th class="col-md-2">{{ 'user.metadata.qualification' | translate }}</th>
+        <th class="col-md-2">{{ 'user.metadata.organization' | translate }}</th>
+        <th class="col-md-2">{{ 'user.metadata.role' | translate }}</th>
+        <th class="col-md-1">{{ 'user.metadata.status' | translate }}</th>
         <th class="col-md-1"></th>
       </tr>
       <tr ng-repeat="user in users">
@@ -101,22 +101,21 @@
         <td>{{user.qualification}}</td>
         <td>{{user.organization}}</td>
         <td>{{user.role}}</td>
-        <td ng-if="user.active">Active</td>
-        <td ng-if="!user.active">Disable</td>
+        <td ng-if="user.active">{{ 'user.metadata.status.enable' | translate }}</td>
+        <td ng-if="!user.active">{{ 'user.metadata.status.disable' | translate }}</td>
         <td>
           <a class="btn btn-action btn-edit" href="#/users/{{user.id}}?edit">
-            <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>Modify
+            <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>{{ 'common.button.edit' | translate }}
           </a>
           <a class="btn btn-action btn-disable" ng-if="user.active"
-             ng-confirm-message="Do you really want to disable this user ?"
+             ng-confirm-message="user.message.disable"
              ng-confirm-click="disableUser(user)">
-            <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>Disable
+            <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>{{ 'user.button.disable' | translate }}
           </a>
           <a class="btn btn-action" ng-if="!user.active"
              ng-click="enableUser(user)">
-            <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>Enable
+            <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>{{ 'user.button.enable' | translate }}
           </a>
-          <!--<a class="btn btn-primary" ng-if="!user.active" ng-click="enableUser(user.id)">Enable</a>-->
         </td>
       </tr>
     </table>
diff --git a/coselmar-ui/src/main/webapp/views/users/edituser.html b/coselmar-ui/src/main/webapp/views/users/edituser.html
index 4faee3c..68f884b 100644
--- a/coselmar-ui/src/main/webapp/views/users/edituser.html
+++ b/coselmar-ui/src/main/webapp/views/users/edituser.html
@@ -32,67 +32,67 @@
       <form name="userForm" class="form-horizontal" role="form" ng-submit="saveUser(userForm.$valid)">
 
         <div class="form-group" ng-class="{'has-error' : userForm.firstName.$invalid && !userForm.firstName.$pristine }">
-          <label class="col-md-4 control-label">First Name *</label>
+          <label class="col-md-4 control-label">{{ 'user.metadata.firsName' | translate }} *</label>
 
           <div class="col-md-5">
             <input type="text" class="form-control" name="firstName"
                    placeholder="FirstName"
                    ng-model="user.firstName" required/>
-            <p ng-show="userForm.firstName.$invalid && !userForm.firstName.$pristine" class="help-block">First name is required.</p>
+            <p ng-show="userForm.firstName.$invalid && !userForm.firstName.$pristine" class="help-block">{{ 'user.message.requiredFirsName' | translate }}</p>
           </div>
         </div>
 
         <div class="form-group" ng-class="{'has-error' : userForm.name.$invalid && !userForm.name.$pristine}">
-          <label class="col-md-4 control-label">Name *</label>
+          <label class="col-md-4 control-label">{{ 'user.metadata.name' | translate }} *</label>
 
           <div class="col-md-5">
             <input type="text" class="form-control" name="name"
                    placeholder="Name"
                    ng-model="user.name" required/>
-            <p ng-show="userForm.name.$invalid && !userForm.name.$pristine" class="help-block">Name is required.</p>
+            <p ng-show="userForm.name.$invalid && !userForm.name.$pristine" class="help-block">{{ 'user.message.requiredName' | translate }}</p>
           </div>
         </div>
 
         <div class="form-group" ng-if="currentUser.role == 'ADMIN'">
-          <label class="col-md-4 control-label">Role *</label>
+          <label class="col-md-4 control-label">{{ 'user.metadata.role' | translate }} *</label>
 
           <div class="col-md-5">
             <select class="form-control" name="role" ng-model="user.role" required>
-              <option value="ADMIN">Admin</option>
-              <option value="SUPERVISOR">Supervisor</option>
-              <option value="EXPERT">Expert</option>
-              <option value="MEMBER">Member</option>
-              <option value="CLIENT">Client</option>
+              <option value="ADMIN">{{ 'user.metadata.role.admin' | translate }}</option>
+              <option value="SUPERVISOR">{{ 'user.metadata.role.supervisor' | translate }}</option>
+              <option value="EXPERT">{{ 'user.metadata.role.expert' | translate }}</option>
+              <option value="MEMBER">{{ 'user.metadata.role.member' | translate }}</option>
+              <option value="CLIENT">{{ 'user.metadata.role.client' | translate }}</option>
             </select>
           </div>
 
         </div>
 
         <div class="form-group" ng-if="currentUser.role == 'SUPERVISOR' && currentUser.id != user.userId">
-          <label class="col-md-4 control-label">Role *</label>
+          <label class="col-md-4 control-label">{{ 'user.metadata.role' | translate }} *</label>
 
           <div class="col-md-5">
             <select class="form-control" name="role" ng-model="user.role" required>
-              <option value="CLIENT">Client</option>
+              <option value="CLIENT">{{ 'user.metadata.role.client' | translate }}</option>
             </select>
           </div>
 
         </div>
 
         <div class="form-group" ng-class="{'has-error' : userForm.mail.$invalid && !userForm.mail.$pristine}">
-          <label class="col-md-4 control-label">Mail *</label>
+          <label class="col-md-4 control-label">{{ 'user.metadata.mail' | translate }} *</label>
 
           <div class="col-md-5">
               <input type="email" class="form-control" name="mail"
                      placeholder="example@provider.mail"
                      ng-model="user.mail" required/>
-              <p ng-show="userForm.mail.$invalid && !userForm.mail.$pristine" class="help-block">Enter a valid mail.</p>
+              <p ng-show="userForm.mail.$invalid && !userForm.mail.$pristine" class="help-block">{{ 'user.message.invalidMail' | translate }}</p>
           </div>
 
         </div>
 
         <div class="form-group" >
-          <label class="col-md-4 control-label">Phone Number</label>
+          <label class="col-md-4 control-label">{{ 'user.metadata.phone' | translate }}</label>
 
           <div class="col-md-5">
               <input type="text" class="form-control" name="phoneNumber"
@@ -103,7 +103,7 @@
         </div>
 
         <div class="form-group">
-          <label class="col-md-4 control-label">Organization</label>
+          <label class="col-md-4 control-label">{{ 'user.metadata.organization' | translate }}</label>
 
           <div class="col-md-5">
             <input type="text" class="form-control" name="organization"
@@ -114,13 +114,13 @@
         </div>
 
         <div class="form-group" ng-class="{'has-error' : userForm.qualification.$invalid && !userForm.qualification.$pristine}">
-          <label class="col-md-4 control-label">Qualification *</label>
+          <label class="col-md-4 control-label">{{ 'user.metadata.qualification' | translate }} *</label>
 
           <div class="col-md-5">
             <input type="text" class="form-control" name="qualification"
                    placeholder="qualification"
                    ng-model="user.qualification" required/>
-            <p ng-show="userForm.qualification.$invalid && !userForm.qualification.$pristine" class="help-block">Qualification is required.</p>
+            <p ng-show="userForm.qualification.$invalid && !userForm.qualification.$pristine" class="help-block">{{ 'user.message.requiredFirsName' | translate }}</p>
           </div>
 
         </div>
@@ -128,13 +128,13 @@
         <div class="form-group" ng-if="currentUser && currentUser.userId == user.id"
              ng-class="{'has-error' : userForm.password.$invalid && !userForm.password.$pristine}">
 
-          <label class="col-md-4 control-label">Tape your current password to validate the modifications *</label>
+          <label class="col-md-4 control-label">{{ 'user.label.currentPasswordToValidate' | translate }} *</label>
 
           <div class="col-md-5">
             <input type="password" class="form-control" name="password"
                    placeholder="current password"
                    ng-model="user.password" required/>
-            <p ng-show="userForm.password.$invalid && !userForm.password.$pristine" class="help-block">Password is required to validate modification.</p>
+            <p ng-show="userForm.password.$invalid && !userForm.password.$pristine" class="help-block">{{ 'user.message.requiredPassword' | translate }}</p>
           </div>
 
         </div>
@@ -144,10 +144,10 @@
                       && !userForm.newPassword.$pristine )
                       || userForm.confirmNewPassword.$error.identicalmatch }">
 
-          <label class="col-md-4 control-label">New Password</label>
+          <label class="col-md-4 control-label">{{ 'user.metadata.password.new' | translate }}</label>
           
           <div class="col-md-5">
-            <input type="checkbox" ng-model="newPasswordAsked">I want to change the password<br/>
+            <input type="checkbox" ng-model="newPasswordAsked">{{ 'user.message.wannaChangePassword' | translate }}<br/>
             
             <div ng-show="newPasswordAsked">
               <input type="password" class="form-control" name="newPassword"
@@ -161,11 +161,10 @@
                      ng-class="{'has-error' : userForm.confirmNewPassword.$error.identicalmatch }"/>
 
               <p ng-show="userForm.newPassword.$invalid && !userForm.newPassword.$pristine" class="help-block">
-                New password should contain at least 6 characters.
-                {{userForm.newPassword.$error}}
+                {{ 'user.message.tooShortPassword' | translate }}
               </p>
               <p ng-show="userForm.confirmNewPassword.$error.identicalmatch" class="help-block">
-                The two new passwords don't match.
+                {{ 'user.message.passwordsNoMatch' | translate }}
               </p>
             </div>
           </div>
diff --git a/coselmar-ui/src/main/webapp/views/users/newuser.html b/coselmar-ui/src/main/webapp/views/users/newuser.html
index bf6d60b..32ed5b8 100644
--- a/coselmar-ui/src/main/webapp/views/users/newuser.html
+++ b/coselmar-ui/src/main/webapp/views/users/newuser.html
@@ -23,20 +23,14 @@
   -->
 <div style="padding: 0px 0px 0px 30px">
     <div class="page-header" style="margin: 0">
-        <h2>Add new user</h2>
+        <h2>{{ 'user.create.title' | translate }}</h2>
     </div>
 
     <div class="info-panel" ng-if="currentUser.role == 'ADMIN'">
-        Create new user, with one of following roles :
-        <ul>
-          <li>Supervisor : Kind of big manager, who relays member/client question and assigns expert on questions</li>
-          <li>Expert : Scientist, who can add new document in the repository and see other scientist documents (according file permission)</li>
-          <li>Member</li>
-          <li>Client</li>
-        </ul>
+        <p translate="user.create.info"></p>
     </div>
     <div class="info-panel" ng-if="currentUser.role == 'SUPERVISOR'">
-        Create new user with Client role
+      {{ 'user.create.client.info' | translate }}
     </div>
     <div style="padding-bottom: 50px" ng-include="src='views/users/edituser.html'">
 
diff --git a/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html b/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html
index cfc613b..ea327fa 100644
--- a/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html
+++ b/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html
@@ -2,12 +2,12 @@
   <div class="table-responsive" ng-if="currentUser.role == 'SUPERVISOR'">
     <div class="row">
       <div class="form-group col-md-5">
-        <a href="#/users/new" class="form-inline navbar-left btn btn-primary">Add a client</a>
+        <a href="#/users/new" class="form-inline navbar-left btn btn-primary">{{ 'user.button.add.client' | translate }}</a>
       </div>
       <form class="form-inline cold-md-7" name="userOptions" role="userOptions" ng-submit="searchUsers()" ng-if="!advanced">
         <div class="form-group">
           <input type="checkbox" class="form-control" ng-model="search.showDisable" />
-          <span>Show Disable</span>
+          <span>{{ 'user.button.showDisable' | translate }}</span>
         </div>
         <div class="form-group">
           <input type="search" class="form-control" placeholder="Search an user" ng-model="search.searchKeyword" />
@@ -19,10 +19,10 @@
     </div>
     <div class="row">
       <div class="form-group col-md-5" ng-show="!advanced">
-        <a ng-click="advanced=true" class="fa fa-sort-down">Advanced Search</a>
+        <a ng-click="advanced=true" class="fa fa-sort-down">{{ 'common.button.advanceSearch' | translate }}</a>
       </div>
       <div class="form-group col-md-5" ng-show="advanced">
-        <a ng-click="advanced=false" class="fa fa-sort-up">Simple Search</a>
+        <a ng-click="advanced=false" class="fa fa-sort-up">{{ 'common.button.simpleSearch' | translate }}</a>
       </div>
     </div>
 
@@ -44,18 +44,18 @@
           </td>
           <td class="form-group">
             <select class="form-control" name="role" ng-model="example.role" title="role" >
-              <option value="ALL">All</option>
-              <option value="ADMIN">Admin</option>
-              <option value="SUPERVISOR">Supervisor</option>
-              <option value="EXPERT">Expert</option>
-              <option value="MEMBER">Member</option>
-              <option value="CLIENT">Client</option>
+              <option value="ALL">{{ 'user.metadata.role.all' | translate }}</option>
+              <option value="ADMIN">{{ 'user.metadata.role.admin' | translate }}</option>
+              <option value="SUPERVISOR">{{ 'user.metadata.role.supervisor' | translate }}</option>
+              <option value="EXPERT">{{ 'user.metadata.role.expert' | translate }}</option>
+              <option value="MEMBER">{{ 'user.metadata.role.member' | translate }}</option>
+              <option value="CLIENT">{{ 'user.metadata.role.client' | translate }}</option>
             </select>
           </td>
           <td class="form-group">
             <select class="form-control" name="active" ng-model="example.active" title="active" >
-              <option value="true">Active</option>
-              <option value="false">Inactive</option>
+              <option value="true">{{ 'user.metadata.status.enable' | translate }}</option>
+              <option value="false">{{ 'user.metadata.status.disable' | translate }}</option>
             </select>
           </td>
           <td class="form-group text-center">
@@ -64,12 +64,12 @@
         </form>
     </tr>
       <tr>
-        <th class="col-md-2">Name</th>
-        <th class="col-md-2">Mail</th>
-        <th class="col-md-2">Qualification</th>
-        <th class="col-md-2">Organization</th>
-        <th class="col-md-2">Role</th>
-        <th class="col-md-1">Status</th>
+        <th class="col-md-2">{{ 'user.metadata.name' | translate }}</th>
+        <th class="col-md-2">{{ 'user.metadata.mail' | translate }}</th>
+        <th class="col-md-2">{{ 'user.metadata.qualification' | translate }}</th>
+        <th class="col-md-2">{{ 'user.metadata.organization' | translate }}</th>
+        <th class="col-md-2">{{ 'user.metadata.role' | translate }}</th>
+        <th class="col-md-1">{{ 'user.metadata.status' | translate }}</th>
         <th class="col-md-1"></th>
       </tr>
       <tr ng-repeat="user in users">
@@ -78,20 +78,20 @@
         <td>{{user.qualification}}</td>
         <td>{{user.organization}}</td>
         <td>{{user.role}}</td>
-        <td ng-if="user.active">Active</td>
-        <td ng-if="!user.active">Disable</td>
+        <td ng-if="user.active">{{ 'user.metadata.status.enable' | translate }}</td>
+        <td ng-if="!user.active">{{ 'user.metadata.status.disable' | translate }}</td>
         <td ng-if="user.role == 'CLIENT'">
           <a class="btn btn-action btn-edit" href="#/users/{{user.id}}?edit">
-            <span class="fa fa-edit" aria-hidden="true"></span>Modify
+            <span class="fa fa-edit" aria-hidden="true"></span>{{ 'common.button.edit' | translate }}
           </a>
           <a class="btn btn-action btn-disable" ng-if="user.active"
-             ng-confirm-message="Do you really want to disable this user ?"
+             ng-confirm-message="user.message.disable"
              ng-confirm-click="disableUser(user)">
-            <span class="fa fa-remove" aria-hidden="true"></span>Disable
+            <span class="fa fa-remove" aria-hidden="true"></span>{{ 'user.button.disable' | translate }}
           </a>
           <a class="btn btn-action" ng-if="!user.active"
              ng-click="enableUser(user)">
-            <span class="fa fa-remove" aria-hidden="true"></span>Enable
+            <span class="fa fa-remove" aria-hidden="true"></span>{{ 'user.button.enable' | translate }}
           </a>
         </td>
         <td  ng-if="user.role != 'CLIENT'"></td>
diff --git a/coselmar-ui/src/main/webapp/views/users/user.html b/coselmar-ui/src/main/webapp/views/users/user.html
index eebbedb..68292a8 100644
--- a/coselmar-ui/src/main/webapp/views/users/user.html
+++ b/coselmar-ui/src/main/webapp/views/users/user.html
@@ -30,41 +30,41 @@
   <div ng-if="!editMode" >
     <table class="table table-striped">
       <tr>
-        <td>Contact</td>
+        <td>{{ 'user.metadata.mail' | translate }}</td>
         <td>{{user.mail}}</td>
       </tr>
       <tr>
-        <td>Phone Number</td>
+        <td>{{ 'user.metadata.phone' | translate }}</td>
         <td>{{user.phoneNumber}}</td>
       </tr>
       <tr>
-        <td>Qualification</td>
+        <td>{{ 'user.metadata.qualification' | translate }}</td>
         <td>{{user.qualification}}</td>
       </tr>
       <tr>
-        <td>Organization</td>
+        <td>{{ 'user.metadata.organization' | translate }}</td>
         <td>{{user.organization}}</td>
       </tr>
       <tr>
-        <td>Role</td>
+        <td>{{ 'user.metadata.role' | translate }}</td>
         <td>{{user.role}}</td>
       </tr>
       <tr>
-        <td>Status</td>
-        <td ng-if="user.active">Active</td>
-        <td ng-if="!user.active">Disable</td>
+        <td>{{ 'user.metadata.status' | translate }}</td>
+        <td ng-if="user.active">{{ 'user.metadata.status.enable' | translate }}</td>
+        <td ng-if="!user.active">{{ 'user.metadata.status.disable' | translate }}</td>
       </tr>
     </table>
     <div class="float-right">
-      <a class="btn btn-action btn-edit" ng-click="modifyUser()" ng-if="user.active">Modify</a>
+      <a class="btn btn-action btn-edit" ng-click="modifyUser()" ng-if="user.active">{{ 'common.button.edit' | translate }}</a>
       <a class="btn btn-action btn-edit"
-         ng-confirm-message="Do you really want to disable this user ?"
+         ng-confirm-message="user.message.disable"
          ng-confirm-click="disableUser()"
-         ng-if="currentUser.role == 'ADMIN' && user.active">Disable</a>
+         ng-if="currentUser.role == 'ADMIN' && user.active">{{ 'user.button.disable' | translate }}</a>
       <a class="btn btn-action" ng-click="enableUser()"
-         ng-if="currentUser.role == 'ADMIN' && !user.active">Enable</a>
+         ng-if="currentUser.role == 'ADMIN' && !user.active">{{ 'user.button.enable' | translate }}</a>
       <a class="btn btn-action btn-disable"
-         ng-confirm-message="Do you really want to delete this user ?"
+         ng-confirm-message="user.message.delete"
          ng-confirm-click="deleteUser(user.id)"
          ng-if="currentUser.role == 'ADMIN'">Delete</a>
     </div>
diff --git a/coselmar-ui/src/main/webapp/views/users/users.html b/coselmar-ui/src/main/webapp/views/users/users.html
index 3ca0c0e..6989a53 100644
--- a/coselmar-ui/src/main/webapp/views/users/users.html
+++ b/coselmar-ui/src/main/webapp/views/users/users.html
@@ -2,7 +2,7 @@
   <div class="page-header" style="margin: 0">
     <h1>
       <!-- Heading goes here -->
-      All Users
+      {{ 'user.list.title' | translate }}
     </h1>
   </div>
 

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Coselmar-commits] 04/06: i18n users part

codelutin.com scm