--- a/Date.st	Mon Jul 18 09:20:43 2011 +0200
+++ b/Date.st	Mon Jul 18 09:34:45 2011 +0200
@@ -1374,13 +1374,13 @@
 
 !Date class methodsFor:'private'!
 
-abbreviatedMonthNamesForLanguage:language
+abbreviatedMonthNamesForLanguage:languageOrNilForDefault
     |langMonthAbbrevs lang|
 
     (MonthAbbrevs isNil or:[EnvironmentChange]) ifTrue:[
         self initNames
     ].
-    lang := language ? Smalltalk language.
+    lang := languageOrNilForDefault notNil ifTrue:[languageOrNilForDefault] ifFalse:[Smalltalk language].
     langMonthAbbrevs := MonthAbbrevs at:lang ifAbsent:nil.
 
     "/ If language is not found, try to initialize it from the resources and try again
@@ -1397,15 +1397,17 @@
      self abbreviatedMonthNamesForLanguage:#fr
      self abbreviatedMonthNamesForLanguage:#es
     "
+
+    "Modified (format): / 18-07-2011 / 09:34:20 / cg"
 !
 
-dayAbbrevsForLanguage:language
+dayAbbrevsForLanguage:languageOrNilForDefault
     |langDayAbbrevs lang|
 
     (DayAbbrevs isNil or:[EnvironmentChange]) ifTrue:[
         self initNames
     ].
-    lang := language ? Smalltalk language.
+    lang := languageOrNilForDefault notNil ifTrue:[languageOrNilForDefault] ifFalse:[Smalltalk language].
     langDayAbbrevs := DayAbbrevs at:lang ifAbsent:nil.
 
     "/ If language is not found, try to initialize it from the resources and try again
@@ -1422,15 +1424,17 @@
      self dayAbbrevsForLanguage:#fr
      self dayAbbrevsForLanguage:#es
     "
+
+    "Modified (format): / 18-07-2011 / 09:34:14 / cg"
 !
 
-dayNamesForLanguage:language
+dayNamesForLanguage:languageOrNilForDefault
     |langDayNames lang|
 
     (DayNames isNil or:[EnvironmentChange]) ifTrue:[
         self initNames
     ].
-    lang := language ? Smalltalk language.
+    lang := languageOrNilForDefault notNil ifTrue:[languageOrNilForDefault] ifFalse:[Smalltalk language].
     langDayNames := DayNames at:lang ifAbsent:nil.
 
     "/ If language is not found, try to initialize it from the resources and try again
@@ -1447,6 +1451,8 @@
      self dayNamesForLanguage:#fr
      self dayNamesForLanguage:#es
     "
+
+    "Modified (format): / 18-07-2011 / 09:34:08 / cg"
 !
 
 daysInMonthIndex: monthIndex forYear: yearInteger
@@ -1523,13 +1529,13 @@
     ^ self abbreviatedMonthNamesForLanguage:language
 !
 
-monthNamesForLanguage:language
+monthNamesForLanguage:languageOrNilForDefault
     |langMonthNames lang|
 
     (MonthNames isNil or:[EnvironmentChange]) ifTrue:[
         self initNames
     ].
-    lang := language ? Smalltalk language.
+    lang := languageOrNilForDefault notNil ifTrue:[languageOrNilForDefault] ifFalse:[Smalltalk language].
     langMonthNames := MonthNames at:lang ifAbsent:nil.
 
     "/ If language is not found, try to initialize it from the resources and try again
@@ -1539,6 +1545,8 @@
         langMonthNames := MonthNames at:lang ifAbsent:[MonthNames at:#en.].
     ].
     ^ langMonthNames
+
+    "Modified: / 18-07-2011 / 09:34:32 / cg"
 ! !
 
 !Date class methodsFor:'private-encoding/decoding'!
@@ -2626,6 +2634,7 @@
     "
 ! !
 
+
 !Date methodsFor:'obsolete'!
 
 asAbsoluteTime
@@ -3054,11 +3063,11 @@
 !Date class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Date.st,v 1.138 2011-01-24 19:56:01 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Date.st,v 1.139 2011-07-18 07:34:45 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Date.st,v 1.138 2011-01-24 19:56:01 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Date.st,v 1.139 2011-07-18 07:34:45 cg Exp $'
 ! !
 
 Date initialize!