Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JENKINS-71244] Avoid relative link in update center #7992

Merged
merged 2 commits into from
May 31, 2023
Merged

[JENKINS-71244] Avoid relative link in update center #7992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c209df3
[JENKINS-71244] Avoid relative link in update center
Bananeweizen May 13, 2023
ec153d0
Merge branch 'master' into proxy_link
NotMyFault May 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/java/hudson/model/UpdateCenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1665,7 +1665,7 @@ public void run() {
if (e.getMessage().contains("Connection timed out")) {
// Google can't be down, so this is probably a proxy issue
connectionStates.put(ConnectionStatus.INTERNET, ConnectionStatus.FAILED);
statuses.add(Messages.UpdateCenter_Status_ConnectionFailed(Functions.xmlEscape(connectionCheckUrl)));
statuses.add(Messages.UpdateCenter_Status_ConnectionFailed(Functions.xmlEscape(connectionCheckUrl), Jenkins.get().getRootUrl()));
return;
}
}
Expand All @@ -1687,7 +1687,7 @@ public void run() {
statuses.add(Messages.UpdateCenter_Status_Success());
} catch (UnknownHostException e) {
connectionStates.put(ConnectionStatus.UPDATE_SITE, ConnectionStatus.FAILED);
statuses.add(Messages.UpdateCenter_Status_UnknownHostException(Functions.xmlEscape(e.getMessage())));
statuses.add(Messages.UpdateCenter_Status_UnknownHostException(Functions.xmlEscape(e.getMessage()), Jenkins.get().getRootUrl()));
addStatus(e);
error = e;
} catch (Exception e) {
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/resources/hudson/model/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,10 @@ UpdateCenter.Status.CheckingJavaNet=Checking update center connectivity
UpdateCenter.Status.Success=Success
UpdateCenter.Status.UnknownHostException=\
<span class=error>Failed to resolve host name {0}. \
Perhaps you need to <a href="../pluginManager/advanced">configure HTTP proxy?</a></span>
Perhaps you need to <a href="{1}manage/pluginManager/advanced">configure HTTP proxy?</a></span>
UpdateCenter.Status.ConnectionFailed=\
<span class=error>Failed to connect to {0}. \
Perhaps you need to <a href="../pluginManager/advanced">configure HTTP proxy?</a></span>
Perhaps you need to <a href="{1}manage/pluginManager/advanced">configure HTTP proxy?</a></span>
UpdateCenter.init=Initialing update center
UpdateCenter.CoreUpdateMonitor.DisplayName=Jenkins Update Notification

Expand Down Expand Up @@ -407,7 +407,7 @@ Jenkins.IsRestarting=Jenkins is restarting
User.IllegalUsername="{0}" is prohibited as a username for security reasons.
User.IllegalFullname="{0}" is prohibited as a full name for security reasons.

TimeZoneProperty.DisplayName=User Defined Time Zone
TimeZoneProperty.DisplayName=User Defined Time Zone
TimeZoneProperty.DisplayDefaultTimeZone=Default
TimeZoneProperty.current_time_in_=Current time in {0}: {1}
TimeZoneProperty.current_time_on_server_in_in_proposed_di=Current time on server in {0}: {1}; in proposed display zone: {2}
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/model/Messages_bg.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,10 +400,10 @@ UpdateCenter.Status.Success=\
Успех
UpdateCenter.Status.UnknownHostException=\
<span class=error>Неуспешна проверка на адреса „{0}“.\
Вероятно трябва да <a href="../pluginManager/advanced">настроите\
Вероятно трябва да <a href="{1}manage/pluginManager/advanced">настроите\
сървър-посредник за HTTP</a>.</span>
UpdateCenter.Status.ConnectionFailed=\
Вероятно трябва да <a href="../pluginManager/advanced">настроите\
Вероятно трябва да <a href="{1}manage/pluginManager/advanced">настроите\
сървър-посредник за HTTP</a>.</span>
UpdateCenter.init=\
Инициализиране на центъра за обновяване
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/model/Messages_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,10 @@ UpdateCenter.Status.CheckingJavaNet=Überprüfe Zugang zu jenkins-ci.org-Server
UpdateCenter.Status.Success=Erfolgreich
UpdateCenter.Status.UnknownHostException=\
<span class=error>Hostname {0} konnte nicht aufgelöst werden. \
Eventuell sollten Sie einen <a href="../pluginManager/advanced">HTTP-Proxy konfigurieren</a>?</span>
Eventuell sollten Sie einen <a href="{1}manage/pluginManager/advanced">HTTP-Proxy konfigurieren</a>?</span>
UpdateCenter.Status.ConnectionFailed=\
<span class=error>Es konnte keine Verbindung zu {0} aufgebaut werden. \
Eventuell sollten Sie einen <a href="../pluginManager/advanced">HTTP-Proxy konfigurieren</a>?</span>
Eventuell sollten Sie einen <a href="{1}manage/pluginManager/advanced">HTTP-Proxy konfigurieren</a>?</span>
UpdateCenter.init=Initialisiere das Update Center
UpdateCenter.CoreUpdateMonitor.DisplayName=Jenkins-Update-Benachrichtigungen
UpdateCenter.DisplayName=Update-Center
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/model/Messages_es.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,10 @@ UpdateCenter.Status.CheckingJavaNet=Probando conectividad con jenkins-ci.org
UpdateCenter.Status.Success=Correcto
UpdateCenter.Status.UnknownHostException=\
<span class=error>Nombre de servidor imposible de resolver {0}. \
Quizás tengas que configurar to <a href="../pluginManager/advanced">proxy</a></span>
Quizás tengas que configurar to <a href="{1}manage/pluginManager/advanced">proxy</a></span>
UpdateCenter.Status.ConnectionFailed=\
<span class=error>Imposible de conectar con {0}. \
Quizás tengas que configurar to <a href="../pluginManager/advanced">proxy</a></span>
Quizás tengas que configurar to <a href="{1}manage/pluginManager/advanced">proxy</a></span>
UpdateCenter.init=Inicializando centro de actualizaciones
UpdateCenter.PluginCategory.builder=Plugins relacionados con la forma de ejecutar trabajos
UpdateCenter.PluginCategory.buildwrapper=Plugins que añaden tareas relacionadas con la ejecución
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/model/Messages_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ UpdateCenter.Status.CheckingJavaNet=Vérification de la connexion à jenkins-ci.
UpdateCenter.Status.Success=Succès
UpdateCenter.Status.UnknownHostException=\
<span class=error>Impossible de résoudre le nom de host {0}. \
Peut-être devez-vous <a href="../pluginManager/advanced">configurer un proxy HTTP?</a></span>
Peut-être devez-vous <a href="{1}manage/pluginManager/advanced">configurer un proxy HTTP?</a></span>
UpdateCenter.Status.ConnectionFailed=\
<span class=error>Echec lors de la connexion à {0}. \
Peut-être devez-vous <a href="../pluginManager/advanced">configurer le proxy HTTP.</a></span>
Peut-être devez-vous <a href="{1}manage/pluginManager/advanced">configurer le proxy HTTP.</a></span>

Permalink.LastBuild=Dernier build
Permalink.LastStableBuild=Dernier build stable
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/model/Messages_it.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,11 +437,11 @@ UpdateCenter.Status.CheckingJavaNet=Controllo connettività al Centro \
aggiornamenti in corso
UpdateCenter.Status.ConnectionFailed=<span class=error>Impossibile \
connettersi a {0}. Forse è necessario \
<a href="../pluginManager/advanced">configurare il proxy HTTP?</a></span>
<a href="{1}manage/pluginManager/advanced">configurare il proxy HTTP?</a></span>
UpdateCenter.Status.Success=Operazione completata
UpdateCenter.Status.UnknownHostException=<span class=error>Impossibile \
risolvere il nome host {0}. Forse è necessario \
<a href="../pluginManager/advanced">configurare il proxy HTTP?</a></span>
<a href="{1}manage/pluginManager/advanced">configurare il proxy HTTP?</a></span>
User.IllegalFullname="{0}" è vietato come nome completo per motivi di sicurezza.
User.IllegalUsername="{0}" è vietato come nome utente per motivi di sicurezza.
View.ConfigurePermission.Description=Questo permesso consente agli utenti di \
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/model/Messages_ja.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,10 @@ UpdateCenter.Status.CheckingJavaNet=jenkins-ci.orgとの接続をチェックし
UpdateCenter.Status.Success=成功
UpdateCenter.Status.UnknownHostException=\
<span class=error>ホスト名 {0}の解決に失敗しました。 \
たぶん、<a href="../pluginManager/advanced">HTTPプロクシーを設定</a>する必要があります。</span>
たぶん、<a href="{1}manage/pluginManager/advanced">HTTPプロクシーを設定</a>する必要があります。</span>
UpdateCenter.Status.ConnectionFailed=\
<span class=error>{0} との接続に失敗しました。 \
たぶん、<a href="../pluginManager/advanced">HTTPプロクシーを設定</a>する必要があります。</span>
たぶん、<a href="{1}manage/pluginManager/advanced">HTTPプロクシーを設定</a>する必要があります。</span>
UpdateCenter.init=アップデートセンターの初期化中
UpdateCenter.PluginCategory.builder=ビルドツール
UpdateCenter.PluginCategory.buildwrapper=ビルドラッパー
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/model/Messages_lt.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,10 @@ UpdateCenter.Status.CheckingJavaNet=Tikrinamas prisijungimas prie atnaujinimų c
UpdateCenter.Status.Success=Sėkmė
UpdateCenter.Status.UnknownHostException=\
<span class=error>Nepavyko išspręsti stoties pavadinimo {0}. \
Gal jums reikia <a href="../pluginManager/advanced">sukonfigūruoti HTTP šliuzą?</a></span>
Gal jums reikia <a href="{1}manage/pluginManager/advanced">sukonfigūruoti HTTP šliuzą?</a></span>
UpdateCenter.Status.ConnectionFailed=\
<span class=error>Nepavyko prisijungti prie {0}. \
Gal jums reikia <a href="../pluginManager/advanced">sukonfigūruoti HTTP šliuzą?</a></span>
Gal jums reikia <a href="{1}manage/pluginManager/advanced">sukonfigūruoti HTTP šliuzą?</a></span>
UpdateCenter.init=Inicializuojamas atnaujinimų centras
UpdateCenter.PluginCategory.android=Android kūrimas
UpdateCenter.PluginCategory.builder=Kūrimo įrankiai
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/model/Messages_pt_BR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Slave.Remote.Director.Mandatory=Diretório remoto é obrigatório
Run.InProgressDuration={0} e contando
UpdateCenter.Status.UnknownHostException=\
<span class=error>Erro ao resolver o nome do hospedeiro {0}. \
Talvez você precise <a href="../pluginManager/advanced">configurar um proxy HTTP?</a></span>
Talvez você precise <a href="{1}manage/pluginManager/advanced">configurar um proxy HTTP?</a></span>
Hudson.NotUsesUTF8ToDecodeURL=não use caracteres UTF-8 nas URLs
UpdateCenter.Status.CheckingInternet=Checando conexão com a Internet
View.DeletePermission.Description=\
Expand Down Expand Up @@ -203,7 +203,7 @@ Hudson.NotANegativeNumber=Número não negativo
UpdateCenter.PluginCategory.misc=Diversos
UpdateCenter.Status.ConnectionFailed=\
<span class=error>Erro ao conectar em {0}. \
Talvez voê precise <a href="../pluginManager/advanced">configurar um proxy HTTP?</a></span>
Talvez voê precise <a href="{1}manage/pluginManager/advanced">configurar um proxy HTTP?</a></span>
UpdateCenter.PluginCategory.maven=Maven
UpdateCenter.PluginCategory.upload=Carregadores de artefatos
Permalink.LastUnstableBuild=Última construção instável
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/model/Messages_sr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@ UpdateCenter.Status.CheckingInternet=Провера везом са интерн
UpdateCenter.Status.CheckingJavaNet=Провера везом са центар за aжурирање
UpdateCenter.Status.Success=Успех
UpdateCenter.Status.UnknownHostException=<span class=error>Неуспешна провера адресе {0}. \
Можда морате <a href="../pluginManager/advanced">поставити HTTP proxy?</a></span>
Можда морате <a href="{1}manage/pluginManager/advanced">поставити HTTP proxy?</a></span>
UpdateCenter.Status.ConnectionFailed=<span class=error>Неуспешно повезивање са {0}. \
Можда морате <a href="../pluginManager/advanced">поставити HTTP proxy?</a></span>
Можда морате <a href="{1}manage/pluginManager/advanced">поставити HTTP proxy?</a></span>
UpdateCenter.init=Инициализација центра за ажурирање
UpdateCenter.PluginCategory.builder=Алати за изградњу
UpdateCenter.PluginCategory.buildwrapper=Скрипт омотачи за изградњу
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/model/Messages_zh_TW.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,10 @@ UpdateCenter.Status.CheckingJavaNet=檢查是否能連到更新中心
UpdateCenter.Status.Success=成功
UpdateCenter.Status.UnknownHostException=\
<span class=error>無法解析主機名稱 {0}。\
說不定您應該要<a href="../pluginManager/advanced">設定 HTTP 代理伺服器</a>?</span>
說不定您應該要<a href="{1}manage/pluginManager/advanced">設定 HTTP 代理伺服器</a>?</span>
UpdateCenter.Status.ConnectionFailed=\
<span class=error>無法連線到{0}。\
說不定您應該要<a href="../pluginManager/advanced">設定 HTTP 代理伺服器</a>?</span>
說不定您應該要<a href="{1}manage/pluginManager/advanced">設定 HTTP 代理伺服器</a>?</span>
UpdateCenter.init=初始化更新中心
UpdateCenter.PluginCategory.builder=建置工具
UpdateCenter.PluginCategory.buildwrapper=建置包裝程式
Expand Down