Commit 37bb257e authored by Linus Tolke Y's avatar Linus Tolke Y
Browse files

Better error messages.

parent 73adbe40
No preview for this file type
...@@ -390,7 +390,17 @@ If THENDO is nil then execute lyskom-end-of-command." ...@@ -390,7 +390,17 @@ If THENDO is nil then execute lyskom-end-of-command."
&optional thendo data) &optional thendo data)
"Handle the result from an attempt to add a member to a conference." "Handle the result from an attempt to add a member to a conference."
(if (null answer) (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) (lyskom-insert-string 'done)
(cache-del-pers-stat (conf-stat->conf-no pers-conf-stat)) ;+++Borde {ndra i cachen i st{llet. (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. (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." ...@@ -404,6 +414,18 @@ If THENDO is nil then execute lyskom-end-of-command."
(apply 'lyskom-run 'main thendo data))))) (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) (defun lyskom-add-membership (membership conf-stat &optional thendo data)
"Adds MEMBERSHIP to the sorted list of memberships. "Adds MEMBERSHIP to the sorted list of memberships.
Args: MEMBERSHIP CONF-STAT THENDO DATA Args: MEMBERSHIP CONF-STAT THENDO DATA
......
...@@ -634,9 +634,11 @@ Point must be located on the line where the subject is." ...@@ -634,9 +634,11 @@ Point must be located on the line where the subject is."
(cond (cond
((null text-no) ((null text-no)
(lyskom-insert-before-prompt (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) (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) (set-buffer edit-buffer)
(setq mode-name lyskom-edit-mode-name) (setq mode-name lyskom-edit-mode-name)
(sit-for 0)) (sit-for 0))
......
...@@ -200,6 +200,10 @@ Guran vill helst s\344tta en giftpil i dig.\n\n") ...@@ -200,6 +200,10 @@ Guran vill helst s\344tta en giftpil i dig.\n\n")
(done . "klart.\n") (done . "klart.\n")
(nope . "Det gick inte.\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") (conf-does-not-exist . "\nM\366tet finns inte.\n")
(who-to-exclude . "Vem vill du utesluta? ") (who-to-exclude . "Vem vill du utesluta? ")
...@@ -502,7 +506,7 @@ M\344rk kuvertet LysKOM buggrapport.\n\n") ...@@ -502,7 +506,7 @@ M\344rk kuvertet LysKOM buggrapport.\n\n")
(added-carbon-copy . "Extra kopia till m\366te: ") (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") (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? ") (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.") (no-get-text . "Du fick inte h\344mta texten.")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment