Use unicode escapes in LocaleManager

This ensures that when the plugin is built outside of
Eclipse (where the source file is marked as being in UTF-8
encoding), the special characters are handled correctly.

Change-Id: I94d70bd3fb9d8a6bbf37e83eb30f161a2fc24016

2 files changed, 51 insertions, 9 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LocaleManager.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LocaleManager.java
index 0d30011..43c90d9 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LocaleManager.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LocaleManager.java
@@ -487,7 +487,7 @@ public class LocaleManager {
 
          // "gn": Guaraní -> Paraguay
          sLanguageToCountry.put("gn", "PY"); //$NON-NLS-1$ //$NON-NLS-2$
-         sLanguageNames.put("gn", "Guaraní"); //$NON-NLS-1$
+         sLanguageNames.put("gn", "Guaran\u00ed" /*Guaraní*/); //$NON-NLS-1$
 
          // "gu": Gujarati -> India
          sLanguageToCountry.put("gu", "IN"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -708,7 +708,7 @@ public class LocaleManager {
 
          // "nb": Norwegian -> Norway
          sLanguageToCountry.put("nb", "NO"); //$NON-NLS-1$ //$NON-NLS-2$
-         sLanguageNames.put("nb", "Norwegian Bokmål"); //$NON-NLS-1$
+         sLanguageNames.put("nb", "Norwegian Bokm\u00e5l" /*Norwegian Bokmål*/); //$NON-NLS-1$
 
          // "nd": North Ndebele -> Zimbabwe
          sLanguageToCountry.put("nd", "ZW"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -976,7 +976,7 @@ public class LocaleManager {
 
          // "yo": Yorùbá -> Nigeria, Togo, Benin
          sLanguageToCountry.put("yo", "NG"); //$NON-NLS-1$ //$NON-NLS-2$
-         sLanguageNames.put("yo", "Yorùbá"); //$NON-NLS-1$
+         sLanguageNames.put("yo", "Yor\u00f9b\u00e1" /*Yorùbá*/); //$NON-NLS-1$
 
          // "za": Zhuang -> China
          sLanguageToCountry.put("za", "CN"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -1005,7 +1005,7 @@ public class LocaleManager {
          sRegionNames.put("AT", "Austria"); //$NON-NLS-1$
          sRegionNames.put("AU", "Australia"); //$NON-NLS-1$
          sRegionNames.put("AW", "Aruba"); //$NON-NLS-1$
-         sRegionNames.put("AX", "Åland Islands"); //$NON-NLS-1$
+         sRegionNames.put("AX", "\u00c5land Islands" /*Åland Islands*/); //$NON-NLS-1$
          sRegionNames.put("AZ", "Azerbaijan"); //$NON-NLS-1$
          sRegionNames.put("BA", "Bosnia and Herzegovina"); //$NON-NLS-1$
          sRegionNames.put("BB", "Barbados"); //$NON-NLS-1$
@@ -1016,7 +1016,7 @@ public class LocaleManager {
          sRegionNames.put("BH", "Bahrain"); //$NON-NLS-1$
          sRegionNames.put("BI", "Burundi"); //$NON-NLS-1$
          sRegionNames.put("BJ", "Benin"); //$NON-NLS-1$
-         sRegionNames.put("BL", "Saint Barthélemy"); //$NON-NLS-1$
+         sRegionNames.put("BL", "Saint Barth\u00e9lemy" /*Saint Barthélemy*/); //$NON-NLS-1$
          sRegionNames.put("BM", "Bermuda"); //$NON-NLS-1$
          sRegionNames.put("BN", "Brunei Darussalam"); //$NON-NLS-1$
          sRegionNames.put("BO", "Bolivia, Plurinational State of"); //$NON-NLS-1$
@@ -1034,7 +1034,7 @@ public class LocaleManager {
          sRegionNames.put("CF", "Central African Republic"); //$NON-NLS-1$
          sRegionNames.put("CG", "Congo"); //$NON-NLS-1$
          sRegionNames.put("CH", "Switzerland"); //$NON-NLS-1$
-         sRegionNames.put("CI", "Côte d'Ivoire"); //$NON-NLS-1$
+         sRegionNames.put("CI", "C\u00f4te d'Ivoire" /*Côte d'Ivoire*/); //$NON-NLS-1$
          sRegionNames.put("CK", "Cook Islands"); //$NON-NLS-1$
          sRegionNames.put("CL", "Chile"); //$NON-NLS-1$
          sRegionNames.put("CM", "Cameroon"); //$NON-NLS-1$
@@ -1043,7 +1043,7 @@ public class LocaleManager {
          sRegionNames.put("CR", "Costa Rica"); //$NON-NLS-1$
          sRegionNames.put("CU", "Cuba"); //$NON-NLS-1$
          sRegionNames.put("CV", "Cape Verde"); //$NON-NLS-1$
-         sRegionNames.put("CW", "Curaçao"); //$NON-NLS-1$
+         sRegionNames.put("CW", "Cura\u00e7ao" /*Curaçao*/); //$NON-NLS-1$
          sRegionNames.put("CX", "Christmas Island"); //$NON-NLS-1$
          sRegionNames.put("CY", "Cyprus"); //$NON-NLS-1$
          sRegionNames.put("CZ", "Czech Republic"); //$NON-NLS-1$
@@ -1178,7 +1178,7 @@ public class LocaleManager {
          sRegionNames.put("PW", "Palau"); //$NON-NLS-1$
          sRegionNames.put("PY", "Paraguay"); //$NON-NLS-1$
          sRegionNames.put("QA", "Qatar"); //$NON-NLS-1$
-         sRegionNames.put("RE", "Réunion"); //$NON-NLS-1$
+         sRegionNames.put("RE", "R\u00e9union" /*Réunion*/); //$NON-NLS-1$
          sRegionNames.put("RO", "Romania"); //$NON-NLS-1$
          sRegionNames.put("RS", "Serbia"); //$NON-NLS-1$
          sRegionNames.put("RU", "Russian Federation"); //$NON-NLS-1$
@@ -1257,7 +1257,7 @@ public class LocaleManager {
         // in sLanguageToCountry, since they are either extinct or constructed or
         // only in literary use:
         sLanguageNames.put("pi", "Pali"); //$NON-NLS-1$
-        sLanguageNames.put("vo", "Volapük"); //$NON-NLS-1$
+        sLanguageNames.put("vo", "Volap\u00fck" /*Volapük*/); //$NON-NLS-1$
         sLanguageNames.put("eo", "Esperanto"); //$NON-NLS-1$
         sLanguageNames.put("la", "Latin"); //$NON-NLS-1$
         sLanguageNames.put("ia", "Interlingua"); //$NON-NLS-1$
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LocaleManagerTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LocaleManagerTest.java
index bee3ec7..4ab6a87 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LocaleManagerTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LocaleManagerTest.java
@@ -201,4 +201,46 @@ public class LocaleManagerTest extends TestCase {
             }
         }
     }
+
+    /* Utility useful for identifying strings which must be using \\u in the string names
+     * to ensure that they are handled properly during the build (outside of Eclipse,
+     * where this source file is marked as using UTF-8.
+    public void testPrintable() {
+        Set<String> languageCodes = LocaleManager.getLanguageCodes();
+        for (String code : languageCodes) {
+            String name = LocaleManager.getLanguageName(code);
+            assertNotNull(name);
+            checkEncoding(name);
+        }
+
+        Set<String> regionCodes = LocaleManager.getRegionCodes();
+        for (String code : regionCodes) {
+            String name = LocaleManager.getRegionName(code);
+            assertNotNull(name);
+            checkEncoding(name);
+        }
+    }
+
+    private static void checkEncoding(String s) {
+        for (int i = 0, n = s.length(); i < n; i++) {
+            char c = s.charAt(i);
+            if (c >= 128) {
+                System.out.println("Need unicode encoding for '" + s + "'");
+                StringBuilder sb = new StringBuilder();
+                for (int j = 0, m = s.length(); j < m; j++) {
+                    char d = s.charAt(j);
+                    if (d < 128) {
+                        sb.append(d);
+                    } else {
+                        sb.append('\\');
+                        sb.append('u');
+                        sb.append(String.format("%04x", (int)d));
+                    }
+                }
+                System.out.println(" Replacement=" + sb);
+                return;
+            }
+        }
+    }
+     */
 }