From 15cc52276e73c92e867c762f3eec15c18a22b09d Mon Sep 17 00:00:00 2001 From: Michael Pailloncy Date: Tue, 16 Apr 2013 19:59:32 +0200 Subject: [PATCH] JENKINS-17416 - Improve Wipe Out Workspace label --- .../hudson/model/AbstractProject/sidepanel.properties | 1 + .../hudson/model/AbstractProject/sidepanel_es.properties | 2 +- .../hudson/model/AbstractProject/sidepanel_fr.properties | 2 +- test/src/test/java/hudson/model/AbstractProjectTest.java | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/main/resources/hudson/model/AbstractProject/sidepanel.properties b/core/src/main/resources/hudson/model/AbstractProject/sidepanel.properties index 42a53cc2e8..2719924026 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/sidepanel.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/sidepanel.properties @@ -23,3 +23,4 @@ delete=Delete {0} delete.confirm=Are you sure about deleting the {0} \u2018{1}\u2019? wipe.out.confirm=Are you sure about wiping out the workspace? +Wipe\ Out\ Workspace=Wipe Out Current Workspace \ No newline at end of file diff --git a/core/src/main/resources/hudson/model/AbstractProject/sidepanel_es.properties b/core/src/main/resources/hudson/model/AbstractProject/sidepanel_es.properties index 7474e535ea..74bd81c865 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/sidepanel_es.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/sidepanel_es.properties @@ -24,7 +24,7 @@ Build\ scheduled=Ejecuci\u00f3n agendada Changes=Cambios Configure=Configurar Status=Estado -Wipe\ Out\ Workspace=Limpiar el Espacio de trabajo +Wipe\ Out\ Workspace=Limpiar el Espacio de trabajo corriente Workspace=Espacio de trabajo delete=Borrar {0} View\ Configuration=Ver la configuraci\u00f3n diff --git a/core/src/main/resources/hudson/model/AbstractProject/sidepanel_fr.properties b/core/src/main/resources/hudson/model/AbstractProject/sidepanel_fr.properties index b9868fa337..714bfbb172 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/sidepanel_fr.properties +++ b/core/src/main/resources/hudson/model/AbstractProject/sidepanel_fr.properties @@ -27,5 +27,5 @@ Workspace=Espace de travail delete=Supprimer ce {0} Configure=Configurer Build\ scheduled=Construction programm\u00e9e -Wipe\ Out\ Workspace=Effacer le r\u00e9pertoire de travail +Wipe\ Out\ Workspace=Effacer le r\u00e9pertoire de travail courant wipe.out.confirm=Voulez-vous vraiment effacer le r\u00e9pertoire de travail? diff --git a/test/src/test/java/hudson/model/AbstractProjectTest.java b/test/src/test/java/hudson/model/AbstractProjectTest.java index 4e6a304a37..f9c01f3318 100644 --- a/test/src/test/java/hudson/model/AbstractProjectTest.java +++ b/test/src/test/java/hudson/model/AbstractProjectTest.java @@ -55,6 +55,7 @@ import java.io.File; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.ResourceBundle; import java.util.Set; import java.util.concurrent.Future; import org.apache.commons.io.FileUtils; @@ -127,7 +128,8 @@ public class AbstractProjectTest extends HudsonTestCase { page = (HtmlPage)page.getFirstAnchorByText("Workspace").click(); try { - page.getFirstAnchorByText("Wipe Out Workspace"); + String wipeOutLabel = ResourceBundle.getBundle("hudson/model/AbstractProject/sidepanel").getString("Wipe Out Workspace"); + page.getFirstAnchorByText(wipeOutLabel); fail("shouldn't find a link"); } catch (ElementNotFoundException e) { // OK -- GitLab