From bfe24dd9f0356ad571cde123c5810865a2207f9e Mon Sep 17 00:00:00 2001
From: ivanovlev <ivanovlev@mail.ru>
Date: Sun, 15 Jan 2017 22:46:30 +0300
Subject: [PATCH] Refactoring

---
 .../gadgetbridge/util/LanguageUtils.java               | 10 ++--------
 app/src/main/res/xml/changelog_master.xml              |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LanguageUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LanguageUtils.java
index a9a80aae..735dfd1f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LanguageUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/LanguageUtils.java
@@ -10,7 +10,7 @@ public class LanguageUtils {
     private static Map<Character, String> transliterateMap = new HashMap<Character, String>(){
         {
             //extended ASCII characters
-            put('æ', "ae"); put('œ', "oe"); put('ß', "B");
+            put('æ', "ae"); put('œ', "oe"); put('ß', "B"); put('ª', "a"); put('º', "o");
 
             //russian chars
             put('а', "a"); put('б', "b"); put('в', "v");  put('г', "g"); put('д', "d"); put('е', "e"); put('ё', "jo"); put('ж', "zh");
@@ -67,13 +67,7 @@ public class LanguageUtils {
 
     //convert diacritic
     private static String flattenToAscii(String string) {
-        char[] out = new char[string.length()];
         string = Normalizer.normalize(string, Normalizer.Form.NFD);
-        int j = 0;
-        for (int i = 0, n = string.length(); i < n; ++i) {
-            char c = string.charAt(i);
-            if (c <= '\u007F') out[j++] = c;
-        }
-        return new String(out);
+        return string.replaceAll("\\p{M}", "");
     }
 }
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index d4b9c14b..8e71c9a0 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -2,7 +2,7 @@
 <changelog>
     <release version="0.17.0" versioncode="81">
         <change>Add weather support through "Weather Notification" app</change>
-	    <change>Various fixes for K9 mail when using the generic notification receiver</change>
+        <change>Various fixes for K9 mail when using the generic notification receiver</change>
         <change>Added transliteration option for notifications in the settings screen</change>
         <change>Add a preference to hide the notification icon of Gadgetbridge</change>