Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1511 from olivergondza/override-whyKeepLog
[JENKINS-26281] Allow users to delete builds even if they are supposed to be kept
  • Loading branch information
olivergondza committed Jan 11, 2015
2 parents 9e333bc + de53fea commit 50f9400
Show file tree
Hide file tree
Showing 12 changed files with 5 additions and 38 deletions.
8 changes: 4 additions & 4 deletions core/src/main/resources/hudson/model/Run/confirmDelete.jelly
Expand Up @@ -30,14 +30,14 @@ THE SOFTWARE.
<l:main-panel>
<j:set var="msg" value="${it.whyKeepLog}"/>
<j:if test="${msg!=null}">
<b>${%Warning}</b>: ${%cannotMsg(msg)}
</j:if>
<j:if test="${msg==null}">
<p class="warning">${%Warning}: ${msg}</p>
</j:if>

<form method="post" action="doDelete">
${%Are you sure about deleting the build?}
<f:submit value="${%Yes}" />
</form>
</j:if>

</l:main-panel>
</l:layout>
</j:jelly>
23 changes: 0 additions & 23 deletions core/src/main/resources/hudson/model/Run/confirmDelete.properties

This file was deleted.

Expand Up @@ -21,6 +21,5 @@
# THE SOFTWARE.

Yes=Ja
cannotMsg=Kan ikke slette dette byg, da det er {0}
Are\ you\ sure\ about\ deleting\ the\ build?=Er du sikker p\u00e5 at du vil slette dette byg?
Warning=Advarsel
Expand Up @@ -21,6 +21,5 @@
# THE SOFTWARE.

Warning=Warnung
cannotMsg=Der Build kann nicht gelöscht werden: {0}.
Are\ you\ sure\ about\ deleting\ the\ build?=Soll der Build wirklich gelöscht werden?
Yes=Ja
Expand Up @@ -20,7 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

cannotMsg=Esta ejecución no se puede borrar porque está {0}
Warning=Cuidado
Yes=
Are\ you\ sure\ about\ deleting\ the\ build?=¿Estás seguro de quere borrar la ejecución?
Expand Up @@ -21,6 +21,5 @@
# THE SOFTWARE.

Warning=Avertissement
cannotMsg=Impossible de supprimer ce build, parce qu''il est {0}
Are\ you\ sure\ about\ deleting\ the\ build?=Etes-vous sûr de vouloir supprimer le build?
Yes=Oui
Expand Up @@ -21,6 +21,5 @@
# THE SOFTWARE.

Warning=\u8b66\u544a
cannotMsg={0}\u3068\u3044\u3046\u7406\u7531\u3067\u3001\u524a\u9664\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
Are\ you\ sure\ about\ deleting\ the\ build?=\u30d3\u30eb\u30c9\u3092\u524a\u9664\u3057\u307e\u3059\u304b\uff1f
Yes=\u306f\u3044
Yes=\u306f\u3044
Expand Up @@ -21,6 +21,5 @@
# THE SOFTWARE.

Warning=Waarschuwing
cannotMsg=Deze bouwpoging kan niet verwijderd worden: {0}.
Are\ you\ sure\ about\ deleting\ the\ build?=Bent u zeker dat deze bouwpoging verwijderd mag worden?
Yes=Ja
Expand Up @@ -21,6 +21,5 @@
# THE SOFTWARE.

Warning=Aviso
cannotMsg=N\u00e3o \u00e9 poss\u00edvel apagar esse build porque ela est\u00e1 {0}
Are\ you\ sure\ about\ deleting\ the\ build?=Tem certeza que deseja excluir o build?
Yes=Sim
Expand Up @@ -21,6 +21,5 @@
# THE SOFTWARE.

Warning=\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435
cannotMsg=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u0443 \u0441\u0431\u043e\u0440\u043a\u0443, \u043f\u043e\u0442\u043e\u043c\u0443 \u0447\u0442\u043e \u043e\u043d\u0430 {0}
Are\ you\ sure\ about\ deleting\ the\ build?=\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u0443 \u0441\u0431\u043e\u0440\u043a\u0443?
Yes=\u0414\u0430
Expand Up @@ -20,7 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

cannotMsg=Bu yap\u0131land\u0131rma, {0} oldu\u011fundan dolay\u0131 silinemiyor.
Warning=Uyar\u0131
Are\ you\ sure\ about\ deleting\ the\ build?=Bu yap\u0131land\u0131rmay\u0131 silmek istedi\u011finize emin misiniz?
Yes=Evet
Expand Up @@ -21,6 +21,5 @@
# THE SOFTWARE.

Warning=\u8b66\u544a
cannotMsg=\u7121\u6cd5\u522a\u9664\u9019\u6b21\u5efa\u7f6e\uff0c\u56e0\u70ba{0}
Are\ you\ sure\ about\ deleting\ the\ build?=\u78ba\u5b9a\u8981\u522a\u9664\u9019\u6b21\u5efa\u7f6e\u55ce?
Yes=\u662f

0 comments on commit 50f9400

Please sign in to comment.