From cbe319b8e7257af21496e6e99fd047a5cc23d960 Mon Sep 17 00:00:00 2001
From: Kevin Bracey <kbracey@gitlab.riscosopen.org>
Date: Wed, 1 Dec 1999 12:26:03 +0000
Subject: [PATCH] *Set Sys$Year would scramble the time. It would also fail to
 internationalise the error generated by *Set Year 20000.

Tested on a 32-bit system - changes grafted back on to 26-bit Kernel.

Version 5.08. Tagged as 'Kernel-5_08'
---
 VersionASM | 20 ++++++++++----------
 VersionNum | 18 +++++++++---------
 s/Arthur2  | 10 ++++++++--
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/VersionASM b/VersionASM
index 6d858eaf..332dc81e 100644
--- a/VersionASM
+++ b/VersionASM
@@ -1,14 +1,14 @@
 ;
 ; This file is automatically maintained by srccommit, do not edit manually.
 ;
-			GBLS	Module_MajorVersion
-			GBLA    Module_Version
-			GBLS	Module_MinorVersion
-			GBLS	Module_Date
-			GBLS	Module_FullVersion
-Module_MajorVersion	SETS    "5.07"
-Module_Version          SETA    507
-Module_MinorVersion	SETS	""
-Module_Date		SETS    "02 Nov 1999"
-Module_FullVersion      SETS    "5.07"
+                        GBLS    Module_MajorVersion
+                        GBLA    Module_Version
+                        GBLS    Module_MinorVersion
+                        GBLS    Module_Date
+                        GBLS    Module_FullVersion
+Module_MajorVersion     SETS    "5.08"
+Module_Version          SETA    508
+Module_MinorVersion     SETS    ""
+Module_Date             SETS    "01 Dec 1999"
+Module_FullVersion      SETS    "5.08"
                         END
diff --git a/VersionNum b/VersionNum
index b7aac6bc..838be98b 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,15 +1,15 @@
-/* (5.07)
+/* (5.08)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG     	5.07
-#define Module_MinorVersion_CMHG	
-#define Module_Date_CMHG      		02 Nov 1999
+#define Module_MajorVersion_CMHG        5.08
+#define Module_MinorVersion_CMHG        
+#define Module_Date_CMHG                01 Dec 1999
 
-#define Module_MajorVersion     	"5.07"
-#define Module_Version                  507
-#define Module_MinorVersion		""
-#define Module_Date      		"02 Nov 1999"
+#define Module_MajorVersion             "5.08"
+#define Module_Version                  508
+#define Module_MinorVersion             ""
+#define Module_Date                     "01 Dec 1999"
 
-#define Module_FullVersion              "5.07"
+#define Module_FullVersion              "5.08"
diff --git a/s/Arthur2 b/s/Arthur2
index 42baf2f7..63d0b17e 100644
--- a/s/Arthur2
+++ b/s/Arthur2
@@ -259,7 +259,11 @@ SetTimeVar ROUT
 
 TimeVarTooLong
         ADRL   R0, ErrorBlock_VarTooLong
+      [ International
+        B      TranslateError
+      |
         ORRS   PC, LR, #V_bit
+      ]
 
 ReadYear
         ADR    R0, SysYearFormat
@@ -375,9 +379,9 @@ SetRC   Push  "lr"
 
         Pull  "PC"
 SetYearPrefixFormat
-        =     "%w3, %dy-%m3-", 0
+        =     "%w3,%dy %m3 ", 0
 SetDateSuffixFormat
-        =     "-%ce%yr", 0
+        =     " %ce%yr", 0
         ALIGN
 
         MakeErrorBlock RCExc
@@ -1748,7 +1752,9 @@ SetVarVal_TestVExit
         B       SLVK_TestV
 
 SetVarValBadExit_Translate
+ [ International
         BL      TranslateError
+ ]
 SetVarValBadExit_NoTranslate
         SETV
         B       SetVarVal_TestVExit
-- 
GitLab