Skip to content

Fix single quotes in MessageFormat patterns. #1455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/gitblit/authority/GitblitAuthority.java
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ private void load(File folder) {
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>();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gitblit/servlet/GitFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ protected RepositoryModel createRepository(UserModel user, String repository, St
// 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;
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/gitblit/utils/JGitUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ public static byte[] getByteContent(Repository repository, RevTree tree, final S
}
} 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();
Expand Down Expand Up @@ -837,7 +837,7 @@ public static byte[] getByteContent(Repository repository, String objectId) {
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();
}
Expand Down Expand Up @@ -2117,7 +2117,7 @@ public static String getSubmoduleCommitId(Repository repository, String path, Re
}
}
} 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();
Expand Down