--- a/Date.st	Fri Oct 02 10:41:51 2009 +0200
+++ b/Date.st	Fri Oct 02 10:44:20 2009 +0200
@@ -158,7 +158,7 @@
     ShortFormats at:#'en' put:(enShortFormat := '%d-%m-%y').
     LongFormats at:#'en' put:(enLongFormat := '%(dayName), %d-%m-%y').
 
-    EnvironmentChange := (Smalltalk language asSymbol ~~ #'en').
+    EnvironmentChange := (UserPreferences current language asSymbol ~~ #'en').
 
     "
      Date initNames
@@ -176,7 +176,7 @@
         self initDefaultNames.
     ].
 
-    lang := Smalltalk language asSymbol.
+    lang := UserPreferences current language asSymbol.
     lang ~~ #'en' ifTrue:[
         ResourcePack notNil ifTrue:[
             enDayNames := DayNames at:#'en'.
@@ -751,6 +751,7 @@
     "
 ! !
 
+
 !Date class methodsFor:'change & update'!
 
 update:something with:aParameter from:changedObject
@@ -1033,7 +1034,7 @@
 
     monthIndex := self indexOfMonth:aMonthString language:nil.
     "/ if not found, retry in english
-    (monthIndex == 0 and:[ Smalltalk language ~= 'en' ])
+    (monthIndex == 0 and:[ UserPreferences current language ~= 'en' ])
     ifTrue:[
         monthIndex := self indexOfMonth:aMonthString language:'en'.
     ].
@@ -1332,7 +1333,7 @@
     (MonthAbbrevs isNil or:[EnvironmentChange]) ifTrue:[
         self initNames
     ].
-    langMonthAbbrevs := MonthAbbrevs at:(language ? Smalltalk language) ifAbsent:nil.
+    langMonthAbbrevs := MonthAbbrevs at:(language ? UserPreferences current language) ifAbsent:nil.
     langMonthAbbrevs isNil ifTrue:[
         langMonthAbbrevs := MonthAbbrevs at:#en.
     ].
@@ -1351,7 +1352,7 @@
     (DayAbbrevs isNil or:[EnvironmentChange]) ifTrue:[
         self initNames
     ].
-    langDayAbbrevs := DayAbbrevs at:(language ? Smalltalk language) ifAbsent:nil.
+    langDayAbbrevs := DayAbbrevs at:(language ? UserPreferences current language) ifAbsent:nil.
     langDayAbbrevs isNil ifTrue:[
         langDayAbbrevs := DayAbbrevs at:#en.
     ].
@@ -1364,7 +1365,7 @@
     (DayNames isNil or:[EnvironmentChange]) ifTrue:[
         self initNames
     ].
-    langDayNames := DayNames at:(language ? Smalltalk language) ifAbsent:nil.
+    langDayNames := DayNames at:(language ? UserPreferences current language) ifAbsent:nil.
     langDayNames isNil ifTrue:[
         langDayNames := DayNames at:#en.
     ].
@@ -1451,7 +1452,7 @@
     (MonthNames isNil or:[EnvironmentChange]) ifTrue:[
         self initNames
     ].
-    langMonthNames := MonthNames at:(language ? Smalltalk language) ifAbsent:nil.
+    langMonthNames := MonthNames at:(language ? UserPreferences current language) ifAbsent:nil.
     langMonthNames isNil ifTrue:[
         langMonthNames := MonthNames at:#en.
     ].
@@ -2948,7 +2949,11 @@
 !Date class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Date.st,v 1.126 2009-09-22 13:17:21 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Date.st,v 1.127 2009-10-02 08:44:20 cg Exp $'
+!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libbasic/Date.st,v 1.127 2009-10-02 08:44:20 cg Exp $'
 ! !
 
 Date initialize!