OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Locale.java (CHINESE, [...]): New locales. 

1999-08-06  Mojo Jojo <mojojojo@pacbell.net>

	* java/util/Locale.java, CHINESE, ENGLISH, FRENCH, GERMAN,
	ITALIAN, JAPANESE, KOREAN, CANADA_FRENCH, GERMANY, ITALY, KOREA,
	SIMPLIFIED_CHINESE, TRADITIONAL_CHINESE, PRC, TAIWAN, CHINA): New
	locales.
	(toString): Print correctly when `country' is empty.

From-SVN: r28548
This commit is contained in:
Mojo Jojo 1999-08-06 08:38:50 +00:00 committed by Tom Tromey
parent 2dbd129523
commit 3a6bdebaa0
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -1,3 +1,11 @@
1999-08-06 Mojo Jojo <mojojojo@pacbell.net>
* java/util/Locale.java, CHINESE, ENGLISH, FRENCH, GERMAN,
ITALIAN, JAPANESE, KOREAN, CANADA_FRENCH, GERMANY, ITALY, KOREA,
SIMPLIFIED_CHINESE, TRADITIONAL_CHINESE, PRC, TAIWAN, CHINA): New
locales.
(toString): Print correctly when `country' is empty.
1999-08-04 Per Bothner <per@bothner.com>
* configure.in: Also do AC_SUBST for DIVIDESPEC.

36
libjava/java/util/Locale.java
View File

@ -27,13 +27,36 @@ public final class Locale implements java.io.Serializable, Cloneable
private String variant;
private static Locale defaultLocale;
// FIXME: many are still missing.
// These are as specified in the JDK 1.2 AP documentation
// LANGUAGE constants ... country-neutral
public static final Locale CHINESE = new Locale ("zh", "");
public static final Locale ENGLISH = new Locale ("en", "");
public static final Locale FRENCH = new Locale ("fr", "");
public static final Locale GERMAN = new Locale ("de", "");
public static final Locale ITALIAN = new Locale ("it", "");
public static final Locale JAPANESE = new Locale ("ja", "");
public static final Locale KOREAN = new Locale ("ko", "");
// COUNTRY constants ... countries can be multi-lingual
public static final Locale CANADA = new Locale ("en", "CA");
public static final Locale CANADA_FRENCH = new Locale ("fr", "CA");
public static final Locale FRANCE = new Locale ("fr", "FR");
public static final Locale GERMANY = new Locale ("de", "DE");
public static final Locale ITALY = new Locale ("it", "IT");
public static final Locale JAPAN = new Locale ("ja", "JP");
public static final Locale KOREA = new Locale ("ko", "KR");
public static final Locale UK = new Locale ("en", "GB");
public static final Locale US = new Locale ("en", "US");
// Chinese has multiple scripts and political bodies
public static final Locale SIMPLIFIED_CHINESE = new Locale ("zh", "CN");
public static final Locale TRADITIONAL_CHINESE = new Locale ("zh", "TW");
public static final Locale PRC = SIMPLIFIED_CHINESE;
public static final Locale TAIWAN = TRADITIONAL_CHINESE;
public static final Locale CHINA = PRC;
public Locale (String languageCode, String countryCode)
{
this (languageCode, countryCode, "");
@ -114,12 +137,15 @@ public final class Locale implements java.io.Serializable, Cloneable
{
StringBuffer result = new StringBuffer(20);
result.append(language);
result.append('_');
result.append(country);
if (variant.length() > 0)
if (country.length() > 0)
{
result.append('_');
result.append(variant);
result.append(country);
if (variant.length() > 0)
{
result.append('_');
result.append(variant);
}
}
return result.toString();
}