[kaffe] CVS kaffe (robilad): Resynced with GNU classpath: updates for german locale

[Kaffe CVS]

PatchSet 5684 
Date: 2004/12/20 20:59:20
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU classpath: updates for german locale

2004-12-20  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/gnu/java/locale/LocaleInformation_de.java,
        libraries/javalib/gnu/java/locale/LocaleInformation_de_DE.java:
        Resynced with GNU Classpath.

        2004-12-17  Michael Koch  <konqueror at gmx.de>

        * gnu/java/locale/LocaleInformation_de.java,
        gnu/java/locale/LocaleInformation_de_DE.java:
        Updated.

Members: 
	ChangeLog:1.3230->1.3231 
	libraries/javalib/gnu/java/locale/LocaleInformation_de.java:1.4->1.5 
	libraries/javalib/gnu/java/locale/LocaleInformation_de_DE.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3230 kaffe/ChangeLog:1.3231
--- kaffe/ChangeLog:1.3230	Mon Dec 20 20:48:57 2004
+++ kaffe/ChangeLog	Mon Dec 20 20:59:20 2004
@@ -2,6 +2,18 @@
 
 	* libraries/javalib/gnu/java/locale/LocaleInformation_de.java,
 	libraries/javalib/gnu/java/locale/LocaleInformation_de_DE.java:
+        Resynced with GNU Classpath.
+
+	2004-12-17  Michael Koch  <konqueror at gmx.de>
+
+        * gnu/java/locale/LocaleInformation_de.java,
+        gnu/java/locale/LocaleInformation_de_DE.java:
+        Updated.
+
+2004-12-20  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/javalib/gnu/java/locale/LocaleInformation_de.java,
+	libraries/javalib/gnu/java/locale/LocaleInformation_de_DE.java:
 	Resynced with GNU Classpath.
 
 	2004-12-17  Michael Koch  <konqueror at gmx.de>
Index: kaffe/libraries/javalib/gnu/java/locale/LocaleInformation_de.java
diff -u kaffe/libraries/javalib/gnu/java/locale/LocaleInformation_de.java:1.4 kaffe/libraries/javalib/gnu/java/locale/LocaleInformation_de.java:1.5
--- kaffe/libraries/javalib/gnu/java/locale/LocaleInformation_de.java:1.4	Sat Dec  4 01:33:44 2004
+++ kaffe/libraries/javalib/gnu/java/locale/LocaleInformation_de.java	Mon Dec 20 20:59:22 2004
@@ -406,7 +406,6 @@
     { "fullDateFormat", "EEEE, d. MMMM yyyy" },
     { "fullTimeFormat", "H:mm' Uhr 'z" },
     { "zoneStrings", zoneStrings },
-    { "territories", territories },
     { "defaultDateFormat", defaultDateFormat },
     { "shortTimeFormat", shortTimeFormat },
     { "mediumTimeFormat", mediumTimeFormat },
@@ -414,6 +413,7 @@
     { "currencySymbol", currencySymbol },
     { "intlCurrencySymbol", intlCurrencySymbol },
     { "monetarySeparator", monetarySeparator },
+    { "territories", territories }
   };
 
   public Object[][] getContents() { return contents; }
Index: kaffe/libraries/javalib/gnu/java/locale/LocaleInformation_de_DE.java
diff -u kaffe/libraries/javalib/gnu/java/locale/LocaleInformation_de_DE.java:1.2 kaffe/libraries/javalib/gnu/java/locale/LocaleInformation_de_DE.java:1.3
--- kaffe/libraries/javalib/gnu/java/locale/LocaleInformation_de_DE.java:1.2	Sat Dec  4 01:33:45 2004
+++ kaffe/libraries/javalib/gnu/java/locale/LocaleInformation_de_DE.java	Mon Dec 20 20:59:22 2004
@@ -48,38 +48,24 @@
   static final String groupingSeparator = ".";
   static final String numberFormat = "#,###,##0.###";
   static final String percentFormat = "#,###,##0%";
-  static final String[] weekdays = { null, "Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag" };
-
-  static final String[] shortWeekdays = { null, "Son", "Mon", "Die", "Mit", "Don", "Fre", "Sam" };
-
-  static final String[] shortMonths = { "Jan", "Feb", "M\u00E4r", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez", null };
-
-  static final String[] months = { "Januar", "Februar", "M\u00E4rz", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember", null };
-
   static final String[] ampms = { "", "" };
-
   static final String shortDateFormat = "dd.MM.yyyy";
   static final String defaultTimeFormat = "";
   static final String currencySymbol = "DM";
   static final String intlCurrencySymbol = "DEM";
-  static final String currencyFormat = "#,###,##0.00 $;-#,###,##0.00 $";
 
   private static final Object[][] contents =
   {
-    { "weekdays", weekdays },
-    { "shortWeekdays", shortWeekdays },
-    { "shortMonths", shortMonths },
-    { "months", months },
     { "ampms", ampms },
     { "shortDateFormat", shortDateFormat },
     { "defaultTimeFormat", defaultTimeFormat },
     { "currencySymbol", currencySymbol },
     { "intlCurrencySymbol", intlCurrencySymbol },
-    { "currencyFormat", currencyFormat },
     { "decimalSeparator", decimalSeparator },
     { "groupingSeparator", groupingSeparator },
     { "numberFormat", numberFormat },
     { "percentFormat", percentFormat },
+    { "currencyFormat", "#,##0.00 \u00a4;-#,##0.00 \u00a4" }
   };
 
   public Object[][] getContents() { return contents; }