From 7dd4171c04f94730b78aff2b557a0ceeaeb5bca8 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Wed, 15 Dec 2010 00:04:28 -0800
Subject: [PATCH] pushed up the pronoun to AbstractItem.

---
 core/src/main/java/hudson/model/AbstractItem.java         | 8 ++++++++
 core/src/main/java/hudson/model/Job.java                  | 5 +----
 .../main/resources/hudson/model/AbstractItem/delete.jelly | 2 +-
 .../resources/hudson/model/AbstractItem/delete.properties | 1 +
 .../hudson/model/AbstractItem/delete_da.properties        | 2 +-
 .../hudson/model/AbstractItem/delete_nl.properties        | 2 +-
 core/src/main/resources/hudson/model/Messages.properties  | 1 +
 7 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 core/src/main/resources/hudson/model/AbstractItem/delete.properties

diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index 8877e40c45..c9f2bad44f 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -88,6 +88,14 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
         return name;
     }
 
+    /**
+     * Get the term used in the UI to represent this kind of
+     * {@link Item}. Must start with a capital letter.
+     */
+    public String getPronoun() {
+        return Messages.AbstractItem_Pronoun();
+    }
+
     @Exported
     public String getDisplayName() {
         return getName();
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index a4548b2bbc..969fe8d090 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -248,10 +248,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
         return b!=null && b.isBuilding();
     }
 
-    /**
-     * Get the term used in the UI to represent this kind of
-     * {@link AbstractProject}. Must start with a capital letter.
-     */
+    @Override
     public String getPronoun() {
         return Messages.Job_Pronoun();
     }
diff --git a/core/src/main/resources/hudson/model/AbstractItem/delete.jelly b/core/src/main/resources/hudson/model/AbstractItem/delete.jelly
index fcc8231598..e3ae5b62f6 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/delete.jelly
+++ b/core/src/main/resources/hudson/model/AbstractItem/delete.jelly
@@ -33,7 +33,7 @@ THE SOFTWARE.
 		<st:include page="sidepanel.jelly" />
 		<l:main-panel>
 		  <form method="post" action="doDelete">
-		    ${%Are you sure about deleting the job?}
+		    ${%blurb(it.pronoun)}
         <f:submit value="${%Yes}" />
 		  </form>
 		</l:main-panel>
diff --git a/core/src/main/resources/hudson/model/AbstractItem/delete.properties b/core/src/main/resources/hudson/model/AbstractItem/delete.properties
new file mode 100644
index 0000000000..bd06c9b1b6
--- /dev/null
+++ b/core/src/main/resources/hudson/model/AbstractItem/delete.properties
@@ -0,0 +1 @@
+blurb=Are you sure about deleting the {0}?
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/AbstractItem/delete_da.properties b/core/src/main/resources/hudson/model/AbstractItem/delete_da.properties
index 67850704da..c99bd2f5c4 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/delete_da.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/delete_da.properties
@@ -21,4 +21,4 @@
 # THE SOFTWARE.
 
 Yes=Ja
-Are\ you\ sure\ about\ deleting\ the\ job?=Er du sikker p\u00e5 at du vil slette dette job?
+blurb=Er du sikker p\u00e5 at du vil slette dette {0}?
diff --git a/core/src/main/resources/hudson/model/AbstractItem/delete_nl.properties b/core/src/main/resources/hudson/model/AbstractItem/delete_nl.properties
index f1ed43d7c2..6041c399cb 100644
--- a/core/src/main/resources/hudson/model/AbstractItem/delete_nl.properties
+++ b/core/src/main/resources/hudson/model/AbstractItem/delete_nl.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Are\ you\ sure\ about\ deleting\ the\ job?=Bent u zeker? U staat op het punt deze job te verwijderen!
+blurb=Bent u zeker? U staat op het punt deze {0} te verwijderen!
 Yes=Ja
diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties
index 970c833070..5291611773 100644
--- a/core/src/main/resources/hudson/model/Messages.properties
+++ b/core/src/main/resources/hudson/model/Messages.properties
@@ -26,6 +26,7 @@ AbstractBuild.BuildingOnMaster=Building on master
 AbstractBuild.KeptBecause=kept because of {0}
 
 AbstractItem.NoSuchJobExists=No such job ''{0}'' exists. Perhaps you meant ''{1}''?
+AbstractItem.Pronoun=Job
 AbstractProject.NewBuildForWorkspace=Scheduling a new build to get a workspace.
 AbstractProject.AwaitingBuildForWorkspace=Awaiting build to get a workspace.
 AbstractProject.Pronoun=Project
-- 
GitLab