From: Olivier Lamy <olamy@apache.org>
Date: Tue, 31 Jan 2012 14:41:14 +0000 (+0000)
Subject: fix i18n for network proxy update
X-Git-Tag: archiva-1.4-M3~1414
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5db02d0bfa245f521a1751a3b81701dd85900ae8;p=archiva.git

fix i18n for network proxy update

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

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index e9ad903c3..53f74cb52 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -35,6 +35,7 @@ save=Save
 identifier=Id
 url=Url
 directory=Directory
+save.all=Save all
 
 
 administration.repositories=Repositories Administration
@@ -93,7 +94,7 @@ proxy-connectors.grid.remoterepo.settings.popover.title=Settings
 proxy-connectors.remoterepo.settings.networkproxy=Network Proxy
 
 #network proxy
-networkproxy.updated=Network Proxy '{0}' updated.
+networkproxy.updated=Network Proxy " {0} " updated.
 network-proxies.grid.tab.title=Network Proxies
 network-proxies.list=Network Proxies
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
index 893fdf147..367d20eee 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
@@ -70,7 +70,9 @@ $(function() {
             data: "{\"networkProxy\": " + ko.toJSON(networkProxy)+"}",
             dataType: 'json',
             success: function(data) {
-              displaySuccessMessage($.i18n.prop('networkproxy.updated',self.networkProxy.id()));
+              $.log("update proxy id:"+self.networkProxy.id());
+              var message=$.i18n.prop('networkproxy.updated',self.networkProxy.id());
+              displaySuccessMessage(message);
               self.networkProxy.modified(false);
               if (!this.bulkMode){
                 activateNetworkProxiesGridTab();
@@ -118,6 +120,7 @@ $(function() {
     this.gridViewModel = null;
 
     editNetworkProxy=function(networkProxy){
+      clearUserMessages();
       $.log("editNetworkProxy");
       $("#main-content #network-proxies-view-tabs-li-edit a").html($.i18n.prop("edit"));
       var viewModel = new NetworkProxyViewModel(networkProxy,true,self);