Fix single quotes in MessageFormat patterns.

diff --git a/src/main/java/com/gitblit/authority/GitblitAuthority.java b/src/main/java/com/gitblit/authority/GitblitAuthority.java
index 34931bb558be2a4b04eeed37bcf7cbd6b6462083..ef8f214204a3a7ba6d8aa929d5e36cb884eb2013 100644 (file)
--- 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);\r
                System.out.println(Constants.baseFolder$ + " set to " + folder);\r
                if (userService == null) {\r
-                       JOptionPane.showMessageDialog(this, MessageFormat.format("Sorry, {0} doesn't look like a Gitblit GO installation.", folder));\r
+                       JOptionPane.showMessageDialog(this, MessageFormat.format("Sorry, {0} doesn''t look like a Gitblit GO installation.", folder));\r
                } else {\r
                        // build empty certificate model for all users\r
                        Map<String, UserCertificateModel> map = new HashMap<String, UserCertificateModel>();\r

diff --git a/src/main/java/com/gitblit/servlet/GitFilter.java b/src/main/java/com/gitblit/servlet/GitFilter.java
index 66933cbddfe40832417079468192646aea19fdc1..70da8a9cbc675219523a52fbb82458b2ac79aca7 100644 (file)
--- 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\r
                                Character c = StringUtils.findInvalidCharacter(repository);\r
                                if (c != null) {\r
-                                       logger.error(MessageFormat.format("Invalid character '{0}' in repository name {1}!", c, repository));\r
+                                       logger.error(MessageFormat.format("Invalid character ''{0}'' in repository name {1}!", c, repository));\r
                                        return null;\r
                                }\r
 \r

diff --git a/src/main/java/com/gitblit/utils/JGitUtils.java b/src/main/java/com/gitblit/utils/JGitUtils.java
index e70b4f996c5633088135e806f2e09b7753136d9a..cd74569b3102106f9853b474eeed5bb6c6b9e00a 100644 (file)
--- 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 {
                        }\r
                } catch (Throwable t) {\r
                        if (throwError) {\r
-                               error(t, repository, "{0} can't find {1} in tree {2}", path, tree.name());\r
+                               error(t, repository, "{0} can''t find {1} in tree {2}", path, tree.name());\r
                        }\r
                } finally {\r
                        rw.dispose();\r
@@ -837,7 +837,7 @@ public class JGitUtils {
                        ObjectLoader ldr = repository.open(blob.getId(), Constants.OBJ_BLOB);\r
                        content = ldr.getCachedBytes();\r
                } catch (Throwable t) {\r
-                       error(t, repository, "{0} can't find blob {1}", objectId);\r
+                       error(t, repository, "{0} can''t find blob {1}", objectId);\r
                } finally {\r
                        rw.dispose();\r
                }\r
@@ -2117,7 +2117,7 @@ public class JGitUtils {
                                }\r
                        }\r
                } catch (Throwable t) {\r
-                       error(t, repository, "{0} can't find {1} in commit {2}", path, commit.name());\r
+                       error(t, repository, "{0} can''t find {1} in commit {2}", path, commit.name());\r
                } finally {\r
                        rw.dispose();\r
                        tw.close();\r