From 8be99bb2b38331b42677134462267da5e60e0386 Mon Sep 17 00:00:00 2001
From: Egor Shchegolkov <17323017+losiki@users.noreply.github.com>
Date: Sat, 14 Oct 2023 11:21:29 +0300
Subject: [PATCH] Fix single quotes in MessageFormat patterns.

---
 src/main/java/com/gitblit/authority/GitblitAuthority.java | 2 +-
 src/main/java/com/gitblit/servlet/GitFilter.java          | 2 +-
 src/main/java/com/gitblit/utils/JGitUtils.java            | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gitblit/authority/GitblitAuthority.java b/src/main/java/com/gitblit/authority/GitblitAuthority.java
index 34931bb5..ef8f2142 100644
--- a/src/main/java/com/gitblit/authority/GitblitAuthority.java
+++ b/src/main/java/com/gitblit/authority/GitblitAuthority.java
@@ -281,7 +281,7 @@ public class GitblitAuthority extends JFrame implements X509Log {
 		this.userService = loadUsers(folder);
 		System.out.println(Constants.baseFolder$ + " set to " + folder);
 		if (userService == null) {
-			JOptionPane.showMessageDialog(this, MessageFormat.format("Sorry, {0} doesn't look like a Gitblit GO installation.", folder));
+			JOptionPane.showMessageDialog(this, MessageFormat.format("Sorry, {0} doesn''t look like a Gitblit GO installation.", folder));
 		} else {
 			// build empty certificate model for all users
 			Map<String, UserCertificateModel> map = new HashMap<String, UserCertificateModel>();
diff --git a/src/main/java/com/gitblit/servlet/GitFilter.java b/src/main/java/com/gitblit/servlet/GitFilter.java
index 66933cbd..70da8a9c 100644
--- a/src/main/java/com/gitblit/servlet/GitFilter.java
+++ b/src/main/java/com/gitblit/servlet/GitFilter.java
@@ -294,7 +294,7 @@ public class GitFilter extends AccessRestrictionFilter {
 				// confirm valid characters in repository name
 				Character c = StringUtils.findInvalidCharacter(repository);
 				if (c != null) {
-					logger.error(MessageFormat.format("Invalid character '{0}' in repository name {1}!", c, repository));
+					logger.error(MessageFormat.format("Invalid character ''{0}'' in repository name {1}!", c, repository));
 					return null;
 				}
 
diff --git a/src/main/java/com/gitblit/utils/JGitUtils.java b/src/main/java/com/gitblit/utils/JGitUtils.java
index e70b4f99..cd74569b 100644
--- a/src/main/java/com/gitblit/utils/JGitUtils.java
+++ b/src/main/java/com/gitblit/utils/JGitUtils.java
@@ -795,7 +795,7 @@ public class JGitUtils {
 			}
 		} catch (Throwable t) {
 			if (throwError) {
-				error(t, repository, "{0} can't find {1} in tree {2}", path, tree.name());
+				error(t, repository, "{0} can''t find {1} in tree {2}", path, tree.name());
 			}
 		} finally {
 			rw.dispose();
@@ -837,7 +837,7 @@ public class JGitUtils {
 			ObjectLoader ldr = repository.open(blob.getId(), Constants.OBJ_BLOB);
 			content = ldr.getCachedBytes();
 		} catch (Throwable t) {
-			error(t, repository, "{0} can't find blob {1}", objectId);
+			error(t, repository, "{0} can''t find blob {1}", objectId);
 		} finally {
 			rw.dispose();
 		}
@@ -2117,7 +2117,7 @@ public class JGitUtils {
 				}
 			}
 		} catch (Throwable t) {
-			error(t, repository, "{0} can't find {1} in commit {2}", path, commit.name());
+			error(t, repository, "{0} can''t find {1} in commit {2}", path, commit.name());
 		} finally {
 			rw.dispose();
 			tw.close();
-- 
2.39.5