diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-08-27 15:05:09 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2018-08-27 15:05:09 -0400 |
| commit | cf60f26d26db2dc4f2d46264d5417e51c4e05c91 (patch) | |
| tree | 786bd1f875b623c59e2b29979a10513b905567e2 | |
| parent | 074168f2de074560de3e03d05603048798453d1a (diff) | |
| parent | 5e68fe245fb97f38620ea683dbeab724bf86da4c (diff) | |
| download | jgit-cf60f26d26db2dc4f2d46264d5417e51c4e05c91.tar.gz jgit-cf60f26d26db2dc4f2d46264d5417e51c4e05c91.zip | |
Merge "Externalize warning message in RefDirectory.delete()"
3 files changed, 4 insertions, 1 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 2150d5ce3e..abe5161df1 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -705,6 +705,7 @@ truncatedHunkOldLinesMissing=Truncated hunk, at least {0} old lines is missing tSizeMustBeGreaterOrEqual1=tSize must be >= 1 unableToCheckConnectivity=Unable to check connectivity. unableToCreateNewObject=Unable to create new object: {0} +unableToRemovePath=Unable to remove path ''{0}'' unableToStore=Unable to store {0}. unableToWrite=Unable to write {0} unauthorized=Unauthorized 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 2373b97bd1..871d28de13 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -766,6 +766,7 @@ public class JGitText extends TranslationBundle { /***/ public String tSizeMustBeGreaterOrEqual1; /***/ public String unableToCheckConnectivity; /***/ public String unableToCreateNewObject; + /***/ public String unableToRemovePath; /***/ public String unableToStore; /***/ public String unableToWrite; /***/ public String unauthorized; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 40c6de33fa..9b2865d85a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -1293,7 +1293,8 @@ public class RefDirectory extends RefDatabase { // same prefix break; } catch (IOException e) { - LOG.warn("Unable to remove path {}", dir, e); //$NON-NLS-1$ + LOG.warn(MessageFormat.format(JGitText.get().unableToRemovePath, + dir), e); break; } dir = dir.getParentFile(); |