Skip to content

Commit

Permalink
Merge pull request #1635 from jglick/l10n-JENKINS-26698
Browse files Browse the repository at this point in the history
[JENKINS-26698] Localization follow-up
  • Loading branch information
oleg-nenashev committed Apr 1, 2015
2 parents a976bdc + f0d9e13 commit 776380f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion core/src/main/java/hudson/model/Build.java
Expand Up @@ -193,7 +193,7 @@ public void cleanUp(@Nonnull BuildListener listener) throws Exception {
performAllBuildSteps(listener, project.getPublishersList(), false);
performAllBuildSteps(listener, project.getProperties(), false);
} catch (Exception x) {
x.printStackTrace(listener.error("Post-build steps failed"));
x.printStackTrace(listener.error(Messages.Build_post_build_steps_failed()));
}
super.cleanUp(listener);
}
Expand Down
1 change: 1 addition & 0 deletions core/src/main/resources/hudson/model/Messages.properties
Expand Up @@ -92,6 +92,7 @@ BallColor.Pending=Pending
BallColor.Success=Success
BallColor.Unstable=Unstable

Build.post_build_steps_failed=Post-build steps failed
CLI.clear-queue.shortDescription=Clears the build queue.
CLI.delete-job.shortDescription=Deletes a job.
CLI.reload-job.shortDescription=Reloads this job from disk.
Expand Down
2 changes: 1 addition & 1 deletion test/src/test/java/hudson/model/BuildExecutionTest.java
Expand Up @@ -45,7 +45,7 @@ public class BuildExecutionTest {
FreeStyleProject p = r.createFreeStyleProject();
p.getPublishersList().add(new BrokenPublisher());
FreeStyleBuild b = r.assertBuildStatus(Result.FAILURE, p.scheduleBuild2(0).get());
r.assertLogContains("Post-build steps failed", b);
r.assertLogContains(Messages.Build_post_build_steps_failed(), b);
FilePath ws = r.jenkins.getWorkspaceFor(p);
WorkspaceList.Lease lease = r.jenkins.toComputer().getWorkspaceList().allocate(ws);
try {
Expand Down

0 comments on commit 776380f

Please sign in to comment.