--- a/Date.st	Thu Nov 19 15:35:22 2015 +0100
+++ b/Date.st	Thu Nov 19 15:36:52 2015 +0100
@@ -246,7 +246,7 @@
     ].
 
     Smalltalk addDependent:self.
-    Language ~= 'en' ifTrue:[
+    Smalltalk language ~= 'en' ifTrue:[
         EnvironmentChange := true
     ]
 ! !
@@ -1270,7 +1270,7 @@
     (DefaultFormats isNil or:[EnvironmentChange]) ifTrue:[
         self initNames
     ].
-    ^ DefaultFormats at:Language ifAbsent:(DefaultFormats at:#en).
+    ^ DefaultFormats at:Smalltalk language ifAbsent:(DefaultFormats at:#en).
 
     "
      Date today printStringFormat:(Date defaultFormatString).
@@ -1421,9 +1421,9 @@
 
 longFormatString
     (LongFormats isNil or:[EnvironmentChange]) ifTrue:[
-	self initNames
+        self initNames
     ].
-    ^ LongFormats at:Language ifAbsent:(LongFormats at:#en).
+    ^ LongFormats at:Smalltalk language ifAbsent:(LongFormats at:#en).
 
     "
      Date today printStringFormat:(Date defaultFormatString). 
@@ -1544,9 +1544,9 @@
 
 shortFormatString
     (ShortFormats isNil or:[EnvironmentChange]) ifTrue:[
-	self initNames
+        self initNames
     ].
-    ^ ShortFormats at:Language ifAbsent:(ShortFormats at:#en).
+    ^ ShortFormats at:Smalltalk language ifAbsent:(ShortFormats at:#en).
 
     "
      Date today printStringFormat:(Date defaultFormatString).
@@ -3600,12 +3600,13 @@
     "append a printed representation of the receiver to aStream.
      The argument languageOrNil can only be #en or nil for the current language."
 
-    |format|
+    |format langUsed|
 
     (DefaultFormats isNil or:[EnvironmentChange]) ifTrue:[
         self class initNames
     ].
-    format := DefaultFormats at:(languageOrNil ? Language) ifAbsent:[DefaultFormats at:#en].
+    langUsed := languageOrNil notNil ifTrue:[languageOrNil] ifFalse:[Smalltalk language].    
+    format := DefaultFormats at:langUsed ifAbsent:[DefaultFormats at:#en].
     self printOn:aStream format:format language:languageOrNil.
 
     "