From 37bb257e3fca7aff4c84cd03c9706e68d9dfe0f5 Mon Sep 17 00:00:00 2001
From: Linus Tolke Y <linus@lysator.liu.se>
Date: Wed, 28 Apr 1993 22:42:53 +0000
Subject: [PATCH] Better error messages.

---
 src/ChangeLog          |  8 ++++++++
 src/commands1.el       | 24 +++++++++++++++++++++++-
 src/edit-text.el       |  6 ++++--
 src/swedish-strings.el |  6 +++++-
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index c4d350b2..ff0b388f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+Thu Apr 29 00:07:36 1993  Linus Tolke Y  (linus@bodil)
+
+	* edit-text.el (lyskom-create-text-handler): Better error message.
+
+	* commands1.el (lyskom-add-member-answer,
+	  lyskom-add-member-answer-rd_prot): Better message when trying to
+	  join a rd_protected conference.
+
 Tue Apr 27 00:48:00 1993  Linus Tolke Y  (linus@bodil)
 
 	* commands2.el, swedish-strings.el, english-strings.el
diff --git a/src/commands1.el b/src/commands1.el
index dc7b75c6..336bba4e 100644
--- a/src/commands1.el
+++ b/src/commands1.el
@@ -390,7 +390,17 @@ If THENDO is nil then execute lyskom-end-of-command."
 					&optional thendo data)
   "Handle the result from an attempt to add a member to a conference."
   (if (null answer)
-      (lyskom-handle-command-answer answer)
+      (progn
+	(lyskom-insert-string 'nope)
+	(if (conf-type->rd_prot conf-conf-stat)
+	    (initiate-get-conf-stat 'main 'lyskom-add-member-answer-rd_prot
+				    (conf-stat->supervisor conf-conf-stat)
+				    conf-conf-stat)
+	  (lyskom-format-insert 'error-code
+				(lyskom-get-error-text lyskom-errno)
+				lyskom-errno)
+	  (lyskom-end-of-command)))
+
     (lyskom-insert-string 'done)
     (cache-del-pers-stat (conf-stat->conf-no pers-conf-stat)) ;+++Borde {ndra i cachen i st{llet.
     (cache-del-conf-stat (conf-stat->conf-no conf-conf-stat)) ;+++Borde {ndra i cachen i st{llet.
@@ -404,6 +414,18 @@ If THENDO is nil then execute lyskom-end-of-command."
 	  (apply 'lyskom-run 'main thendo data)))))
 
 
+(defun lyskom-add-member-answer-rd_prot (supervisorconf conf-conf-stat)
+  "Suggests that we contact the supervisor to become a member."
+  (if (not supervisorconf)
+      (lyskom-format-insert 'cant-find-supervisor
+			    (conf-stat->name conf-conf-stat))
+    (lyskom-format-insert 'is-read-protected-contact-supervisor
+			  (conf-stat->name conf-conf-stat)
+			  (conf-stat->name supervisorconf)))
+  (lyskom-end-of-command))
+
+
+
 (defun lyskom-add-membership (membership conf-stat &optional thendo data)
   "Adds MEMBERSHIP to the sorted list of memberships.
 Args: MEMBERSHIP CONF-STAT THENDO DATA
diff --git a/src/edit-text.el b/src/edit-text.el
index ad3752a5..c7d619b8 100644
--- a/src/edit-text.el
+++ b/src/edit-text.el
@@ -634,9 +634,11 @@ Point must be located on the line where the subject is."
   (cond
    ((null text-no)
     (lyskom-insert-before-prompt
-     (lyskom-format 'could-not-create-text lyskom-errno))
+     (lyskom-format 'could-not-create-text lyskom-errno
+		    (lyskom-get-error-text lyskom-errno)))
     (beep)
-    (lyskom-message (lyskom-format 'could-not-create-text lyskom-errno))
+    (lyskom-message (lyskom-format 'could-not-create-text lyskom-errno
+				   (lyskom-get-error-text lyskom-errno)))
     (set-buffer edit-buffer)
     (setq mode-name lyskom-edit-mode-name)
     (sit-for 0))
diff --git a/src/swedish-strings.el b/src/swedish-strings.el
index 0d8e4df9..b7291cb7 100644
--- a/src/swedish-strings.el
+++ b/src/swedish-strings.el
@@ -200,6 +200,10 @@ Guran vill helst s\344tta en giftpil i dig.\n\n")
     (done . "klart.\n")
     (nope . "Det gick inte.\n")
 
+    (cant-find-supervisor . "Hittar inte organisat\366ren f\366r %#1s.\n")
+    (is-read-protected-contact-supervisor . "%#1s \344r slutet.
+Skicka ett brev till %#2s f\366r medlemsskap.\n")
+
     (conf-does-not-exist . "\nM\366tet finns inte.\n")
 
     (who-to-exclude . "Vem vill du utesluta? ")
@@ -502,7 +506,7 @@ M\344rk kuvertet LysKOM buggrapport.\n\n")
     (added-carbon-copy . "Extra kopia till m\366te: ")
     (conf-has-motd-no . "M\366tet har en lapp p\345 d\366rren. (%#1d)\n\n%#2s")
     (still-want-to-add . "Vill du fortfarande addera m\366tet? ")
-    (could-not-create-text . "\nTexten kunde ej skapas. Felkod: %#1d.\n")
+    (could-not-create-text . "\nTexten kunde ej skapas. Felet: %#2s.\n")
     (no-get-text . "Du fick inte h\344mta texten.")
 
 
-- 
GitLab