Index: gnu/testlet/locales/LocaleTest.java =================================================================== RCS file: /cvs/mauve/mauve/gnu/testlet/locales/LocaleTest.java,v retrieving revision 1.1 diff -u -3 -p -r1.1 LocaleTest.java --- gnu/testlet/locales/LocaleTest.java 26 Dec 2004 17:02:16 -0000 1.1 +++ gnu/testlet/locales/LocaleTest.java 30 Dec 2004 12:04:30 -0000 @@ -271,7 +271,7 @@ public class LocaleTest new ExpectedValues("de", "DE", "", "de_DE", "deu", "DEU", "Deutsch", "Deutschland", "", "Deutsch (Deutschland)", "EUR", 2, "\u20ac"), - new ExpectedDateValues("18.03.1974", "18.03.74", "18.03.1974", "18. März 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 CET"), + new ExpectedDateValues("18.03.1974", "18.03.74", "18.03.1974", "18. M\u00e4rz 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 CET"), new ExpectedNumberValues("1.000", "1.000.000", "100", "100,123", "10.000.000,123"), new ExpectedNumberValues("1.000,00 \u20ac", "1.000.000,00 \u20ac", "100,00 \u20ac", "100,12 \u20ac", "10.000.000,12 \u20ac"), new ExpectedNumberValues("1.000", "1.000.000", "100", "100", "10.000.000"), @@ -280,9 +280,9 @@ public class LocaleTest // Locale: Belgium checkLocale(h, new Locale("fr", "BE"), new ExpectedValues("fr", "BE", "", "fr_BE", "fra", "BEL", - "Französisch", "Belgien", "", "Französisch (Belgien)", + "Franz\u00f6sisch", "Belgien", "", "Franz\u00f6sisch (Belgien)", "EUR", 2, "\u20ac"), - new ExpectedDateValues("18.03.1974", "18.03.74", "18.03.1974", "18. März 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 CET"), + new ExpectedDateValues("18.03.1974", "18.03.74", "18.03.1974", "18. M\u00e4rz 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 CET"), new ExpectedNumberValues("1.000", "1.000.000", "100", "100,123", "10.000.000,123"), new ExpectedNumberValues("1.000,00 \u20ac", "1.000.000,00 \u20ac", "100,00 \u20ac", "100,12 \u20ac", "10.000.000,12 \u20ac"), new ExpectedNumberValues("1.000", "1.000.000", "100", "100", "10.000.000"), @@ -295,7 +295,7 @@ public class LocaleTest new ExpectedValues("el", "GR", "", "el_GR", "ell", "GRC", "Griechisch", "Griechenland", "", "Griechisch (Griechenland)", "EUR", 2, "\u20ac"), - new ExpectedDateValues("18.03.1974", "18.03.74", "18.03.1974", "18. März 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 CET"), + new ExpectedDateValues("18.03.1974", "18.03.74", "18.03.1974", "18. M\u00e4rz 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 CET"), new ExpectedNumberValues("1.000", "1.000.000", "100", "100,123", "10.000.000,123"), new ExpectedNumberValues("1.000,00 \u20ac", "1.000.000,00 \u20ac", "100,00 \u20ac", "100,12 \u20ac", "10.000.000,12 \u20ac"), new ExpectedNumberValues("1.000", "1.000.000", "100", "100", "10.000.000"), @@ -307,7 +307,7 @@ public class LocaleTest new ExpectedValues("en", "IE", "", "en_IE", "eng", "IRL", "Englisch", "Irland", "", "Englisch (Irland)", "EUR", 2, "\u20ac"), - new ExpectedDateValues("18.03.1974", "18.03.74", "18.03.1974", "18. März 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 CET"), + new ExpectedDateValues("18.03.1974", "18.03.74", "18.03.1974", "18. M\u00e4rz 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 CET"), new ExpectedNumberValues("1.000", "1.000.000", "100", "100,123", "10.000.000,123"), new ExpectedNumberValues("1.000,00 \u20ac", "1.000.000,00 \u20ac", "100,00 \u20ac", "100,12 \u20ac", "10.000.000,12 \u20ac"), new ExpectedNumberValues("1.000", "1.000.000", "100", "100", "10.000.000"), @@ -316,7 +316,7 @@ public class LocaleTest // Locale: France checkLocale(h, new Locale("fr", "FR"), new ExpectedValues("fr", "FR", "", "fr_FR", "fra", "FRA", - "Französisch", "Frankreich", "", "Französisch (Frankreich)", + "Franz\u00f6sisch", "Frankreich", "", "Franz\u00f6sisch (Frankreich)", "EUR", 2, "\u20ac"), null, null, @@ -360,7 +360,7 @@ public class LocaleTest // Locale: The Netherlands checkLocale(h, new Locale("nl", "NL"), new ExpectedValues("nl", "NL", "", "nl_NL", "nld", "NLD", - "Niederländisch", "Niederlande", "", "Niederländisch (Niederlande)", + "Niederl\u00e4ndisch", "Niederlande", "", "Niederl\u00e4ndisch (Niederlande)", "EUR", 2, "\u20ac"), new ExpectedDateValues("18-mrt-1974", "18-3-74", "18-mrt-1974", "18 maart 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 CET"), new ExpectedNumberValues("1.000", "1.000.000", "100", "100,123", "10.000.000,123"), @@ -371,7 +371,7 @@ public class LocaleTest // Locale: Luxemborg checkLocale(h, new Locale("fr", "LU"), new ExpectedValues("fr", "LU", "", "fr_LU", "fra", "LUX", - "Französisch", "Luxemburg", "", "Französisch (Luxemburg)", + "Franz\u00f6sisch", "Luxemburg", "", "Franz\u00f6sisch (Luxemburg)", "EUR", 2, "\u20ac"), null, null, @@ -382,7 +382,7 @@ public class LocaleTest // Locale: United Kingdom checkLocale(h, Locale.UK, new ExpectedValues("en", "GB", "", "en_GB", "eng", "GBR", - "Englisch", "Vereinigtes Königreich", "", "Englisch (Vereinigtes Königreich)", + "Englisch", "Vereinigtes K\u00f6nigreich", "", "Englisch (Vereinigtes K\u00f6nigreich)", "GBP", 2, "GBP"), new ExpectedDateValues("18-Mar-1974", "18/03/74", "18-Mar-1974", "18 March 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 CET"), new ExpectedNumberValues("1,000", "1,000,000", "100", "100.123", "10,000,000.123"), @@ -407,15 +407,15 @@ public class LocaleTest "Finnisch", "Finnland", "", "Finnisch (Finnland)", "EUR", 2, "EUR"), new ExpectedDateValues("18.3.1974", "18.3.1974", "18.3.1974", "18. maaliskuuta 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 CET"), - new ExpectedNumberValues("1 000", "1 000 000", "100", "100,123", "10 000 000,123"), - new ExpectedNumberValues("1 000,00 \u20ac", "1 000 000,00 \u20ac", "100,00 \u20ac", "100,12 \u20ac", "10 000 000,12 \u20ac"), - new ExpectedNumberValues("1 000", "1 000 000", "100", "100", "10 000 000"), - new ExpectedNumberValues("1 000", "1 000 000", "100", "100,123", "10 000 000,123"), - new ExpectedNumberValues("100 000%", "100 000 000%", "10 000%", "10 012%", "1 000 000 012%")); + new ExpectedNumberValues("1\u00a0000", "1\u00a0000\u00a0000", "100", "100,123", "10\u00a0000\u00a0000,123"), + new ExpectedNumberValues("1\u00a0000,00 \u20ac", "1\u00a0000\u00a0000,00 \u20ac", "100,00 \u20ac", "100,12 \u20ac", "10\u00a0000\u00a0000,12 \u20ac"), + new ExpectedNumberValues("1\u00a0000", "1\u00a0000\u00a0000", "100", "100", "10\u00a0000\u00a0000"), + new ExpectedNumberValues("1\u00a0000", "1\u00a0000\u00a0000", "100", "100,123", "10\u00a0000\u00a0000,123"), + new ExpectedNumberValues("100\u00a0000%", "100\u00a0000\u00a0000%", "10\u00a0000%", "10\u00a0012%", "1\u00a0000\u00a0000\u00a0012%")); // Locale: Turkey checkLocale(h, new Locale("tr", "TR"), new ExpectedValues("tr", "TR", "", "tr_TR", "tur", "TUR", - "Türkisch", "Türkei", "", "Türkisch (Türkei)", + "T\u00fcrkisch", "T\u00fcrkei", "", "T\u00fcrkisch (T\u00fcrkei)", "TRL", 2, "TRL"), new ExpectedDateValues("18.Mar.1974", "18.03.1974", "18.Mar.1974", "18 Mart 1974 Pazartesi", "17:20:30", "17:20", "17:20:30", "17:20:30 CET"), new ExpectedNumberValues("1.000", "1.000.000", "100", "100,123", "10.000.000,123"),