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

Update appearance of 'Jenkins is starting' pages #9707

Merged
merged 15 commits into from
Sep 13, 2024
Merged

Update appearance of 'Jenkins is starting' pages #9707

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fbcd08e
Init
janfaracik Aug 5, 2024
91c9828
Merge branch 'master' into updated-startup-restart
janfaracik Aug 14, 2024
b65280e
Merge branch 'master' into updated-startup-restart
janfaracik Sep 2, 2024
eea8cc9
Update simple-page.scss
janfaracik Sep 2, 2024
29eec13
Simplify
janfaracik Sep 8, 2024
e3192f8
Update simple-page.scss
janfaracik Sep 8, 2024
1b47727
Delete loading.css
janfaracik Sep 8, 2024
40c528d
Merge branch 'master' into updated-startup-restart
janfaracik Sep 8, 2024
3bc89a7
Update some translations
janfaracik Sep 9, 2024
a7bf7d5
Remove some translations (still more to update)
janfaracik Sep 9, 2024
9c2c99e
WIP translations - just need to confirm with friends
janfaracik Sep 9, 2024
9da1af4
Merge branch 'master' into updated-startup-restart
janfaracik Sep 9, 2024
cc58979
Update/remove translations
janfaracik Sep 11, 2024
b9056df
Merge branch 'master' into updated-startup-restart
janfaracik Sep 11, 2024
b18a0d4
Merge branch 'master' into updated-startup-restart
janfaracik Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:x="jelly:xml">
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:x="jelly:xml" xmlns:l="/lib/layout">
<j:new var="h" className="hudson.Functions" />
<st:statusCode value="503" /><!-- SERVICE NOT AVAILABLE -->
<st:header name="Expires" value="0" />
Expand All @@ -40,21 +40,17 @@ THE SOFTWARE.
<!-- mobile friendly layout -->
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="${resURL}/jsbundles/simple-page.css" type="text/css" />
<link rel="stylesheet" href="${resURL}/css/loading.css" type="text/css" />
</head>
<body>
<div class="simple-page" role="main">
<div class="modal signup">
<div class="signupIntroDefault">
<div class="logo" />
<h1 class="loading">
${%Please wait while Jenkins is restarting}
<span>.</span><span>.</span><span>.</span>
</h1>
<p>
${%blurb}
</p>
</div>
<div class="app-jenkins-booting">
<div class="logo" />
<h1 class="loading">
<l:spinner text="${%Please wait while Jenkins is restarting}" />
</h1>
<p>
${%blurb}
</p>
</div>
</div>
<script src="${resURL}/scripts/loading.js" type="text/javascript" />
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Please\ wait\ while\ Jenkins\ is\ restarting=\
Jenkins is restarting
blurb=You should be taken automatically to the new Jenkins in a few seconds. \
If for some reason the service fails to start, please check the Windows event log for errors and consult the wiki page \
located at the <a href="https://www.jenkins.io/redirect/troubleshooting/windows-service-fails-to-start">official wiki</a>.
24 changes: 10 additions & 14 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:x="jelly:xml">
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:x="jelly:xml" xmlns:l="/lib/layout">
<j:new var="h" className="hudson.Functions" />
<st:statusCode value="503" /><!-- SERVICE NOT AVAILABLE -->
<st:header name="Expires" value="0" />
Expand All @@ -40,23 +40,19 @@ THE SOFTWARE.
<!-- mobile friendly layout -->
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="${resURL}/jsbundles/simple-page.css" type="text/css" />
<link rel="stylesheet" href="${resURL}/css/loading.css" type="text/css" />
</head>
<body>
<div class="simple-page" role="main">
<div class="modal signup">
<div class="signupIntroDefault">
<div class="logo">
<img src="${imagesURL}/svgs/logo.svg" alt="Jenkins logo" />
</div>
<h1 class="loading">
${%Please wait while Jenkins is getting ready to work}
<span>.</span><span>.</span><span>.</span>
</h1>
<p class="restarting">
${%Your browser will reload automatically when Jenkins is ready.}
</p>
<div class="app-jenkins-booting">
<div class="logo">
<img src="${imagesURL}/svgs/logo.svg" alt="Jenkins logo" />
</div>
<h1 class="loading">
<l:spinner text="${%Please wait while Jenkins is getting ready to work}" />
</h1>
<p class="restarting">
${%Your browser will reload automatically when Jenkins is ready}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove the trailing period? The other line is (or was) a title so didn't need it, but this one isn't.

Copy link
Contributor Author

@janfaracik janfaracik Sep 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personal preference, I don't personally see the value of them for things like this. Would be a good thing to standardise across Jenkins, as right now many fields include periods, many don't.

For this piece of text in particular, it's centered and I think it appears more visually balanced without the punctuation.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

many fields include periods, many don't

Are there many sentences that don't have periods?

</p>
</div>
</div>
<script src="${resURL}/scripts/loading.js" type="text/javascript" />
Expand Down
4 changes: 4 additions & 0 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=\
Jenkins is getting ready to work
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\
Your browser will reload automatically when Jenkins is ready
4 changes: 1 addition & 3 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_bg.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=\
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\
Браузърът ви ще се презареди автоматично, когато Jenkins е готов.
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=\
Изчакайте докато Jenkins стане готов за работа
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_cs.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file is under the MIT License by authors

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Počkejte prosím, než aplikace Jenkins zcela naběhne
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jakmile bude Jenkins připraven, stránka se automaticky obnoví.
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Počkejte, než aplikace Jenkins zcela naběhne
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jakmile bude Jenkins připraven, stránka se automaticky obnoví.
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_da.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Din browser vil genindlæse siden automatisk når Jenkins er klar.
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Vent venligst imens Jenkins gør klar til at arbejde
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Din browser vil genindlæse siden automatisk når Jenkins er klar.
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Vent imens Jenkins gør klar til at arbejde
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins wird gestartet. Bitte warten
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Der Webbrowser wird diese Seite automatisch neu laden, sobald Jenkins hochgefahren ist.
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins wird gestartet
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Der Webbrowser wird diese Seite automatisch neu laden, sobald Jenkins hochgefahren ist.
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_es.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Por favor espera hasta que Jenkins esté listo.
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Su navegador recargará automáticamente esta página cuando Jenkins esté listo.
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Espera hasta que Jenkins esté listo.
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Su navegador recargará automáticamente esta página cuando Jenkins esté listo.
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Merci d''attendre que Jenkins soit prêt
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Votre navigateur web sera rafraîchi automatiquement lorsque Jenkins sera prêt.
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Attendre que Jenkins soit prêt
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Votre navigateur web sera rafraîchi automatiquement lorsque Jenkins sera prêt.
5 changes: 2 additions & 3 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_it.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Attendere finché \
Jenkins si prepara a funzionare
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Attendere prego, Jenkins sta caricando
Starting\ Jenkins=Avvio di Jenkins in corso
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Quando \
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Quando \
Jenkins sarà pronto per funzionare, la finestra del browser si aggiornerà \
automaticamente.
4 changes: 1 addition & 3 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_ja.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=\
Jenkinsの準備ができるまで、お待ちください。
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=\
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\
Jenkinsの準備が完了すると、ブラウザは自動的にリロードされます。
3 changes: 1 addition & 2 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_ko.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# This file is under the MIT License by authors

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins가 준비 될 때까지 기다려주세요.
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jenkins가 준비 되면 자동 리로딩 합니다.
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jenkins가 준비 되면 자동 리로딩 합니다.
5 changes: 1 addition & 4 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_lt.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# This file is under the MIT License by authors

# /jenkins-core/src/main/resources/hudson/util/HudsonIsLoading/index_lt.properties

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins ruošiamas darbui, prašome palaukti
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Kuomet Jenkins bus paruoštas, Jūsų naršyklė persikraus automatiškai.
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Kuomet Jenkins bus paruoštas, Jūsų naršyklė persikraus automatiškai.
3 changes: 1 addition & 2 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_lv.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# This file is under the MIT License by authors

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Lūdzu uzgaidiet, kamēr Jenkins sagatavojās darbam...
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jūsu pārlūks automātiski pārlādēsies, kad Jenkins būs gatavs.
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jūsu pārlūks automātiski pārlādēsies, kad Jenkins būs gatavs.
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_nl.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins is aan het opstarten. Gelieve even te wachten.
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Uw browser zal zich vernieuwen wanneer Jenkins gereed is.
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins is aan het opstarten
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Uw browser zal zich vernieuwen wanneer Jenkins gereed is.
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_pl.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Poczekaj proszę, aż Jenkins będzie gotowy do pracy
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Twoja przeglądarka automatycznie przeładuje stronę, kiedy Jenkins będzie gotowy.
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins jest przygotowywany do pracy
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Twoja przeglądarka automatycznie przeładuje stronę, kiedy Jenkins będzie gotowy.
Starting\ Jenkins=Uruchamianie Jenkinsa
3 changes: 1 addition & 2 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_pt_BR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Por favor aguarde enquanto o Jenkins se prepara para trabalhar
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Seu navegador recarregará automaticamente quando o Jenkins estiver pronto.
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Seu navegador recarregará automaticamente quando o Jenkins estiver pronto.
Starting\ Jenkins=Iniciando\ o\ Jenkins
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_ru.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Пожалуйста, подождите. Jenkins готовится к работе
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Эта страница будет перезагружена, когда Jenkins будет готов.
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins готовится к работе
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Эта страница будет перезагружена, когда Jenkins будет готов.
3 changes: 1 addition & 2 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_sr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# This file is under the MIT License by authors

Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Ваш веб-прегледач ће се аутоматски освежити када буде Jenkins био спреман.
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Молимо вас, сачекајте док се Jenkins припрема.
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Ваш веб-прегледач ће се аутоматски освежити када буде Jenkins био спреман.
3 changes: 1 addition & 2 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_sv_SE.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# This file is under the MIT License by authors

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Var god vänta medan Jenkins förbereds
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Din webbläsare laddas om automatiskt när Jenkins är redo.
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Din webbläsare laddas om automatiskt när Jenkins är redo.
Starting\ Jenkins=Jenkins startar upp
3 changes: 1 addition & 2 deletions core/src/main/resources/hudson/util/HudsonIsLoading/index_tr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins kullanıma hazır oluncaya kadar lütfen bekleyiniz
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jenkins hazır olduğunda tarayıcınız otomatik olarak yeniden yüklenecektir.
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jenkins hazır olduğunda tarayıcınız otomatik olarak yeniden yüklenecektir.
1 change: 0 additions & 1 deletion core/src/main/resources/hudson/util/HudsonIsLoading/index_zh_TW.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jenkins 就緒後，您的瀏覽器會自動重載頁面。
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins 準備要上工了，請耐心等候
45 changes: 20 additions & 25 deletions core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:x="jelly:xml">
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:x="jelly:xml" xmlns:l="/lib/layout">
<j:new var="h" className="hudson.Functions" />
<st:statusCode value="503" /><!-- SERVICE NOT AVAILABLE -->
<st:header name="Expires" value="0" />
Expand All @@ -40,34 +40,29 @@ THE SOFTWARE.
<!-- mobile friendly layout -->
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="${resURL}/jsbundles/simple-page.css" type="text/css" />
<link rel="stylesheet" href="${resURL}/css/loading.css" type="text/css" />
</head>
<body>
<div class="simple-page" role="main">
<div class="modal signup">
<div class="signupIntroDefault">
<div class="logo">
<img src="${imagesURL}/svgs/logo.svg" alt="Jenkins logo" />
</div>
<h1 class="loading">
${%Please wait while Jenkins is restarting}
<span>.</span><span>.</span><span>.</span>
</h1>
<p class="restarting">
${%Your browser will reload automatically when Jenkins is ready.}
</p>
<j:if test="${it.safeRestart}">
<div class="safe-restarting">
<p>
<strong>${%Safe Restart}</strong>
</p>
<p>
${%Builds on agents can usually continue.}
</p>
</div>
</j:if>

<div class="app-jenkins-booting">
<div class="logo">
<img src="${imagesURL}/svgs/logo.svg" alt="Jenkins logo" />
</div>
<h1 class="loading">
<l:spinner text="${%Please wait while Jenkins is restarting}" />
</h1>
<p class="restarting">
${%Your browser will reload automatically when Jenkins is ready}
</p>
<j:if test="${it.safeRestart}">
<div class="safe-restarting">
<p>
<strong>${%Safe Restart}</strong>
</p>
<p>
${%Builds on agents can usually continue.}
</p>
</div>
</j:if>
</div>
</div>
<script src="${resURL}/scripts/loading.js" type="text/javascript" />
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/resources/hudson/util/HudsonIsRestarting/index.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Please\ wait\ while\ Jenkins\ is\ restarting=\
Jenkins is restarting
2 changes: 1 addition & 1 deletion core/src/main/resources/hudson/util/HudsonIsRestarting/index_bg.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@

Please\ wait\ while\ Jenkins\ is\ restarting=\
Изчакайте докато Jenkins рестартира
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=\
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\
Браузър ви автоматично ще презареди страницата, когато Jenkins е готов.
2 changes: 1 addition & 1 deletion core/src/main/resources/hudson/util/HudsonIsRestarting/index_da.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Din browser vil genindlæse siden automatisk når Jenkins er klar.
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Din browser vil genindlæse siden automatisk når Jenkins er klar.
Please\ wait\ while\ Jenkins\ is\ restarting=Vent venligst imens Jenkins genstarter
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's still a number of translations outstanding for this one Please\ wait\ while\ Jenkins\ is\ restarting

Either update or remove translation please

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this intentional? I don't speak the language but Google Translate says it's now "Please wait Jenkins restarts" which seems not great translated back.

2 changes: 1 addition & 1 deletion core/src/main/resources/hudson/util/HudsonIsRestarting/index_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Please\ wait\ while\ Jenkins\ is\ restarting=Jenkins wird neu gestartet. Bitte warten.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When changing the English text we should update / remove translations.

e.g. here I think you would drop the Bitte warten

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can confirm, it should be "Jenkins wird neu gestartet"

Copy link
Member

@timja timja Sep 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Please\ wait\ while\ Jenkins\ is\ restarting=Jenkins wird neu gestartet. Bitte warten.
Please\ wait\ while\ Jenkins\ is\ restarting=Jenkins wird neu gestartet

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the "." be part of the text or not?

Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Der Webbrowser wird diese Seite automatisch neu laden, sobald Jenkins hochgefahren ist.
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Der Webbrowser wird diese Seite automatisch neu laden, sobald Jenkins hochgefahren ist.
Safe\ Restart=Sicherer Neustart
Builds\ on\ agents\ can\ usually\ continue.=Builds auf Agenten laufen in der Regel weiter.
Restart=Neustarten
Expand Down
Loading
Loading