From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5113 invoked by alias); 30 Dec 2004 12:07:51 -0000 Mailing-List: contact mauve-discuss-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: mauve-discuss-owner@sources.redhat.com Received: (qmail 4071 invoked from network); 30 Dec 2004 12:07:26 -0000 Received: from unknown (HELO namlook.thomas.planescape.com) (212.120.112.227) by sourceware.org with SMTP; 30 Dec 2004 12:07:26 -0000 Received: from dumas.thomas.planescape.com ([10.0.0.2] ident=zander) by namlook.thomas.planescape.com with esmtp (Exim 3.35 #1 (Debian)) id 1Cjz5O-0005jC-00; Thu, 30 Dec 2004 13:07:22 +0100 From: Thomas Zander To: mauve-discuss@sources.redhat.com Subject: locales test has non ascii chars.. Date: Thu, 30 Dec 2004 12:07:00 -0000 User-Agent: KMail/1.7.91 Cc: Michael Koch MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1923242.pypW9xV5CK"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200412301307.07714.zander@kde.org> X-SW-Source: 2004-q4/txt/msg00063.txt.bz2 --nextPart1923242.pypW9xV5CK Content-Type: multipart/mixed; boundary="Boundary-01=_n9+0BvKlyRJA9gt" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_n9+0BvKlyRJA9gt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Content-length: 479 Hi, I'm having trouble getting the localeTest class to compile correctly since= =20 it has non-ascii chars. And lots of them :} I suggest to filter the java file and replace the non ascii values with=20 their \u00xx values instead. See the attached patch and the class to generate this change. I'm worried= =20 about the code on lines 410-414 which contains lots of non-standard chars.= =20 Maybe a typo? Anyway; can you pick this up? Or can I commit? --=20 Thomas Zander --Boundary-01=_n9+0BvKlyRJA9gt Content-Type: text/x-java; charset="us-ascii"; name="Convert.java" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="Convert.java" Content-length: 1516 import java.util.*; import java.io.*; public class Convert { public static void main(String[] args) throws IOException { if(args.length == 0) { System.out.println("Provide filesnames on commandline"); return; } for(int i=0; i < args.length; i++) { convert(args[i]); } } private static void convert(String filename) throws IOException { File one = new File(filename); if(! one.exists()) return; File two = new File(filename +"~"); int count=1; while(two.exists()) { two = new File(filename + String.valueOf(count++) +"~"); } Reader reader = new InputStreamReader(new FileInputStream(one), "ISO-8859-1"); Writer writer = new FileWriter(two); try { while(true) { int character = reader.read(); if(character == -1) break; if(character < 128) writer.write((char) character); else { writer.write("\\u"); String val = Integer.toString((int) ((char) character), 16); for(int i=4; i > val.length(); i--) writer.write("0"); writer.write(val); } } } catch(IOException e) { two.delete(); } finally { reader.close(); writer.close(); } } } --Boundary-01=_n9+0BvKlyRJA9gt Content-Type: text/x-diff; charset="us-ascii"; name="locales_charset.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="locales_charset.diff" Content-length: 7704 Index: gnu/testlet/locales/LocaleTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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=E4= 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\u0= 0e4rz 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=F6sisch", "Belgien", "", "Franz=F6sisch (Belgien)", + "Franz\u00f6sisch", "Belgien", "", "Franz\u00f6sisch (Belgien)", "EUR", 2, "\u20ac"), - new ExpectedDateValues("18.03.1974", "18.03.74", "18.03.1974", "18. M=E4= 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\u0= 0e4rz 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=E4= 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\u0= 0e4rz 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=E4= 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\u0= 0e4rz 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=F6sisch", "Frankreich", "", "Franz=F6sisch (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=E4ndisch", "Niederlande", "", "Niederl=E4ndisch (Niederlan= de)", + "Niederl\u00e4ndisch", "Niederlande", "", "Niederl\u00e4ndisch (Nie= derlande)", "EUR", 2, "\u20ac"), new ExpectedDateValues("18-mrt-1974", "18-3-74", "18-mrt-1974", "18 maar= t 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=F6sisch", "Luxemburg", "", "Franz=F6sisch (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=F6nigreich", "", "Englisch (Vereinigtes = K=F6nigreich)", + "Englisch", "Vereinigtes K\u00f6nigreich", "", "Englisch (Vereinigt= es K\u00f6nigreich)", "GBP", 2, "GBP"), new ExpectedDateValues("18-Mar-1974", "18/03/74", "18-Mar-1974", "18 Mar= ch 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. maali= skuuta 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 CET"), - new ExpectedNumberValues("1=A0000", "1=A0000=A0000", "100", "100,123", "= 10=A0000=A0000,123"), - new ExpectedNumberValues("1=A0000,00 \u20ac", "1=A0000=A0000,00 \u20ac",= "100,00 \u20ac", "100,12 \u20ac", "10=A0000=A0000,12 \u20ac"), - new ExpectedNumberValues("1=A0000", "1=A0000=A0000", "100", "100", "10= =A0000=A0000"), - new ExpectedNumberValues("1=A0000", "1=A0000=A0000", "100", "100,123", "= 10=A0000=A0000,123"), - new ExpectedNumberValues("100=A0000%", "100=A0000=A0000%", "10=A0000%", = "10=A0012%", "1=A0000=A0000=A0012%")); + new ExpectedNumberValues("1\u00a0000", "1\u00a0000\u00a0000", "100", "10= 0,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", "10= 0", "10\u00a0000\u00a0000"), + new ExpectedNumberValues("1\u00a0000", "1\u00a0000\u00a0000", "100", "10= 0,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=FCrkisch", "T=FCrkei", "", "T=FCrkisch (T=FCrkei)", + "T\u00fcrkisch", "T\u00fcrkei", "", "T\u00fcrkisch (T\u00fcrkei)", "TRL", 2, "TRL"), new ExpectedDateValues("18.Mar.1974", "18.03.1974", "18.Mar.1974", "18 M= art 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"), --Boundary-01=_n9+0BvKlyRJA9gt-- --nextPart1923242.pypW9xV5CK Content-Type: application/pgp-signature Content-length: 189 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) iD8DBQBB0+9rCojCW6H2z/QRAs3TAKD4MsjuQ/ADU56HBHxAvur6UDEWnACgyEg7 DAyNgsfj2eTomFEG9XCLTRo= =kWNd -----END PGP SIGNATURE----- --nextPart1923242.pypW9xV5CK--