diff --git a/core/src/main/java/hudson/model/Fingerprint.java b/core/src/main/java/hudson/model/Fingerprint.java index a0748cc023..1502b5eb4c 100644 --- a/core/src/main/java/hudson/model/Fingerprint.java +++ b/core/src/main/java/hudson/model/Fingerprint.java @@ -440,12 +440,11 @@ public class Fingerprint implements ModelObject { * Gets the string that says how long since this build has scheduled. * * @return - * string like "3 minutes" "1 day" etc. + * string like "3 minutes ago" "1 day ago" etc. */ public String getTimestampString() { long duration = System.currentTimeMillis()-timestamp.getTime(); - return Util.getTimeSpanString(duration); - + return Util.getPastTimeString(duration); } /** diff --git a/core/src/main/resources/hudson/model/Fingerprint/index.jelly b/core/src/main/resources/hudson/model/Fingerprint/index.jelly index e4b9c93306..7452f6ca16 100644 --- a/core/src/main/resources/hudson/model/Fingerprint/index.jelly +++ b/core/src/main/resources/hudson/model/Fingerprint/index.jelly @@ -17,10 +17,10 @@ MD5: ${it.hashString}
- Introduced ${it.timestampString} ago + ${%introduced(it.timestampString)} - outside Hudson + ${%outside Hudson} @@ -32,12 +32,12 @@

- This file has not been used anywhere else. + ${%This file has not been used anywhere else.}

- This file has been used in the following places: + ${%This file has been used in the following places}:

diff --git a/core/src/main/resources/hudson/model/Fingerprint/index.properties b/core/src/main/resources/hudson/model/Fingerprint/index.properties new file mode 100644 index 0000000000..439de9bfaf --- /dev/null +++ b/core/src/main/resources/hudson/model/Fingerprint/index.properties @@ -0,0 +1 @@ +introduced=Introduced {0} \ No newline at end of file diff --git a/core/src/main/resources/lib/hudson/project/build-permalink.jelly b/core/src/main/resources/lib/hudson/project/build-permalink.jelly index a1fcebd5cf..741a3d9bfa 100644 --- a/core/src/main/resources/lib/hudson/project/build-permalink.jelly +++ b/core/src/main/resources/lib/hudson/project/build-permalink.jelly @@ -10,8 +10,7 @@
  • - ${title} - (#${b.number}), ${b.timestampString} ago + ${title} (#${b.number}), ${b.timestampString}
  • \ No newline at end of file diff --git a/core/src/main/resources/lib/hudson/project/build-permalink.properties b/core/src/main/resources/lib/hudson/project/build-permalink.properties new file mode 100644 index 0000000000..47ffc2ea58 --- /dev/null +++ b/core/src/main/resources/lib/hudson/project/build-permalink.properties @@ -0,0 +1 @@ +format={0} (#{1}), ${2} ago \ No newline at end of file