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 2012/01/31 11:17:45 UTC
svn commit: r1238361 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
Author: olamy
Date: Tue Jan 31 10:17:45 2012
New Revision: 1238361
URL: http://svn.apache.org/viewvc?rev=1238361&view=rev
Log:
fix i18n when updating network proxy
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/archiva/network-proxies.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=1238361&r1=1238360&r2=1238361&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 10:17:45 2012
@@ -57,4 +57,7 @@ remoterepository.downloadremoteindex.now
#proxy connector
proxy-connectors.grid.remoterepo.settings.popover.title=Settings
-proxy-connectors.remoterepo.settings.networkproxy=Network Proxy
\ No newline at end of file
+proxy-connectors.remoterepo.settings.networkproxy=Network Proxy
+
+#network proxy
+networkproxy.updated=Network Proxy '{0}' updated.
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js?rev=1238361&r1=1238360&r2=1238361&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js Tue Jan 31 10:17:45 2012
@@ -67,7 +67,7 @@ $(function() {
data: "{\"networkProxy\": " + ko.toJSON(networkProxy)+"}",
dataType: 'json',
success: function(data) {
- displaySuccessMessage($.i18n.prop('networkproxy.updated'));
+ displaySuccessMessage($.i18n.prop('networkproxy.updated',self.networkProxy.id()));
self.networkProxy.modified(false);
activateNetworkProxiesGridTab();
},
@@ -163,9 +163,11 @@ $(function() {
var viewModel = new NetworkProxyViewModel(new NetworkProxy(),false,networkProxiesViewModel);
ko.applyBindings(viewModel,$("#main-content #network-proxies-edit").get(0));
activateNetworkProxyFormValidation();
+ clearUserMessages();
}
if ($(e.target).attr("href")=="#network-proxies-view") {
$("#main-content #network-proxies-view-tabs-li-edit a").html($.i18n.prop("add"));
+ clearUserMessages();
}
});
@@ -236,6 +238,7 @@ $(function() {
$("#main-content #network-proxies-view-tabs-li-grid").addClass("active");
$("#main-content #network-proxies-view").addClass("active");
$("#main-content #network-proxies-view-tabs-li-edit a").html($.i18n.prop("add"));
+
}
activateNetworkProxyEditTab=function(){
@@ -244,7 +247,6 @@ $(function() {
$("#main-content #network-proxies-view-tabs-li-edit").addClass("active");
$("#main-content #network-proxies-edit").addClass("active");
-
}
mapNetworkProxy=function(data){