From: Kevin Sawicki <kevin@github.com>
Date: Wed, 16 Nov 2011 16:04:55 +0000 (-0800)
Subject: Add missing '' characters around quoted variables
X-Git-Tag: v1.2.0.201112221803-r~26^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1b472a7954f2614698f1e7295172a97a63050c46;p=jgit.git

Add missing '' characters around quoted variables

Double ' characters are needed for variables to appear in
single quotes.  Variables surrounded with a s single ' will
not be replaced when formatted

Change-Id: I0182c1f679ba879ca19dd81bf46924f415dc6003
Signed-off-by: Kevin Sawicki <kevin@github.com>
---

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PackParserTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PackParserTest.java
index 719cc66671..01e69cb44d 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PackParserTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PackParserTest.java
@@ -204,7 +204,7 @@ public class PackParserTest extends RepositoryTestCase {
 			fail("Pack with trailing garbage was accepted");
 		} catch (IOException err) {
 			assertEquals(
-					MessageFormat.format(JGitText.get().expectedEOFReceived, "\\x73"),
+					MessageFormat.format(JGitText.get().expectedEOFReceived, "\\x7e"),
 					err.getMessage());
 		}
 	}
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
index b8cf4e73a1..9fe603ff8d 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
@@ -12,8 +12,8 @@ abortingRebase=Aborting rebase: resetting to {0}
 abortingRebaseFailed=Could not abort rebase
 advertisementCameBefore=advertisement of {0}^{} came before {1}
 advertisementOfCameBefore=advertisement of {0}^{} came before {1}
-amazonS3ActionFailed={0} of '{1}' failed: {2} {3}
-amazonS3ActionFailedGivingUp={0} of '{1}' failed: Giving up after {2} attempts.
+amazonS3ActionFailed={0} of ''{1}'' failed: {2} {3}
+amazonS3ActionFailedGivingUp={0} of ''{1}'' failed: Giving up after {2} attempts.
 ambiguousObjectAbbreviation=Object abbreviation {0} is ambiguous
 anExceptionOccurredWhileTryingToAddTheIdOfHEAD=An exception occurred while trying to add the Id of HEAD
 anSSHSessionHasBeenAlreadyCreated=An SSH session has been already created
@@ -102,7 +102,7 @@ corruptObjectGarbageAfterSize=garbage after size
 corruptObjectIncorrectLength=incorrect length
 corruptObjectInvalidEntryMode=invalid entry mode
 corruptObjectInvalidMode2=invalid mode {0}
-corruptObjectInvalidMode3=invalid mode {0} for {1} '{2}' in {3}.
+corruptObjectInvalidMode3=invalid mode {0} for {1} ''{2}'' in {3}.
 corruptObjectInvalidMode=invalid mode
 corruptObjectInvalidType2=invalid type {0}
 corruptObjectInvalidType=invalid type
@@ -191,9 +191,9 @@ expectedACKNAKFoundEOF=Expected ACK/NAK, found EOF
 expectedACKNAKGot=Expected ACK/NAK, got: {0}
 expectedBooleanStringValue=Expected boolean string value
 expectedCharacterEncodingGuesses=Expected {0} character encoding guesses
-expectedEOFReceived=expected EOF; received '{0}' instead
-expectedGot=expected '{0}', got '{1}'
-expectedPktLineWithService=expected pkt-line with '# service=-', got '{0}'
+expectedEOFReceived=expected EOF; received ''{0}'' instead
+expectedGot=expected ''{0}'', got ''{1}''
+expectedPktLineWithService=expected pkt-line with '# service=-', got ''{0}''
 expectedReceivedContentType=expected Content-Type {0}; received Content-Type {1}
 expectedReportForRefNotReceived={0}: expected report for ref {1} not received
 failedUpdatingRefs=failed updating refs