diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index 2fce8ae5a52a..6114152522d6 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -1437,7 +1437,7 @@ public HttpResponse doPluginsSearch(@QueryParameter String query, @QueryParamete jsonObject.put("releaseTimestamp", releaseTimestamp); } if (hasLatestVersionNewerThanOffered(plugin)) { - jsonObject.put("newerVersionAvailableNotOffered", Messages.PluginManager_newerVersionExists(plugin.latest)); + jsonObject.put("newerVersionAvailableNotOffered", Messages.PluginManager_newerVersionExists(plugin.latest, plugin.wiki)); } return jsonObject; }) diff --git a/core/src/main/resources/hudson/Messages.properties b/core/src/main/resources/hudson/Messages.properties index 269870d713f2..596e23ba8c45 100644 --- a/core/src/main/resources/hudson/Messages.properties +++ b/core/src/main/resources/hudson/Messages.properties @@ -91,12 +91,10 @@ PluginManager.adoptThisPlugin=\ This plugin is up for adoption! We are looking for new maintainers. \ Visit our Adopt a Plugin initiative for more information. PluginManager.newerVersionExists=\ - A newer version than being offered for installation exists (version {0}). \ - This is typically the case when plugin requirements, e.g. a recent version of Jenkins, are not satisfied. -PluginManager.newerVersionEntry=\ - This version of the plugin exists but it is not being offered as an update. \ + A newer version than being offered for installation exists (version {0}), so the latest bug fixes or features are not available to you. \ This is typically the case when plugin requirements, e.g. a recent version of Jenkins, are not satisfied. \ - See the plugin documentation for information about its requirements. + If you are using the latest version of Jenkins offered to you, this plugin release may not be available to your release line yet. \ + See the plugin documentation for information about its requirements. PluginManager.unavailable=Unavailable PluginManager.deprecationWarning=This plugin is deprecated. In general, this means that it is either obsolete, no longer being developed, or may no longer work. Learn more. PluginManager.insecureUrl=\ diff --git a/core/src/main/resources/hudson/Messages_es.properties b/core/src/main/resources/hudson/Messages_es.properties index 79a08114bc74..48f6eafe19cf 100644 --- a/core/src/main/resources/hudson/Messages_es.properties +++ b/core/src/main/resources/hudson/Messages_es.properties @@ -91,13 +91,6 @@ PluginManager.ago=Hace {0} PluginManager.adoptThisPlugin=\ \u00a1Este plugin est\u00e1 en adopci\u00f3n! Buscamos nuevos mantenedores. \ Visita nuestro sitio de la iniciativa Adopte un plugin para obtener m\u00e1s informaci\u00f3n. -PluginManager.newerVersionExists=\ - Existe una versi\u00f3n m\u00e1s nueva que la que se ofrece para la instalaci\u00f3n (versi\u00f3n {0}). \ - Este es el t\u00edpico caso en el que no se satisfacen los requisitos del plugin, por ejemplo, una versi\u00f3n m\u00e1s reciente de Jenkins es necesaria. -PluginManager.newerVersionEntry=\ - Esta versi\u00f3n del plugin existe pero no se ofrece como actualizaci\u00f3n. \ - Este es el t\u00edpico caso en el que no se satisfacen los requisitos del plugin, por ejemplo, una versi\u00f3n m\u00e1s reciente de Jenkins es necesaria. \ - Consulte la documentaci\u00f3n del plugin para obtener informaci\u00f3n sobre sus requisitos. PluginManager.unavailable=No disponible PluginManager.deprecationWarning=Este plugin est\u00e1 obsoleto. En general, esto significa que ya no se desarrolla o que puede dejar de funcionar. M\u00e1s informaci\u00f3n diff --git a/core/src/main/resources/hudson/PluginManager/table.jelly b/core/src/main/resources/hudson/PluginManager/table.jelly index feef003ce2a0..4f0976b5e121 100644 --- a/core/src/main/resources/hudson/PluginManager/table.jelly +++ b/core/src/main/resources/hudson/PluginManager/table.jelly @@ -206,7 +206,7 @@ THE SOFTWARE.
- ${%newerVersionExists(p.latest)} + ${%newerVersionExists(p.latest, p.wiki)}
diff --git a/core/src/main/resources/hudson/PluginManager/table.properties b/core/src/main/resources/hudson/PluginManager/table.properties index 78ee0550a203..8ce95cfae4a4 100644 --- a/core/src/main/resources/hudson/PluginManager/table.properties +++ b/core/src/main/resources/hudson/PluginManager/table.properties @@ -48,7 +48,7 @@ newerVersionExists=\ A newer version than being offered for installation exists (version {0}), so the latest bug fixes or features are not available to you. \ This is typically the case when plugin requirements, e.g. a recent version of Jenkins, are not satisfied. \ If you are using the latest version of Jenkins offered to you, this plugin release may not be available to your release line yet. \ - See the plugin documentation for information about its requirements. + See the plugin documentation for information about its requirements. newerVersionEntry=\ This version of the plugin exists but it is not being offered for installation, so the latest bug fixes or features are not available to you. \ This is typically the case when plugin requirements, e.g. a recent version of Jenkins, are not satisfied. \ diff --git a/core/src/main/resources/hudson/PluginManager/table_it.properties b/core/src/main/resources/hudson/PluginManager/table_it.properties index 4b62e3f54c4e..7de090dbf871 100644 --- a/core/src/main/resources/hudson/PluginManager/table_it.properties +++ b/core/src/main/resources/hudson/PluginManager/table_it.properties @@ -70,16 +70,6 @@ instructions=Utilizzare la casella di ricerca soprastante per cercare i \ componenti aggiuntivi disponibili. loading=Caricamento elenco componenti aggiuntivi in corso... Name=Nome -newerVersionEntry=Questa versione del componente aggiuntivo esiste ma non è \ - offerta come aggiornamento. Questo è il caso tipico se non sono soddisfatti \ - dei requisiti relativi ai componenti aggiuntivi, ad es. disporre di una \ - versione recente di Jenkins. Si veda la \ - documentazione del componente aggiuntivo \ - per ulteriori informazioni relative ai suoi requisiti. -newerVersionExists=Per questo componente aggiuntivo esiste una versione più \ - recente di quella offerta per l''installazione (versione {0}). Questo è il \ - caso tipico se non sono soddisfatti dei requisiti relativi ai componenti \ - aggiuntivi, ad es. disporre di una versione recente di Jenkins. No\ updates=Nessun aggiornamento disponibile parentCompatWarning=I seguenti componenti aggiuntivi sono affetti da questo \ problema: diff --git a/core/src/main/resources/hudson/PluginManager/table_pl.properties b/core/src/main/resources/hudson/PluginManager/table_pl.properties index 97ba90495491..801ad49a869d 100644 --- a/core/src/main/resources/hudson/PluginManager/table_pl.properties +++ b/core/src/main/resources/hudson/PluginManager/table_pl.properties @@ -40,9 +40,5 @@ ago={0} temu adoptThisPlugin=\ Ta wtyczka czeka na adopcje! Szukamy os\u00F3b ch\u0119tnych rozwija\u0107 t\u0119 wtyczk\u0119. \ Przeczytaj nasz\u0105 inicjatyw\u0119 Adopt a Plugin, aby uzyska\u0107 wi\u0119cej informacji. -newerVersionEntry=\ - Ta wersja wtyczki istnieje, ale nie jest dost\u0119pna jej aktualizacja. \ - Najcz\u0119\u015Bciej jest to spowodowane tym, \u017Ce np. wtyczka wymaga nowszej wersji Jenkinsa, co nie jest spe\u0142nione. \ - Sprawd\u017A dokumentacje wtyczki celem weryfikacji tych wymaga\u0144. unavailable=Niedost\u0119pna -Applying\ this\ update\ will\ address\ security\ vulnerabilities\ in\ the\ currently\ installed\ version.=Zainstalowanie tej aktualizacji usunie podatno\u015Bci wyst\u0119puj\u0105ce w aktualnie zainstalowanej wersji. \ No newline at end of file +Applying\ this\ update\ will\ address\ security\ vulnerabilities\ in\ the\ currently\ installed\ version.=Zainstalowanie tej aktualizacji usunie podatno\u015Bci wyst\u0119puj\u0105ce w aktualnie zainstalowanej wersji. diff --git a/core/src/main/resources/hudson/model/User/error.jelly b/core/src/main/resources/hudson/model/User/error.jelly new file mode 100644 index 000000000000..b7fbdf852b05 --- /dev/null +++ b/core/src/main/resources/hudson/model/User/error.jelly @@ -0,0 +1,15 @@ + + + + + + + + + + +

${%Error}

+

${message}

+
+
+
diff --git a/pom.xml b/pom.xml index 04a02264892e..edafc74165b1 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ THE SOFTWARE. - 2.355 + 2.356 -SNAPSHOT - 3025.vf64a_a_3da_6b_55 + 3028.va_a_436db_35078 3.14 @@ -102,7 +102,7 @@ THE SOFTWARE. 1.23 5.8.2 4.6.1 - 2.22.7 + 2.22.8 diff --git a/war/src/main/webapp/scripts/sortable.js b/war/src/main/webapp/scripts/sortable.js index a3e10694eab1..108f20661030 100644 --- a/war/src/main/webapp/scripts/sortable.js +++ b/war/src/main/webapp/scripts/sortable.js @@ -368,7 +368,7 @@ var Sortable = (function() { if (itm.match(date_pattern)) sortfn = this.date; if (itm.match(/^[�$]/)) sortfn = this.currency; if (itm.match(/\%$/)) sortfn = this.percent; - if (itm.match(/^-?[\d\.]+$/)) sortfn = this.numeric; + if (itm.match(/^-?[\d]+(\.[\d]+)?$/)) sortfn = this.numeric; return sortfn; },