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 2013/01/02 11:51:22 UTC
svn commit: r1427726 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html
Author: olamy
Date: Wed Jan 2 10:51:22 2013
New Revision: 1427726
URL: http://svn.apache.org/viewvc?rev=1427726&view=rev
Log:
add i18n for users filtering
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1427726&r1=1427725&r2=1427726&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties Wed Jan 2 10:51:22 2013
@@ -260,6 +260,12 @@ users.grid.unlock=Unlock
users.grid.lock=Lock
users.grid.unforceChangePassword=Not force password change
users.grid.forceChangePassword=Force password change
+users.grid.filter.all=All
+users.grid.filter.locked=Locked
+users.grid.filter.not.locked=Not Locked
+users.grid.filter.pwd.change.required=Password Change required
+users.grid.filter.pwd.change.not.required=Password Change not required
+users.grid.filter=Filter
#roles management
roles.management.header=Roles Management
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html?rev=1427726&r1=1427725&r2=1427726&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html Wed Jan 2 10:51:22 2013
@@ -194,7 +194,7 @@
<th>
{{if columnDefinition.filter }}
<input type="text" class="form-search input-medium" id="users-grid-filter-auto-${columnDefinition.rowText}"
- placeholder="${$.i18n.prop('search.artifact.result.grid.filter')}"/>
+ placeholder="${$.i18n.prop('users.grid.filter')}"/>
{{/if}}
</th>
{{/each}}
@@ -309,7 +309,7 @@
<button data-bind='click: sortByName' class="btn">
${$.i18n.prop('users.sort.byname')}
</button>
- <a href="#" class="btn btn-warning" data-bind="click: clearFilters" id="remove-filter-id">${$.i18n.prop('search.artifact.result.filter')}</a>
+ <a href="#" class="btn btn-warning" data-bind="click: clearFilters" id="remove-filter-id">${$.i18n.prop('users.grid.filter')}</a>
<table class="table table-striped table-bordered" id="usersTable"
data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_usersGrid_grid',pageLinksId:'usersPagination'">
</table>