From a5a62a4cdbbc22df6af0638906142f3b28fbfd64 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 25 Feb 2019 08:43:25 +0900 Subject: [PATCH] JGitText: Remove unnecessary suffix from externalized message identifier Change-Id: I7a3ade56c219826b81d33d1d52566a86ad2e853a Signed-off-by: David Pursehouse --- .../resources/org/eclipse/jgit/internal/JGitText.properties | 2 +- org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java | 2 +- .../src/org/eclipse/jgit/util/sha1/Sha1CollisionException.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 383e4c290..da8e32026 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -631,7 +631,7 @@ selectingCommits=Selecting commits sequenceTooLargeForDiffAlgorithm=Sequence too large for difference algorithm. serviceNotEnabledNoName=Service not enabled serviceNotPermitted={1} not permitted on ''{0}'' -sha1CollisionDetected1=SHA-1 collision detected on {0} +sha1CollisionDetected=SHA-1 collision detected on {0} shallowCommitsAlreadyInitialized=Shallow commits have already been initialized shallowPacksRequireDepthWalk=Shallow packs require a DepthWalk shortCompressedStreamAt=Short compressed stream at {0} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index e30fa080e..dc7991469 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -692,7 +692,7 @@ public class JGitText extends TranslationBundle { /***/ public String sequenceTooLargeForDiffAlgorithm; /***/ public String serviceNotEnabledNoName; /***/ public String serviceNotPermitted; - /***/ public String sha1CollisionDetected1; + /***/ public String sha1CollisionDetected; /***/ public String shallowCommitsAlreadyInitialized; /***/ public String shallowPacksRequireDepthWalk; /***/ public String shortCompressedStreamAt; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/sha1/Sha1CollisionException.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/sha1/Sha1CollisionException.java index dcefe9549..0e5c9192d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/sha1/Sha1CollisionException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/sha1/Sha1CollisionException.java @@ -65,7 +65,7 @@ public class Sha1CollisionException extends RuntimeException { */ public Sha1CollisionException(ObjectId id) { super(MessageFormat.format( - JGitText.get().sha1CollisionDetected1, + JGitText.get().sha1CollisionDetected, id.name())); } }