From f7ae2a8425edfa56dd2927b8eb1fdc8ead94e79f Mon Sep 17 00:00:00 2001 From: Stardrad Yin <yin8086@gmail.com> Date: Wed, 05 Mar 2014 10:16:53 -0500 Subject: [PATCH] Fix Chinese translate strings --- src/main/java/com/gitblit/utils/StringUtils.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/gitblit/utils/StringUtils.java b/src/main/java/com/gitblit/utils/StringUtils.java index ed10eb6..5813c3a 100644 --- a/src/main/java/com/gitblit/utils/StringUtils.java +++ b/src/main/java/com/gitblit/utils/StringUtils.java @@ -127,6 +127,8 @@ retStr.append("%2F"); } else if (inStr.charAt(i) == ' ') { retStr.append("%20"); + } else if (inStr.charAt(i) == '&') { + retStr.append("%26"); } else { retStr.append(inStr.charAt(i)); } @@ -136,6 +138,18 @@ } /** + * Flatten the list of strings into a single string with the specified + * separator. + * + * @param values + * @param separator + * @return flattened list + */ + public static String flattenStrings(String[] values, String separator) { + return flattenStrings(Arrays.asList(values), separator); + } + + /** * Flatten the list of strings into a single string with a space separator. * * @param values -- Gitblit v1.9.1