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 15:41:15 UTC
svn commit: r1238623 - 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 14:41:14 2012
New Revision: 1238623
URL: http://svn.apache.org/viewvc?rev=1238623&view=rev
Log:
fix i18n for network proxy update
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=1238623&r1=1238622&r2=1238623&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 14:41:14 2012
@@ -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.setting
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
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=1238623&r1=1238622&r2=1238623&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 14:41:14 2012
@@ -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);