From effcc2d7aa4f40a3f43185ab0bc22619d6ecea97 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Thu, 6 Jun 2013 11:32:27 +0200 Subject: [PATCH] offer better pronouns for common job types --- core/src/main/java/hudson/matrix/MatrixProject.java | 6 ++++++ core/src/main/resources/hudson/matrix/Messages.properties | 1 + core/src/main/resources/hudson/model/Messages.properties | 2 +- .../src/main/java/hudson/maven/MavenModuleSet.java | 7 +++++++ .../src/main/resources/hudson/maven/Messages.properties | 1 + 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/matrix/MatrixProject.java b/core/src/main/java/hudson/matrix/MatrixProject.java index 8598974d47..7dae077835 100644 --- a/core/src/main/java/hudson/matrix/MatrixProject.java +++ b/core/src/main/java/hudson/matrix/MatrixProject.java @@ -41,6 +41,7 @@ import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; import hudson.model.Node; import hudson.slaves.WorkspaceList; +import hudson.util.AlternativeUiTextProvider; import jenkins.model.Jenkins; import hudson.model.Item; import hudson.model.ItemGroup; @@ -194,6 +195,11 @@ public class MatrixProject extends AbstractProject im super(parent, name); } + @Override + public String getPronoun() { + return AlternativeUiTextProvider.get(PRONOUN, this, Messages.MatrixProject_Pronoun()); + } + /** * Gets the workspace location that {@link MatrixConfiguration} uses. * diff --git a/core/src/main/resources/hudson/matrix/Messages.properties b/core/src/main/resources/hudson/matrix/Messages.properties index 8536028184..325ece3185 100644 --- a/core/src/main/resources/hudson/matrix/Messages.properties +++ b/core/src/main/resources/hudson/matrix/Messages.properties @@ -22,6 +22,7 @@ MatrixBuild.depends_on_this={0} depends on this. MatrixProject.DisplayName=Build multi-configuration project +MatrixProject.Pronoun=Multi-configuration project MatrixProject.DuplicateAxisName=Duplicate axis name MatrixBuild.Triggering=Triggering {0} diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties index 97ac72ca57..6f5df4cbde 100644 --- a/core/src/main/resources/hudson/model/Messages.properties +++ b/core/src/main/resources/hudson/model/Messages.properties @@ -119,7 +119,7 @@ Descriptor.From=(from {0}) Executor.NotAvailable=N/A ExternalJob.DisplayName=Monitor an external job -ExternalJob.Pronoun=Job +ExternalJob.Pronoun=External Job FreeStyleProject.DisplayName=Build a free-style software project diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index 90b0097265..a870b32837 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -67,6 +67,7 @@ import hudson.tasks.Maven.MavenInstallation; import hudson.tasks.Publisher; import hudson.tasks.JavadocArchiver; import hudson.tasks.junit.JUnitResultArchiver; +import hudson.util.AlternativeUiTextProvider; import hudson.util.CopyOnWriteMap; import hudson.util.DescribableList; import hudson.util.FormValidation; @@ -446,6 +447,12 @@ public class MavenModuleSet extends AbstractMavenProject