You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/12/19 14:25:47 UTC
svn commit: r1220734 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js:
archiva/templates/menu.html knockout.simpleGrid.js redback/redback-tmpl.js
redback/templates/user-grids.html redback/users.js
Author: olamy
Date: Mon Dec 19 13:25:46 2011
New Revision: 1220734
URL: http://svn.apache.org/viewvc?rev=1220734&view=rev
Log:
add some i18n
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html?rev=1220734&r1=1220733&r2=1220734&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html Mon Dec 19 13:25:46 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js?rev=1220734&r1=1220733&r2=1220734&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js Mon Dec 19 13:25:46 2011
@@ -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);
+ };
}
};
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js?rev=1220734&r1=1220733&r2=1220734&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js Mon Dec 19 13:25:46 2011
@@ -29,6 +29,5 @@ require(["text!redback/templates/user-ed
// template loading
$("#html-fragments").append(usercreate);
$("#html-fragments").append(usergrids);
-
}
);
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html?rev=1220734&r1=1220733&r2=1220734&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html Mon Dec 19 13:25:46 2011
@@ -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">
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js?rev=1220734&r1=1220733&r2=1220734&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js Mon Dec 19 13:25:46 2011
@@ -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));