Commit 4d3efcc4 authored by Linus Tolke Y's avatar Linus Tolke Y
Browse files

Random fixes. Mostly in the strings-files.

parent 7f5d8e3e
No preview for this file type
......@@ -91,12 +91,15 @@ this function shall be with current-buffer the BUFFER."
(new-name (lyskom-parse-string)))
(lyskom-save-excursion
(set-buffer buffer)
(if (= conf-no lyskom-pers-no)
(lyskom-insert-before-prompt
(lyskom-format 'you-changed-name-to new-name)))
(cache-del-conf-stat conf-no) ;+++Borde {ndra i cachen i st{llet.
(cond
((lyskom-is-in-minibuffer))
(kom-presence-messages
(lyskom-message (lyskom-format 'name-has-changed-to-name
old-name new-name))))
(lyskom-message "%s" (lyskom-format 'name-has-changed-to-name
old-name new-name))))
(cond
(kom-presence-messages-in-buffer
(lyskom-insert-before-prompt
......@@ -167,10 +170,16 @@ this function shall be with current-buffer the BUFFER."
(message (lyskom-parse-string)))
(lyskom-save-excursion
(set-buffer buffer)
(initiate-get-conf-stat 'async
'lyskom-show-personal-message sender
recipient
message))))
(cond
((string= message " ")
(initiate-send-message 'follow nil sender
(format "emacs-version: %s\nclient-version: %s"
(emacs-version)
lyskom-clientversion)))
(t (initiate-get-conf-stat 'async
'lyskom-show-personal-message sender
recipient
message))))))
((eq msg-no 13) ; New logout
(let ((pers-no (lyskom-parse-num))
......
......@@ -565,15 +565,19 @@ means send the message to everybody."
;;; Rehacked: Inge Wallin
(defun kom-list-news ()
(defun kom-list-news (num)
"Runs lyskom-start-of-command and then gets all conferences using
lyskom-prefetch-all-confs."
(interactive)
(interactive "P")
(lyskom-start-of-command 'kom-list-news)
(lyskom-prefetch-all-confs 'lyskom-list-news))
(lyskom-prefetch-all-confs (cond
((numberp num) num)
((and (listp num)
(numberp (car num))) (car num))
(t nil)) 'lyskom-list-news))
(defun lyskom-list-news ()
(defun lyskom-list-news (num-arg)
"Print the number of unread articles to the user."
(interactive)
(let ((sum 0))
......@@ -584,10 +588,12 @@ lyskom-prefetch-all-confs."
(name (conf-stat->name (read-info->conf-stat info))))
(cond
((eq (read-info->type info) 'CONF)
(lyskom-insert
(if (/= un 1)
(lyskom-format 'you-have-unreads un name)
(lyskom-format 'you-have-an-unread name)))
(if (or (not num-arg)
(>= (-- num-arg) 0))
(lyskom-insert
(if (/= un 1)
(lyskom-format 'you-have-unreads un name)
(lyskom-format 'you-have-an-unread name))))
(setq sum (+ sum un)))))))
(read-list->all-entries lyskom-to-do-list))
(if (= 0 sum)
......@@ -736,7 +742,7 @@ on one line."
(lyskom-start-of-command 'kom-list-summary)
(if (read-list-isempty lyskom-reading-list)
(progn
(lyskom-insert-string 'have-to-be-in-conf)
(lyskom-insert-string 'have-to-be-in-conf-with-unread)
(lyskom-end-of-command))
(initiate-get-time 'main 'lyskom-list-summary-all
(text-list->texts
......
......@@ -393,7 +393,7 @@ Your public message:
(waiting-higher-than .
"You are waiting for an article in any conference with a priority higher than %#1d.\n")
(have-to-be-in-conf . "You must go to the conference first.\n")
(have-to-be-in-conf-with-unread . "You must go to a non-empty conference first.\n")
(Texts . "Article")
(Date . "Date")
(Lines . "Lines")
......@@ -532,6 +532,7 @@ Mark the envelope with \"LysKOM bug report\"\n\n")
(name-has-changed-to-name . "%#1s has changed name to %#2s")
(name-has-changed-to-name-r . "%#1s has changed name to %#2s\n")
(you-changed-name-to . "You have now changed name to %#1s.\n")
(database-sync . "Synching database.")
(lyskom-is-full . "\
===========================================================
......
No preview for this file type
......@@ -136,7 +136,7 @@ du \344r os\344ker.\n")
(could-not-create-you . "Det gick inte att skapa personen.\n")
(presentation-subject . "%#1s")
(presentation-form . "Namn:\t\nAdress:\t\n\t\nTelefon:
(presentation-form . "Namn:\t\nAdress:\t\nStad:\t\nTelefon:
Email-adress:\n\nAnnat:\t")
(presentation-help . "Du skriver just nu din presentation.\n")
(not-present-anywhere . "Ej n\344rvarande i n\345got m\366te.")
......@@ -401,7 +401,7 @@ Ditt allm\344nna meddelande l\366d:
(waiting-higher-than .
"Du v\344ntar p\345 ett inl\344gg i ett m\366te med h\366gre prioritet \344n %#1d.\n")
(have-to-be-in-conf . "Du m\345ste g\345 till ett m\366te f\366rst.\n")
(have-to-be-in-conf-with-unread . "Du m\345ste g\345 till ett icketomt m\366te f\366rst.\n")
(Texts . "Inl\344gg")
(Date . "Datum")
(Lines . "Rader")
......@@ -541,6 +541,7 @@ M\344rk kuvertet LysKOM buggrapport.\n\n")
(name-has-changed-to-name . "%#1s har nu bytt namn till %#2s")
(name-has-changed-to-name-r . "%#1s har nu bytt namn till %#2s\n")
(you-changed-name-to . "Nu har du bytt namn till %#1s.\n")
(database-sync . "Databasen synkas.")
(lyskom-is-full . "\
===========================================================
......
......@@ -223,7 +223,7 @@ Dont change these. These are defined by the protocol.")
;;; Internal variables and constants
(defconst lyskom-clientversion "0.35"
(defconst lyskom-clientversion "0.36"
"Version of the LysKOM elisp client.")
(defconst lyskom-max-int 8388607
......
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