Skip to content
Permalink
Browse files

[JENKINS-15206] Fixed up some remaining references to /people and int…

…roduced a redirect page.

Thanks to newenigma for catching.
  • Loading branch information
jglick committed Oct 4, 2012
1 parent 2404097 commit 06514d2517bb124cd3700d8063c755e60a7107fe
Showing with 72 additions and 32 deletions.
  1. +3 −0 changelog.html
  2. +1 −1 core/src/main/resources/hudson/model/User/sidepanel.jelly
  3. +37 −0 core/src/main/resources/hudson/model/View/People/index.jelly
  4. +1 −1 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.properties
  5. +1 −1 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_da.properties
  6. +3 −3 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_de.properties
  7. +3 −3 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_es.properties
  8. +3 −3 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_fr.properties
  9. +1 −1 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ja.properties
  10. +2 −2 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ko.properties
  11. +1 −1 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_nb_NO.properties
  12. +3 −3 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_BR.properties
  13. +4 −4 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ru.properties
  14. +1 −1 core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_tr.properties
  15. +1 −1 war/src/main/webapp/help/security/private-realm.html
  16. +1 −1 war/src/main/webapp/help/security/private-realm_de.html
  17. +1 −1 war/src/main/webapp/help/security/private-realm_fr.html
  18. +1 −1 war/src/main/webapp/help/security/private-realm_ja.html
  19. +1 −1 war/src/main/webapp/help/security/private-realm_pt_BR.html
  20. +1 −1 war/src/main/webapp/help/security/private-realm_ru.html
  21. +1 −1 war/src/main/webapp/help/security/private-realm_tr.html
  22. +1 −1 war/src/main/webapp/help/security/private-realm_zh_CN.html
@@ -55,6 +55,9 @@
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=bug>
Restoring <code>/people</code> page as a redirect for compatibility, and fixing links to it.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-15206">issue 15206</a> continued)
<li class=bug>
Memory exhaustion parsing large test stdio from Surefire.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-15382">issue 15382</a>)
@@ -31,7 +31,7 @@ THE SOFTWARE.
<l:header />
<l:side-panel>
<l:tasks>
<l:task icon="images/24x24/up.png" href="${rootURL}/people/" title="${%People}" contextMenu="false"/>
<l:task icon="images/24x24/up.png" href="${rootURL}/asynchPeople/" title="${%People}" contextMenu="false"/>
<l:task icon="images/24x24/search.png" href="${rootURL}/${it.url}/" title="${%Status}" contextMenu="false"/>
<l:task icon="images/24x24/notepad.png" href="${rootURL}/${it.url}/builds" title="${%Builds}" />
<l:task icon="images/24x24/notepad.png" href="${rootURL}/${it.url}/my-views/" title="${%My Views}" />
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
The MIT License
Copyright 2012 Jesse Glick.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
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:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<l:layout title="${%People}">
<st:include page="sidepanel.jelly" it="${it.parent}" />
<t:setIconSize/>
<l:main-panel>
<h1>${%People}</h1>
<p>
Moved to <a href="../asynchPeople/">asynchPeople</a> for performance reasons.
</p>
</l:main-panel>
</l:layout>
</j:jelly>
@@ -21,6 +21,6 @@
# THE SOFTWARE.

blurb=\
These users can log into Jenkins. This is a sub set of <a href="../people">this list</a>, \
These users can log into Jenkins. This is a sub set of <a href="../asynchPeople">this list</a>, \
which also contains auto-created users who really just made some commits on some projects and have no \
direct Jenkins access.
@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

blurb=Disse brugere kan logge p\u00e5 Jenkins. Dette er en delm\u00e6ngde af <a href="../people">denne liste</a>
blurb=Disse brugere kan logge p\u00e5 Jenkins. Dette er en delm\u00e6ngde af <a href="../asynchPeople">denne liste</a>
Name=Navn
@@ -21,10 +21,10 @@
# THE SOFTWARE.

blurb=\
Diese Benutzer können sich bei Jenkins anmelden. Dies ist eine Untermenge \
<a href="../people">jener Liste</a>, die zusätzlich automatisch \
Diese Benutzer k\u00f6nnen sich bei Jenkins anmelden. Dies ist eine Untermenge \
<a href="../asynchPeople">jener Liste</a>, die zus\u00e4tzlich automatisch \
angelegte Benutzer enthalten kann. Diese Benutzer haben zwar Commits zu Projekten \
beigetragen, dürfen sich aber nicht direkt bei Jenkins anmelden.
beigetragen, d\u00fcrfen sich aber nicht direkt bei Jenkins anmelden.
Name=Name
User\ Id=Benutzer Id
Users=Benutzer
@@ -21,9 +21,9 @@
# THE SOFTWARE.

blurb=\
Estos usuarios pueden entrar en Jenkins. Este es un subconjunto de <a href="../people">esta list</a>, \
que tambien incluyen usuarios creados automáticamente porque hayan hecho ''commits'' a proyectos. \
Los usuarios creados automáticamente no tienen acceso directo a Jenkins.
Estos usuarios pueden entrar en Jenkins. Este es un subconjunto de <a href="../asynchPeople">esta list</a>, \
que tambien incluyen usuarios creados autom\u00e1ticamente porque hayan hecho ''commits'' a proyectos. \
Los usuarios creados autom\u00e1ticamente no tienen acceso directo a Jenkins.
Name=Nombre
Users=Usuarios
User\ Id=Identificador de Usuario
@@ -22,7 +22,7 @@

Users=Utilisateurs
blurb=\
Ces utilisateurs peuvent se logguer sur Jenkins. C''est le groupe contenant <a href="../people">cette liste</a>, \
qui contient également les utilisateus créés automatiquement qui ont simplement fait des commits sur certains \
projets et n''ont pas d''accès direct à Jenkins.
Ces utilisateurs peuvent se logguer sur Jenkins. C''est le groupe contenant <a href="../asynchPeople">cette liste</a>, \
qui contient \u00e9galement les utilisateus cr\u00e9\u00e9s automatiquement qui ont simplement fait des commits sur certains \
projets et n''ont pas d''acc\u00e8s direct \u00e0 Jenkins.
Name=Nom
@@ -23,6 +23,6 @@
User\ Id=\u30e6\u30fc\u30b6\u30fcID
blurb=\
\u3053\u308c\u3089\u306e\u30e6\u30fc\u30b6\u30fc\u306fJenkins\u306b\u30ed\u30b0\u30a4\u30f3\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u3053\u308c\u306f\u3001Jenkins\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u3044\u306a\u3044\u3051\u308c\u3069\u3082 \
\u3044\u304f\u3064\u304b\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u30b3\u30df\u30c3\u30c8\u3059\u308b\u3068\u81ea\u52d5\u7684\u306b\u4f5c\u6210\u3055\u308c\u308b\u30e6\u30fc\u30b6\u30fc\u3092\u542b\u3080<a href="../people">\u3053\u306e\u30ea\u30b9\u30c8</a>\u306e\u4e00\u90e8\u3067\u3059\u3002
\u3044\u304f\u3064\u304b\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u30b3\u30df\u30c3\u30c8\u3059\u308b\u3068\u81ea\u52d5\u7684\u306b\u4f5c\u6210\u3055\u308c\u308b\u30e6\u30fc\u30b6\u30fc\u3092\u542b\u3080<a href="../asynchPeople">\u3053\u306e\u30ea\u30b9\u30c8</a>\u306e\u4e00\u90e8\u3067\u3059\u3002
Name=\u540d\u524d
Users=\u30e6\u30fc\u30b6\u30fc
@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Name=\uC774\uB984
blurb=\uC774 \uC0AC\uC6A9\uC790\uB4E4\uC740 Jenkins\uC5D0 \uB85C\uADF8\uC778\uD560 \uC218 \uC788\uC74C. \uC5B4\uB5A4 \uD504\uB85C\uC81D\uD2B8\uC5D0\uC11C \uC5B4\uB5A4 \uC801\uC6A9\uC744 \uB9C9 \uB9CC\uB4E4\uC5B4 \uB0B4\uACE0 Jenkins\uC5D0 \uC811\uADFC\uD558\uC9C0 \uC54A\uC740 \uC790\uB3D9 \uC0DD\uC131\uB41C \uC0AC\uC6A9\uC790\uB3C4 \uD3EC\uD568\uD55C <a href="../people"> \uBAA9\uB85D</a>\uC784.
Name=\uc774\ub984
blurb=\uc774 \uc0ac\uc6a9\uc790\ub4e4\uc740 Jenkins\uc5d0 \ub85c\uadf8\uc778\ud560 \uc218 \uc788\uc74c. \uc5b4\ub5a4 \ud504\ub85c\uc81d\ud2b8\uc5d0\uc11c \uc5b4\ub5a4 \uc801\uc6a9\uc744 \ub9c9 \ub9cc\ub4e4\uc5b4 \ub0b4\uace0 Jenkins\uc5d0 \uc811\uadfc\ud558\uc9c0 \uc54a\uc740 \uc790\ub3d9 \uc0dd\uc131\ub41c \uc0ac\uc6a9\uc790\ub3c4 \ud3ec\ud568\ud55c <a href="../asynchPeople"> \ubaa9\ub85d</a>\uc784.
@@ -23,4 +23,4 @@
Name=Navn
User\ Id=Bruker-id
Users=Brukere
blurb=Disse brukerne kan logge inn p\u00E5 Jenkins. De er et subsett av <a href="../people">dene listen</a>, som ogs\u00E5 inneholder autogenererte brukere som egentlig bare har sjekket inn p\u00E5 noen prosjekter og ikke har direkte jenkins-tilgang.
blurb=Disse brukerne kan logge inn p\u00e5 Jenkins. De er et subsett av <a href="../asynchPeople">dene listen</a>, som ogs\u00e5 inneholder autogenererte brukere som egentlig bare har sjekket inn p\u00e5 noen prosjekter og ikke har direkte jenkins-tilgang.
@@ -21,7 +21,7 @@
# THE SOFTWARE.

Name=Nome
User\ Id=Identifica\u00E7\u00E3o do Usu\u00E1rio
Users=Usu\u00E1rios
blurb=Esses usu\u00E1rios podem entrar no Jenkins. Este \u00E9 um sub-conjunto desta <a href="../people">lista</a>, que tamb\u00E9m cont\u00E9m os usu\u00E1rios criados de forma autom\u00E1tica ao executarem algum commit nos projetos que o Jenkins tem acesso.
User\ Id=Identifica\u00e7\u00e3o do Usu\u00e1rio
Users=Usu\u00e1rios
blurb=Esses usu\u00e1rios podem entrar no Jenkins. Este \u00e9 um sub-conjunto desta <a href="../asynchPeople">lista</a>, que tamb\u00e9m cont\u00e9m os usu\u00e1rios criados de forma autom\u00e1tica ao executarem algum commit nos projetos que o Jenkins tem acesso.

@@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Name=\u0418\u043C\u044F
User\ Id=ID \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F
Users=\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0438
blurb=\u041F\u0435\u0440\u0435\u0447\u0438\u0441\u043B\u0435\u043D\u043D\u044B\u0435 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0438 \u043C\u043E\u0433\u0443\u0442 \u0432\u0445\u043E\u0434\u0438\u0442\u044C \u0432 Jenkins. \u0423\u043A\u0430\u0437\u0430\u043D\u043D\u044B\u0439 \u0441\u043F\u0438\u0441\u043E\u043A \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u043F\u043E\u0434\u043C\u043D\u043E\u0436\u0435\u0441\u0442\u0432\u043E\u043C <a href="../people">\u043F\u043E\u043B\u043D\u043E\u0433\u043E \u0441\u043F\u0438\u0441\u043A\u0430 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439</a>, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u0432 \u0434\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u043E\u0437\u0434\u0430\u043D\u043D\u044B\u0445 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0432\u043D\u043E\u0441\u0438\u043B\u0438 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u0432 \u043F\u0440\u043E\u0435\u043A\u0442\u044B (\u0434\u0435\u043B\u0430\u043B\u0438 commit \u0432 SCM), \u0438 \u043C\u043E\u0433\u0443\u0442 \u043D\u0435 \u0438\u043C\u0435\u0442\u044C \u0434\u043E\u0441\u0442\u0443\u043F\u0430 \u043A \u0434\u0430\u043D\u043D\u043E\u043C\u0443 \u044D\u043A\u0437\u0435\u043C\u043F\u043B\u044F\u0440\u0443 Jenkins.
Name=\u0418\u043c\u044f
User\ Id=ID \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
Users=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438
blurb=\u041f\u0435\u0440\u0435\u0447\u0438\u0441\u043b\u0435\u043d\u043d\u044b\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438 \u043c\u043e\u0433\u0443\u0442 \u0432\u0445\u043e\u0434\u0438\u0442\u044c \u0432 Jenkins. \u0423\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0439 \u0441\u043f\u0438\u0441\u043e\u043a \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043f\u043e\u0434\u043c\u043d\u043e\u0436\u0435\u0441\u0442\u0432\u043e\u043c <a href="../asynchPeople">\u043f\u043e\u043b\u043d\u043e\u0433\u043e \u0441\u043f\u0438\u0441\u043a\u0430 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439</a>, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0432 \u0434\u043e\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438 \u0441\u043e\u0437\u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0432\u043d\u043e\u0441\u0438\u043b\u0438 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0432 \u043f\u0440\u043e\u0435\u043a\u0442\u044b (\u0434\u0435\u043b\u0430\u043b\u0438 commit \u0432 SCM), \u0438 \u043c\u043e\u0433\u0443\u0442 \u043d\u0435 \u0438\u043c\u0435\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043a \u0434\u0430\u043d\u043d\u043e\u043c\u0443 \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440\u0443 Jenkins.
@@ -21,7 +21,7 @@
# THE SOFTWARE.

blurb=\
Bu kullan\u0131c\u0131vlar Jenkins'da oturum a\u00e7abilir. Bu liste, <a href="../people">buradakinin</a> bir \u00fcst k\u00fcmesidir,
Bu kullan\u0131c\u0131vlar Jenkins'da oturum a\u00e7abilir. Bu liste, <a href="../asynchPeople">buradakinin</a> bir \u00fcst k\u00fcmesidir,
ayn\u0131 zamanda baz\u0131 projelerde commit i\u015flemi yapan, fakat direk Jenkins eri\u015fimi olmayan ve otomatik olarak yarat\u0131lan \
kullan\u0131c\u0131lar\u0131 da i\u00e7erir
Name=\u0130sim
@@ -1,5 +1,5 @@
<div>
Use <a href="people">Jenkins's own user list</a> for authentication,
Use <a href="asynchPeople">Jenkins's own user list</a> for authentication,
instead of delegating that to the external system.
This is suitable for smaller set up where you have no existing
user database elsewhere.
@@ -1,5 +1,5 @@
<div>
Verwenden Sie <a href="people">Jenkins' Benutzerverzeichnis</a> zur
Verwenden Sie <a href="asynchPeople">Jenkins' Benutzerverzeichnis</a> zur
Authentifizierung statt dies an ein externes System zu delegieren.
Dies ist praktikabel für kleinere Installationen, bei denen kein bereits
bestehendes Benutzerverzeichnis verwendet werden kann.
@@ -1,5 +1,5 @@
<div>
Utilise la <a href="people">liste des utilisateurs gérée par Jenkins</a>
Utilise la <a href="asynchPeople">liste des utilisateurs gérée par Jenkins</a>
pour les authentifier, plutôt que de déléguer à un système externe.
Cette solution est pratique pour les configurations simples où vous
n'avez pas d'utilisateurs dans une base de données ailleurs.
@@ -1,4 +1,4 @@
<div>
外部システムに頼るのではなく、<a href="people">Jenkins自身のユーザーリスト</a>を認証に使用します。
外部システムに頼るのではなく、<a href="asynchPeople">Jenkins自身のユーザーリスト</a>を認証に使用します。
小規模で、ユーザーデータベースがどこにもない環境で使用する場合に向いています。
</div>
@@ -1,5 +1,5 @@
<div>
Usa <a href="people">a pr&#243;pria lista de usu&#225;rios do Jenkins</a> para fazer a autentica&#231;&#227;o,
Usa <a href="asynchPeople">a pr&#243;pria lista de usu&#225;rios do Jenkins</a> para fazer a autentica&#231;&#227;o,
ao inv&#233;s de delegar isto para um sistema externo.
Isto &#233; indicado para uma configura&#231;&#227;o simples onde voc&#234; n&#227;o tem uma base
de usu&#225;rio em lugar algum.
@@ -1,5 +1,5 @@
<div>
Использовать <a href="people">собственный список пользователей</a> для
Использовать <a href="asynchPeople">собственный список пользователей</a> для
аутентификации вместо делегирования этого внешней системе. Подходит для
небольших инсталляций, для которых у вас ещё нет никакой базы пользователей.
</div>
@@ -1,4 +1,4 @@
<div>
Yetkilendirmeyi d&#305;&#351; sisteme vermek yerine, <a href="people">Hudson'&#305;n kendi kullan&#305;c&#305; listesi</a>'ni
Yetkilendirmeyi d&#305;&#351; sisteme vermek yerine, <a href="asynchPeople">Hudson'&#305;n kendi kullan&#305;c&#305; listesi</a>'ni
kullan&#305;r. Herhangi bir kullan&#305;c&#305; veritaban&#305; olmayan, k&#252;&#231;&#252;k &#231;apl&#305; kurulumlar i&#231;in uygundur.
</div>
@@ -1,5 +1,5 @@
<div>
使用<a href="people">Hudson自己的用户列表</a>验证,
使用<a href="asynchPeople">Hudson自己的用户列表</a>验证,
而不是外部系统代理.
这适用于没有用户数据库小范围的设定.
</div>

0 comments on commit 06514d2

Please sign in to comment.