diff options
| author | Michael Koch <konqueror@gmx.de> | 2005-01-10 18:26:59 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2005-01-10 18:26:59 +0000 |
| commit | 8a7f33c709536358ef22e939da5c9a7d18a938ee (patch) | |
| tree | a9fad6e33092a3847cd00b6c7748e6866c4e556a /libjava/java | |
| parent | affe6f69d1b62bd4c56c9f3fa5d72430a3847253 (diff) | |
| download | gcc-8a7f33c709536358ef22e939da5c9a7d18a938ee.zip gcc-8a7f33c709536358ef22e939da5c9a7d18a938ee.tar.gz gcc-8a7f33c709536358ef22e939da5c9a7d18a938ee.tar.bz2 | |
re PR libgcj/18014 (java.util.Locale changes variant to upper case)
2005-01-10 Michael Koch <konqueror@gmx.de>
PR libgcj/18014
* java/util/Locale.java (Locale): Don't uppercase variant.
(getISOCountries): Fixed typo in javadoc.
From-SVN: r93150
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/util/Locale.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java index 54fd097..f4498c6 100644 --- a/libjava/java/util/Locale.java +++ b/libjava/java/util/Locale.java @@ -35,6 +35,7 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.util; import java.io.IOException; @@ -74,7 +75,7 @@ import java.io.Serializable; * @see java.text.Collator * @author Jochen Hoenicke * @author Paul Fisher - * @author Eric Blake <ebb9@email.byu.edu> + * @author Eric Blake (ebb9@email.byu.edu) * @since 1.1 * @status updated to 1.4 */ @@ -233,7 +234,7 @@ public final class Locale implements Serializable, Cloneable { language = convertLanguage(language).intern(); country = country.toUpperCase().intern(); - variant = variant.toUpperCase().intern(); + variant = variant.intern(); } this.language = language; this.country = country; @@ -321,7 +322,7 @@ public final class Locale implements Serializable, Cloneable * Returns a list of all 2-letter uppercase country codes as defined * in ISO 3166. * - * @return a list of acceptible country codes + * @return a list of acceptable country codes */ public static String[] getISOCountries() { |