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

JENKINS-17416 - Improve Wipe Out Workspace label #760

Merged
merged 1 commit into from
Apr 16, 2013
Merged
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 @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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?
4 changes: 3 additions & 1 deletion test/src/test/java/hudson/model/AbstractProjectTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
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;
Expand Down Expand Up @@ -127,7 +128,8 @@ public void testWipeWorkspaceProtected2() throws Exception {

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
Expand Down