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.

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

Rename '[Jenkins]' in tab title to '- Jenkins' #10178

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ THE SOFTWARE.
<j:set var="simpleDecorators" value="${h.simplePageDecorators}"/>
<html lang="${request.getLocale().toLanguageTag()}">
<head data-rooturl="${rootURL}" data-resurl="${resURL}" data-imagesurl="${imagesURL}" resURL="${resURL}">
<title>${%Register} [Jenkins]</title>
<title>${%Register} - Jenkins</title>
<!-- we do not want bots on this page -->
<meta name="ROBOTS" content="NOFOLLOW"/>
<!-- mobile friendly layout -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ A\ strong\ password\ is\ a\ long\ password\ that''s\ unique\ for\ every\ site.\
massimo di sicurezza.
Create\ account=Crea account
Create\ an\ account!=Crea un account!
Create\ an\ account!\ [Jenkins]=Crea un account! [Jenkins]
Create\ an\ account!\ -\ Jenkins=Crea un account! - Jenkins
Email=Indirizzo di posta elettronica
Enter\ text\ as\ shown=Immettere il testo così come viene visualizzato
Full\ name=Nome completo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
Enter\ text\ as\ shown=Entre\ com\ texto\ conforme\ mostrado
Create\ account=Criar\ conta
Weak=Fraca
Create\ an\ account!\ [Jenkins]=Criar\ uma\ conta!\ [Jenkins]
Create\ an\ account!\ -\ Jenkins=Criar uma conta! - Jenkins
Strength=Força
Strong=Forte
please\ sign\ in.=Por\ favor\ dê\ entrada.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

A\ strong\ password\ is\ a\ long\ password\ that's\ unique\ for\ every\ site.\ Try\ using\ a\ phrase\ with\ 5-6\ words\ for\ the\ best\ security.=強健的密碼擁有較多字元且在不同系統使用獨特的密碼。請試著使用包含 5~6 個單字的句子以獲得最佳安全性。
If\ you\ already\ have\ a\ Jenkins\ account,=如果您有 Jenkins 帳戶了,
Create\ an\ account\!\ [Jenkins]=建立新帳戶\! [Jenkins]
Create\ an\ account\!\ -\ Jenkins=建立新帳戶\! - Jenkins
Strength=強度
please\ sign\ in.=請登入。
Show=顯示
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/jenkins/model/Jenkins/login.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ THE SOFTWARE.
<!-- real deal starting here -->
<html lang="${request.getLocale().toLanguageTag()}">
<head data-rooturl="${rootURL}" data-resurl="${resURL}" data-imagesurl="${imagesURL}" resURL="${resURL}">
<title>${%signIn} [Jenkins]</title>
<title>${%signIn} - Jenkins</title>
<!-- we do not want bots on this page -->
<meta name="ROBOTS" content="NOFOLLOW" />
<!-- mobile friendly layout -->
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/layout/layout.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ THE SOFTWARE.
${h.checkPermission(it,permission)}
${h.checkAnyPermission(it, permissions)}

<title>${h.appendIfNotNull(title, ' [Jenkins]', 'Jenkins')}</title>
<title>${h.appendIfNotNull(title, ' - Jenkins', 'Jenkins')}</title>

<link rel="stylesheet" href="${resURL}/jsbundles/styles.css" type="text/css" />
<j:if test="${attrs.nogrid==null or attrs.nogrid.equals(false)}">
Expand Down
6 changes: 3 additions & 3 deletions test/src/test/java/hudson/search/SearchTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public void testSearchByProjectName() throws Exception {

// make sure we've fetched the testSearchByDisplayName project page
String contents = result.getWebResponse().getContentAsString();
assertTrue(contents.contains(String.format("<title>%s [Jenkins]</title>", projectName)));
assertTrue(contents.contains(String.format("<title>%s - Jenkins</title>", projectName)));
}

@Issue("JENKINS-24433")
Expand Down Expand Up @@ -162,7 +162,7 @@ public void testSearchByDisplayName() throws Exception {

// make sure we've fetched the testSearchByDisplayName project page
String contents = result.getWebResponse().getContentAsString();
assertTrue(contents.contains(String.format("<title>%s [Jenkins]</title>", displayName)));
assertTrue(contents.contains(String.format("<title>%s - Jenkins</title>", displayName)));
}

@Test
Expand Down Expand Up @@ -190,7 +190,7 @@ public void testSearch2ProjectsWithSameDisplayName() throws Exception {

// make sure we've fetched the testSearchByDisplayName project page
String contents = result.getWebResponse().getContentAsString();
assertTrue(contents.contains(String.format("<title>%s [Jenkins]</title>", displayName)));
assertTrue(contents.contains(String.format("<title>%s - Jenkins</title>", displayName)));
assertFalse(contents.contains(otherDisplayName));
}

Expand Down
Loading