From: Olivier Lamy <olamy@apache.org>
Date: Fri, 10 Feb 2012 10:21:51 +0000 (+0000)
Subject: add missing i18n and fix popover title as attribute has changed in bootstrap 2.0
X-Git-Tag: archiva-1.4-M3~1335
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6252538ec344c5e66b091de7b3ba4a434bf86441;p=archiva.git

add missing i18n and fix popover title as attribute has changed in bootstrap 2.0

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1242725 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 ac437fd3e..3dc72f980 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
@@ -91,10 +91,6 @@ remoteDownloadNetworkProxyId=Proxy for Remote Download Index
 downloadRemoteIndexOnStartup=Download Remote Index on Startup
 remoteDownloadTimeout=Download Remote Timeout
 
-#proxy connector
-proxy-connectors.grid.remoterepo.settings.popover.title=Settings
-proxy-connectors.remoterepo.settings.networkproxy=Network Proxy
-
 #network proxy
 networkproxy.updated=Network Proxy " {0} " updated.
 networkproxy.added=Network Proxy " {0} " added.
@@ -140,4 +136,8 @@ proxy-connectors.grid.remoterepo.title=Remote Repository
 proxy-connectors.grid.managedrepo.title=Managed Repository
 proxy-connector.blacklist=Black List
 proxy-connector.whitelist=White List
+proxyconnector.removed=ProxyConnector removed.
+proxyconnector.added=ProxyConnector added.
+proxy-connectors.grid.remoterepo.settings.popover.title=Proxy Connector Settings
+proxy-connectors.remoterepo.settings.networkproxy=Network Proxy
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
index 71e2dbc14..6b0f89ffe 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
@@ -301,8 +301,7 @@ $(function() {
       targetImg.popover(
           {
             placement: "left",
-            html: true,
-            title: "popover-title"
+            html: true
           }
       );
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
index 9a3e3559f..e931970aa 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
@@ -433,8 +433,7 @@ $(function() {
             mainContent.find("#managedrepository-stats-img-"+curRepo.id()).popover(
                 {
                   placement: "left",
-                  html: true,
-                  title: "popover-title"
+                  html: true
                 }
             );
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
index 4bc6413be..5412ac869 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
@@ -64,7 +64,7 @@
       <td>${row.sourceRepoId()}</td>
       <td>${row.targetRepoId()}-${row.order()}</td>
       <td>
-        <a popover-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}"
+        <a data-original-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}"
            data-bind="event: { mouseover: function(){ showSettings(row)},},click: function(){ editProxyConnector(row)}"
            id="proxy-connectors-grid-remoterepo-settings-edit-${row.sourceRepoId()}-${row.targetRepoId()}" href="#">
            ${$.i18n.prop('edit')}
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
index 0c8692fe7..37fca2559 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
@@ -134,7 +134,7 @@
             {{/if}}
             <td><a href="#" data-bind="click: function(){ showPomSnippet(row) }">${$.i18n.prop('managedrepository.pomsnippet')}</a></td>
             <td id="managedrepository-stats-${row.id()}">
-              <img src="images/utilities-system-monitor.png" popover-title="${$.i18n.prop('managedrepository.stats')}"
+              <img src="images/utilities-system-monitor.png" data-original-title="${$.i18n.prop('managedrepository.stats')}"
                    data-bind="event: { mouseover: function(){ showStats(row) }, mouseout: function(){ hideStats(row) },}"
                    id="managedrepository-stats-img-${row.id()}"/>
             </td>