From: Olivier Lamy <olamy@apache.org>
Date: Mon, 19 Dec 2011 13:25:46 +0000 (+0000)
Subject: add some i18n
X-Git-Tag: archiva-1.4-M3~1704
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=04934dc2944d31ef1ea3c1a0034f74030274ee1a;p=archiva.git

add some i18n

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
index 79a633ee5..979aebb2e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
@@ -1,7 +1,7 @@
 
   <div class='well' id="main-menu" redback-permissions="{permissions: ['archiva-manage-users']}" style="display: none">
     <ul class="navigation">
-      <li style="display: none" redback-permissions="{permissions: ['archiva-manage-users']}"><a href="#" onclick="displayUsersGrid()">User List</a></li>
+      <li style="display: none" redback-permissions="{permissions: ['archiva-manage-users']}"><a href="#" onclick="displayUsersGrid()">${$.i18n.prop('users.list')}</a></li>
       <li style="display: none" redback-permissions="{permissions: ['archiva-manage-users']}"><a href="#" onclick="displayRolesGrid()">Role List</a></li>
     </ul>
   </div>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js
index b2cd1df54..c1d331ebe 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js
@@ -29,6 +29,9 @@
         this.maxPageIndex = ko.dependentObservable(function () {
             return Math.ceil(ko.utils.unwrapObservable(this.data).length / this.pageSize);
         }, this);
+        this.i18n=function(key){
+          return $.i18n.prop(key);
+        };
       }
     };
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
index 9d66734ff..0fed206a7 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
@@ -29,6 +29,5 @@ require(["text!redback/templates/user-edit.html", "text!redback/templates/user-g
       // template loading
       $("#html-fragments").append(usercreate);
       $("#html-fragments").append(usergrids);
-
     }
 );
\ No newline at end of file
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 af413da71..f4c655122 100644
--- 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
@@ -4,10 +4,10 @@
           {{each(i, columnDefinition) columns}}
               <th>${ columnDefinition.headerText }</th>
           {{/each}}
-          <th>Edit</th>
-          <th>Delete</th>
-          <th>Locked</th>
-          <th>Change password required</th>
+          <th>${$.i18n.prop('edit')}</th>
+          <th>${$.i18n.prop('delete')}</th>
+          <th>${$.i18n.prop('user.list.locked')}</th>
+          <th>${$.i18n.prop('user.change.password.required')}</th>
       </tr>
   </thead>
   <tbody>
@@ -22,7 +22,7 @@
               {{else}}
                 <td>
                   <a href="#" data-bind="click: function(){ row.deleteUser() }">
-                    <img src="images/delete.png" alt="Delete"/>
+                    <img src="images/delete.png" alt="${$.i18n.prop('delete')}"/>
                   </a>
                 </td>
               {{/if}}
@@ -88,14 +88,14 @@
 
 <script id="usersGrid"  type="text/x-jquery-tmpl">
     <div class="page-header">
-      <h2>Users list</h2>
+      <h2>${$.i18n.prop('users.list')}</h2>
     </div>
     <ul id="users-view-tabs" class="tabs">
       <li class="active" id="users-view-tabs-li-users-grid">
-        <a href="#users-view">Users</a>
+        <a href="#users-view">${$.i18n.prop('users.grid.tab.title')}</a>
       </li>
       <li id="users-view-tabs-li-user-edit">
-        <a href="#createUserForm">{window.redbackModel.i18n('user.add')}</a>
+        <a href="#createUserForm">${$.i18n.prop('user.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/users.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
index 399947525..710fa5c85 100644
--- 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
@@ -154,7 +154,6 @@ $(function() {
       });
 
     }
-
   }
 
   /**
@@ -164,6 +163,7 @@ $(function() {
     screenChange();
     jQuery("#main-content").attr("data-bind","");
     jQuery("#main-content").html($("#usersGrid").html());
+    jQuery("#main-content").attr("data-bind",'template: {name:"usersGrid"}');
     window.redbackModel.usersViewModel = new usersViewModel();
     window.redbackModel.usersViewModel.loadUsers();
     ko.applyBindings(window.redbackModel.usersViewModel,jQuery("#main-content").get(0));