more i18n

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1238434 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index 73e546aea15e3f4674e24662333bd2da2f8d66bc..9790adce753f9e075d3104f35d79cbab748420e6 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -34,8 +34,6 @@ modified=Modified
 save=Save
 identifier=Id
 
-managedrepository.delete.content=Delete Content too ?
-
 # managed repositories screen
 managedrepository.delete.confirm=Delete Managed Repository
 managedrepository.delete.warning.message=Are you sure you want to delete the following managed repository?
@@ -50,6 +48,7 @@ managedrepository.stats.endTime=Last Scanned
 managedrepository.stats.duration=Duration
 managedrepository.stats.totalFileCount=Total File Count
 managedrepository.stats.newFileCount=New Files Found
+managedrepository.delete.content=Delete Content too ?
 
 
 # remote repositories screen
@@ -72,3 +71,12 @@ menu.network-proxies=Network Proxies
 menu.roles=User Roles
 menu.repositories=Repositories
 
+#user
+user.change.password.required=Change password required
+users.grid.tab.title=Users
+users.list=Users List
+users.sort.byname=Sort by Name
+effective.roles.edit=Edit Roles
+locked=Locked
+validated=Validated
+

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
index e8906d8e772ce18663d915faca68b87507c218fc..6620ac438aa9f569735e07ab79e97adcfa40e9ff 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
@@ -20,7 +20,7 @@
 <div id="edit-user-details-pills">
   <ul id="edit_user_details_pills_headers" class="pills">
     <li class="active" id="user-view-detail-li">
-      <a href="#user-create-div">${$.i18n.prop('user.details.edit')}</a>
+      <a href="#user-create-div">${$.i18n.prop('edit')}</a>
     </li>
     <li id="user-edit-roles-edit-li">
       <a href="#user-edit-roles-edit">${$.i18n.prop('effective.roles.edit')}</a>
@@ -79,7 +79,7 @@
                 </div>
               </div>
               <div class="clearfix">
-                <label for="passwordChangeRequired">${$.i18n.prop('passwordChangeRequired')}</label>
+                <label for="passwordChangeRequired">${$.i18n.prop('user.change.password.required')}</label>
                 <div class="input">
                   <input type="checkbox" id="passwordChangeRequired" name="passwordChangeRequired" data-bind="checked: passwordChangeRequired"/>
                 </div>

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
index df8e103ef015f286f3a3a4659e8e674d7ff220fc..900a6eaa4a00567828256231f361ca5d7bf5ecc3 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
@@ -98,7 +98,7 @@
         <a href="#users-view">${$.i18n.prop('users.grid.tab.title')}</a>
       </li>
       <li id="users-view-tabs-li-user-edit">
-        <a href="#createUserForm" id="users-view-tabs-li-user-edit-a">${$.i18n.prop('user.add')}</a>
+        <a href="#createUserForm" id="users-view-tabs-li-user-edit-a">${$.i18n.prop('add')}</a>
       </li>
     </ul>
     <div id="users-view-tabs-content" class="tab-content">

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
index eb5c4c1a13b5313aadba15147d69a3f8eeb5fb9c..bdc880a57f7cf586aa84b6d2781f4f31e5a23725 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
@@ -172,7 +172,7 @@ $(function() {
               var updated = JSON.parse(result);
               if (updated == true) {
                 displaySuccessMessage($.i18n.prop("user.updated",currentUser.username()));
-                $("#users-view-tabs-li-user-edit a").html($.i18n.prop("user.add"));
+                $("#users-view-tabs-li-user-edit a").html($.i18n.prop("add"));
                 clearForm("#main-content #user-create");
                 activateUsersGridTab();
                 return this;

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
index fba291eb5a75e559573935dea05b21686af4bc77..75b90146e2ecf00a7763c0256ba7950c92353303 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
@@ -119,7 +119,7 @@ $(function() {
 
       ko.applyBindings(viewModel,$("#main-content #createUserForm").get(0));
 
-      $("#main-content #users-view-tabs-li-user-edit a").html($.i18n.prop("user.edit"));
+      $("#main-content #users-view-tabs-li-user-edit a").html($.i18n.prop("edit"));
 
       $("#main-content #user-create").delegate("#user-create-form-cancel-button", "click keydown", function(e) {
         e.preventDefault();
@@ -224,7 +224,7 @@ $(function() {
         window.redbackModel.usersViewModel.addUser();
       }
       if ($(e.target).attr("href")=="#users-view") {
-        $("#main-content #users-view-tabs-li-user-edit a").html($.i18n.prop("user.add"));
+        $("#main-content #users-view-tabs-li-user-edit a").html($.i18n.prop("add"));
       }
 
     })