Author: olamy
Date: Tue Jan 31 12:17:50 2012
New Revision: 1238434
URL: http://svn.apache.org/viewvc?rev=1238434&view=rev
Log:
more i18n
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-js/src/main/webapp/js/redback/templates/user-edit.html
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/user.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
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=1238434&r1=1238433&r2=1238434&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
Tue Jan 31 12:17:50 2012
@@ -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 Sca
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
+
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html?rev=1238434&r1=1238433&r2=1238434&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html
Tue Jan 31 12:17:50 2012
@@ -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>
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=1238434&r1=1238433&r2=1238434&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
Tue Jan 31 12:17:50 2012
@@ -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">
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js?rev=1238434&r1=1238433&r2=1238434&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
Tue Jan 31 12:17:50 2012
@@ -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;
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=1238434&r1=1238433&r2=1238434&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
Tue Jan 31 12:17:50 2012
@@ -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"));
}
})
