Merge remote-tracking branch 'campbeb/fix6a' into 6b

Conflicts:
	main/src/cgeo/geocaching/connector/gc/GCParser.java

1 files changed, 25 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/utils/HtmlUtils.java b/main/src/cgeo/geocaching/utils/HtmlUtils.java
index a54ba57..9b627ac 100644
--- a/main/src/cgeo/geocaching/utils/HtmlUtils.java
+++ b/main/src/cgeo/geocaching/utils/HtmlUtils.java
@@ -53,4 +53,29 @@ public class HtmlUtils {
         return StringUtils.replace(result, "<br />", "\n").trim();
     }
 
+    /**
+     * Convert any non-Latin characters into their HTML escaped equivalents
+     * 
+     * @param input
+     *            String
+     * @return output String
+     */
+    public static String convertNonLatinCharactersToHTML(final String input) {
+        final int inputLen = input.length();
+        final StringBuilder output = new StringBuilder();
+
+        for (int i = 0; i < inputLen; i++) {
+            char c = input.charAt(i);
+
+            if (c > 300) {
+                output.append("&#");
+                output.append(Integer.toString(c));
+                output.append(';');
+            } else {
+                output.append(c);
+            }
+        }
+
+        return output.toString();
+    }
 }