From 23af4452e882e382c966b9d23e04a4b969a41773 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 21 Jan 2019 23:30:51 +0100 Subject: [PATCH] pgm: Externalize error message Change-Id: Id9e33104c9681dc9a57674c1648c994a503fa6b8 Signed-off-by: Matthias Sohn --- .../resources/org/eclipse/jgit/pgm/internal/CLIText.properties | 1 + org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reset.java | 3 ++- .../src/org/eclipse/jgit/pgm/internal/CLIText.java | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties index 418e59e48..7c4119fd0 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties @@ -187,6 +187,7 @@ remoteRefObjectChangedIsNotExpectedOne=remote ref object changed - is not expect remoteSideDoesNotSupportDeletingRefs=remote side does not support deleting refs removing=Removing {0} repaint=Repaint +resetNoMode=no reset mode set s3InvalidBucket=Invalid S3 bucket ''{0}'' serviceNotSupported=Service ''{0}'' not supported skippingObject=skipping {0} {1} diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reset.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reset.java index bb81ffbd3..b3e81c6d6 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reset.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reset.java @@ -50,6 +50,7 @@ import org.eclipse.jgit.api.ResetCommand; import org.eclipse.jgit.api.ResetCommand.ResetType; import org.eclipse.jgit.api.errors.GitAPIException; +import org.eclipse.jgit.pgm.internal.CLIText; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; import org.kohsuke.args4j.spi.RestOfArgumentsHandler; @@ -95,7 +96,7 @@ protected void run() { mode = selectMode(mode, ResetType.HARD); } if (mode == null) { - throw die("no reset mode set"); //$NON-NLS-1$ + throw die(CLIText.get().resetNoMode); } command.setMode(mode); } diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java index 6a8a03eaf..d0288a809 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java @@ -290,6 +290,7 @@ public static String fatalError(String message) { /***/ public String remoteSideDoesNotSupportDeletingRefs; /***/ public String removing; /***/ public String repaint; + /***/ public String resetNoMode; /***/ public String s3InvalidBucket; /***/ public String serviceNotSupported; /***/ public String skippingObject;