[FIXED JENKINS-24032] Different message when restart is not supported.

jenkinsci · Aug 3, 2014 · 563388f · 563388f
1 parent 551c968
commit 563388f
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 6 deletions.
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.jelly b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.jelly
@@ -29,7 +29,15 @@ THE SOFTWARE.
     <j:set var="upJob" value="${app.updateCenter.hudsonJob}" />
     <j:choose>
       <j:when test="${upJob.status.success}">
-        ${%UpgradeComplete(ucData.core.version,rootURL)}
+        <j:invokeStatic var="lifecycle" className="hudson.lifecycle.Lifecycle" method="get" />
+        <j:choose>
+          <j:when test="${lifecycle.canRestart()}">
+            ${%UpgradeComplete(ucData.core.version,rootURL)}
+          </j:when>
+          <j:otherwise>
+            ${%UpgradeCompleteRestartNotSupported(ucData.core.version)}
+          </j:otherwise>
+        </j:choose>
       </j:when>
       <j:when test="${upJob!=null}">
         ${%UpgradeProgress(ucData.core.version,rootURL+'/updateCenter/')}

diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.properties
@@ -23,4 +23,5 @@
 NewVersionAvailable=New version of Jenkins ({0}) is available for <a href="{1}">download</a> \
   (<a href="http://jenkins-ci.org/changelog.html">changelog</a>).
 UpgradeComplete=Upgrade to Jenkins {0} is complete, awaiting <a href="{1}/safeRestart">restart</a>.
+UpgradeCompleteRestartNotSupported=Upgrade to Jenkins {0} is complete, awaiting restart.
 UpgradeProgress=Upgrade to Jenkins {0} is <a href="{1}">in progress or failed</a>.
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_cs.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_cs.properties
@@ -23,3 +23,4 @@
 NewVersionAvailable=Nov\u00E1 verze Jenkins-u ({0}) je k dispozici <a href="{1}">ke sta\u017Een\u00ED</a> (<a href="http://jenkins-ci.org/changelog.html">changelog</a>).
 Or\ Upgrade\ Automatically=Nebo Upgradovat Automaticky
 UpgradeComplete=Upgrade na Jenkinse {0} je hotov, \u010Dek\u00E1 na <a href="{1}/safeRestart">restart</a>.
+UpgradeCompleteRestartNotSupported=Upgrade na Jenkinse {0} je hotov, \u010Dek\u00E1 na restart.
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_da.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_da.properties
@@ -20,7 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-UpgradeComplete=Opdatering til Jenkins {0} er fuldf\u00f8rt, afventer genstart.
+UpgradeComplete=Opdatering til Jenkins {0} er fuldf\u00f8rt, afventer <a href="{1}/safeRestart">genstart</a>.
+UpgradeCompleteRestartNotSupported=Opdatering til Jenkins {0} er fuldf\u00f8rt, afventer genstart.
 UpgradeProgress=Opdatering til Jenkins {0} er <a href="{1}">i gang eller er fejlet</a>.
 Or\ Upgrade\ Automatically=Eller opdater automatisk
 NewVersionAvailable=En ny version af Jenkins ({0}) er tilg\u00e6ngelig til <a href="{1}">hentning</a> \

diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_de.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_de.properties
@@ -20,7 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-UpgradeComplete=Aktualisierung auf Jenkins {0} abgeschlossen. <a href="{1}/safeRestart">Neustart von Jenkins</a> erforderlich.	
+UpgradeComplete=Aktualisierung auf Jenkins {0} abgeschlossen. <a href="{1}/safeRestart">Neustart von Jenkins</a> erforderlich.
+UpgradeCompleteRestartNotSupported=Aktualisierung auf Jenkins {0} abgeschlossen. Neustart von Jenkins erforderlich.
 UpgradeProgress=Aktualisierung auf Jenkins {0} <a href="{1}">in Arbeit oder fehlgeschlagen</a>.
 NewVersionAvailable=Eine neue Version von Jenkins ({0}) kann <a href="{1}">hier heruntergeladen</a> werden (<a href="http://jenkins-ci.org/changelog.html">Was ist neu?</a>).
 Or\ Upgrade\ Automatically=Automatisch aktualisieren
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_es.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_es.properties
@@ -22,5 +22,6 @@
 
 NewVersionAvailable=Hay una nueva versión de Jenkins disponible ({0}). <a href="{1}">descargar</a> (<a href="http://jenkins-ci.org/changelog.html">listado de cambios</a>).
 Or\ Upgrade\ Automatically=O actualizar automáticamente
-UpgradeComplete=La actualización a Jenkins {0} se ha completado, esperando para reiniciar.
+UpgradeComplete=La actualización a Jenkins {0} se ha completado, esperando para <a href="{1}/safeRestart">reiniciar</a>.
+UpgradeCompleteRestartNotSupported=La actualización a Jenkins {0} se ha completado, esperando para reiniciar.
 UpgradeProgress=La actualización a Jenkins {0} está en <a href="{1}">ejecución o ha fallado</a>.
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_fr.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_fr.properties
@@ -24,3 +24,4 @@ NewVersionAvailable=Une nouvelle version de Jenkins ({0}) est <a href="{1}">disp
 Or\ Upgrade\ Automatically=Ou mettre \u00E0 jour automatiquement
 UpgradeProgress=Mise \u00E0 jour vers Jenkins {0} est <a href="{1}">en cours ou en \u00E9chec</a>.
 UpgradeComplete=La mise \u00E0 jour de Jenkins en {0} est termin\u00E9e, en attente de <a href="{1}/safeRestart">red\u00E9marrage</a>.
+UpgradeCompleteRestartNotSupported=La mise \u00E0 jour de Jenkins en {0} est termin\u00E9e, en attente de red\u00E9marrage.
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_it.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_it.properties
@@ -23,4 +23,5 @@
 NewVersionAvailable=C''\u00E8 una nuova versione di Jenkins ({0}) disponibile per il <a href="{1}">download</a> (<a href="http://jenkins-ci.org/changelog.html">changelog</a>).
 Or\ Upgrade\ Automatically=Oppure aggiorna automaticamente
 UpgradeComplete=Aggiornamento a Jenkins {0} completato, in attesa di <a href="{1}/safeRestart">riavvio</a>.
+UpgradeCompleteRestartNotSupported=Aggiornamento a Jenkins {0} completato, in attesa di riavvio.
 UpgradeProgress=Aggiornamento a Jenkins {0} <a href="{1}">in corso oppure fallito</a>.
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_lv.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_lv.properties
@@ -23,3 +23,4 @@
 NewVersionAvailable=Jauna Jenkins ({0}) versija ir pieejama <a href="{1}">lejupl\u0101dei</a> (<a href="http://jenkins-ci.org/changelog.html">izmai\u0146as</a>).
 Or\ Upgrade\ Automatically=Vai atjaunin\u0101t autom\u0101tiski
 UpgradeComplete=Atjaunin\u0101s\u0101na uz Jenkins {0} ir pabeigta; gaidu <a href="{1}/safeRestart">p\u0101rstart\u0113\u0161anos</a>.
+UpgradeCompleteRestartNotSupported=Atjaunin\u0101s\u0101na uz Jenkins {0} ir pabeigta; gaidu p\u0101rstart\u0113\u0161anos.
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_nl.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_nl.properties
@@ -22,4 +22,5 @@
 
 NewVersionAvailable=Er is een nieuwere versie van Jenkins ({0}) beschikbaar. <a href="{1}">downloaden</a> (<a href="http://jenkins-ci.org/changelog.html">changelog</a>).
 Or\ Upgrade\ Automatically=Of werk automatisch bij
-UpgradeComplete=Upgrade naar Jenkins {0} is volledig; aan het wachten op herstart.
+UpgradeComplete=Upgrade naar Jenkins {0} is volledig; aan het wachten op <a href="{1}/safeRestart">herstart</a>.
+UpgradeCompleteRestartNotSupported=Upgrade naar Jenkins {0} is volledig; aan het wachten op herstart.
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pt_BR.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_pt_BR.properties
@@ -21,7 +21,8 @@
 # THE SOFTWARE.
 
 # Upgrade to Jenkins {0} is complete, awaiting restart.
-UpgradeComplete=Atualiza\u00e7\u00e3o do Jenkins {0} completa, aguardando reiniciar.
+UpgradeComplete=Atualiza\u00e7\u00e3o do Jenkins {0} completa, aguardando <a href="{1}/safeRestart">reiniciar</a>.
+UpgradeCompleteRestartNotSupported=Atualiza\u00e7\u00e3o do Jenkins {0} completa, aguardando reiniciar.
 # Upgrade to Jenkins {0} is <a href="{1}">in progress or failed</a>.
 UpgradeProgress=Atualiza\u00e7\u00e3o para Jenkins {0} est\u00e1 <a href="{1}">em andamento ou falhou</a>.
 Or\ Upgrade\ Automatically=Ou fazer a atualiza\u00e7\u00e3o automaticamente.

diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_ru.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_ru.properties
@@ -23,4 +23,5 @@
 NewVersionAvailable=\u041D\u043E\u0432\u0430\u044F \u0432\u0435\u0440\u0441\u0438\u044F Jenkins ({0}) \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0430 \u0434\u043B\u044F <a href="{1}">\u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438</a> (<a href="http://jenkins-ci.org/changelog.html">\u0441\u043F\u0438\u0441\u043E\u043A \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439</a>).
 Or\ Upgrade\ Automatically=\u0418\u043B\u0438 \u043E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438
 UpgradeComplete=\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0435 \u0434\u043E Jenkins {0} \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u043E, \u043E\u0436\u0438\u0434\u0430\u0435\u0442 <a href="{1}/safeRestart">\u043F\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438</a>.
+UpgradeCompleteRestartNotSupported=\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0435 \u0434\u043E Jenkins {0} \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u043E, \u043E\u0436\u0438\u0434\u0430\u0435\u0442 \u043F\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438.
 UpgradeProgress=\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0435 \u043D\u0430 Jenkins {0} <a href="{1}">\u0432\u044B\u043F\u043E\u043B\u043D\u044F\u0435\u0442\u0441\u044F \u0438\u043B\u0438 \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043B\u043E\u0441\u044C \u043D\u0435\u0443\u0434\u0430\u0447\u0435\u0439</a>.
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_zh_CN.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_zh_CN.properties
@@ -3,3 +3,4 @@
 NewVersionAvailable=Jenkins\u65B0\u7248\u672C ({0})\u53EF\u70B9\u51FB <a href="{1}">download</a> (<a href="http://jenkins-ci.org/changelog.html">\u53D8\u66F4\u8BF4\u660E</a>)\u4E0B\u8F7D\u3002
 Or\ Upgrade\ Automatically=\u6216 \u81EA\u52A8\u5347\u7EA7\u7248\u672C
 UpgradeComplete=Jenkins {0} \u7248\u672C\u5347\u7EA7\u5DF2\u5B8C\u6210,\u7B49\u5F85<a href="{1}/safeRestart">\u91CD\u542F</a>\u4E2D.
+UpgradeCompleteRestartNotSupported=Jenkins {0} \u7248\u672C\u5347\u7EA7\u5DF2\u5B8C\u6210,\u7B49\u5F85\u91CD\u542F\u4E2D.
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_zh_TW.properties b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_zh_TW.properties
@@ -22,6 +22,7 @@
 # THE SOFTWARE.
 
 UpgradeComplete=Jenkins {0} \u5347\u7248\u5b8c\u6210\uff0c\u7b49\u5019<a href="{1}/safeRestart">\u91cd\u65b0\u555f\u52d5</a>\u3002
+UpgradeCompleteRestartNotSupported=Jenkins {0} \u5347\u7248\u5b8c\u6210\uff0c\u7b49\u5019\u91cd\u65b0\u555f\u52d5\u3002
 UpgradeProgress=Jenkins {0} \u5347\u7d1a\u4f5c\u696d<a href="{1}">\u6b63\u5728\u9032\u884c\u4e2d\u6216\u662f\u5df2\u7d93\u5931\u6557</a>\u3002
 NewVersionAvailable=\u65b0\u7248\u7684 Jenkins ({0}) \u5df2\u7d93\u53ef\u4ee5<a href="{1}">\u4e0b\u8f09</a> (<a href="http://jenkins-ci.org/changelog.html">\u6539\u7248\u8a18\u9304</a>)\u3002
 Or\ Upgrade\ Automatically=\u6216\u662f\u81ea\u52d5\u5347\u7248