Skip to content

Commit c1b2aec

Browse files
authored
Merge pull request #1455 from losiki/message-format
Fix single quotes in MessageFormat patterns.
2 parents d9f496d + 8be99bb commit c1b2aec

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/main/java/com/gitblit/authority/GitblitAuthority.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ private void load(File folder) {
281281
this.userService = loadUsers(folder);
282282
System.out.println(Constants.baseFolder$ + " set to " + folder);
283283
if (userService == null) {
284-
JOptionPane.showMessageDialog(this, MessageFormat.format("Sorry, {0} doesn't look like a Gitblit GO installation.", folder));
284+
JOptionPane.showMessageDialog(this, MessageFormat.format("Sorry, {0} doesn''t look like a Gitblit GO installation.", folder));
285285
} else {
286286
// build empty certificate model for all users
287287
Map<String, UserCertificateModel> map = new HashMap<String, UserCertificateModel>();

src/main/java/com/gitblit/servlet/GitFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ protected RepositoryModel createRepository(UserModel user, String repository, St
294294
// confirm valid characters in repository name
295295
Character c = StringUtils.findInvalidCharacter(repository);
296296
if (c != null) {
297-
logger.error(MessageFormat.format("Invalid character '{0}' in repository name {1}!", c, repository));
297+
logger.error(MessageFormat.format("Invalid character ''{0}'' in repository name {1}!", c, repository));
298298
return null;
299299
}
300300

src/main/java/com/gitblit/utils/JGitUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ public static byte[] getByteContent(Repository repository, RevTree tree, final S
795795
}
796796
} catch (Throwable t) {
797797
if (throwError) {
798-
error(t, repository, "{0} can't find {1} in tree {2}", path, tree.name());
798+
error(t, repository, "{0} can''t find {1} in tree {2}", path, tree.name());
799799
}
800800
} finally {
801801
rw.dispose();
@@ -837,7 +837,7 @@ public static byte[] getByteContent(Repository repository, String objectId) {
837837
ObjectLoader ldr = repository.open(blob.getId(), Constants.OBJ_BLOB);
838838
content = ldr.getCachedBytes();
839839
} catch (Throwable t) {
840-
error(t, repository, "{0} can't find blob {1}", objectId);
840+
error(t, repository, "{0} can''t find blob {1}", objectId);
841841
} finally {
842842
rw.dispose();
843843
}
@@ -2117,7 +2117,7 @@ public static String getSubmoduleCommitId(Repository repository, String path, Re
21172117
}
21182118
}
21192119
} catch (Throwable t) {
2120-
error(t, repository, "{0} can't find {1} in commit {2}", path, commit.name());
2120+
error(t, repository, "{0} can''t find {1} in commit {2}", path, commit.name());
21212121
} finally {
21222122
rw.dispose();
21232123
tw.close();

0 commit comments

Comments
 (0)