Skip to content

GitLab

Commit cd382642 authored by David Byers's avatar David Byers
Browse files

Fix bug 746 

Visa passiva medlemmar utgråade i statuslistor
parent 8892a935
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 26 deletions
src/ChangeLog
View file @ cd382642
2002-09-15 David Byers <david.byers@swipnet.se>
Fix bug 746:
* commands2.el (kom-status-person): Count unreads in passive
conferences separately. Show passive memberships in gray.
(kom-status-conf): Show passive members in gray.
2002-09-14 David Byers <david.byers@swipnet.se>
Start fixing bug 750:
......
src/commands2.el
View file @ cd382642
......@@ -306,11 +306,15 @@ otherwise: the conference is read with lyskom-completing-read."
;; (described by MEMBERSHIP) in CONF-STAT.
(if (or (null membership))
(lyskom-insert-string 'secret-membership)
(lyskom-insert
(format "%17s"
(lyskom-format-time
'date-and-time
(membership->last-time-read membership))))
(lyskom-format-insert
"%#1@%-17#2s"
(if (membership-type->passive
(member->membership-type member))
'(face kom-dim-face)
nil)
(lyskom-format-time
'date-and-time
(membership->last-time-read membership)))
(let ((unread (- (+ (conf-stat->first-local-no
conf-stat)
(conf-stat->no-of-texts conf-stat))
......@@ -324,6 +328,10 @@ otherwise: the conference is read with lyskom-completing-read."
(format "%9d " unread))
(member->pers-no member)
(lyskom-return-membership-type (member->membership-type member))
(if (membership-type->passive
(member->membership-type member))
'(face kom-dim-face)
nil)
)
(when (and (member->created-by member)
(not (zerop (member->created-by member)))
......@@ -457,13 +465,15 @@ author of that text will be shown."
(let ((membership-list
(blocking-do 'get-membership
(conf-stat->conf-no conf-stat)))
(lyskom-count-var 0))
(lyskom-count-var 0)
(lyskom-passive-count-var 0))
(if (null membership-list)
(lyskom-format-insert 'not-allowed-see-confs conf-stat)
(lyskom-format-insert 'is-member-of conf-stat)
(lyskom-insert-string 'membership-list-header)
(setq lyskom-count-var 0)
(setq lyskom-passive-count-var 0)
(lyskom-traverse
membership membership-list
(let ((cs (cache-get-conf-stat
......@@ -482,11 +492,15 @@ author of that text will be shown."
(if (or (null member-conf-stat)
(null membership))
(lyskom-insert-string 'secret-membership)
(lyskom-insert
(format "%17s"
(lyskom-format-time
'date-and-time
(membership->last-time-read membership))))
(lyskom-format-insert
"%#1@%-17#2s"
(if (membership-type->passive
(membership->type membership))
'(face kom-dim-face)
nil)
(lyskom-format-time
'date-and-time
(membership->last-time-read membership)))
(let ((unread (- (+ (conf-stat->first-local-no
member-conf-stat)
(conf-stat->no-of-texts
......@@ -503,7 +517,12 @@ author of that text will be shown."
(lyskom-get-string 'is-supervisor-mark)
" ")
member-conf-stat
(lyskom-return-membership-type (membership->type membership))
(lyskom-return-membership-type
(membership->type membership))
(if (membership-type->passive
(membership->type membership))
'(face kom-dim-face)
nil)
)
(when (and (membership->created-by membership)
(not (zerop (membership->created-by membership)))
......@@ -514,13 +533,16 @@ author of that text will be shown."
'date-and-time
(membership->created-at membership))
(membership->created-by membership)))
(setq lyskom-count-var (+ lyskom-count-var unread)))))))
(if (membership-type->passive (membership->type membership))
(setq lyskom-passive-count-var
(+ lyskom-passive-count-var unread))
(setq lyskom-count-var (+ lyskom-count-var unread))))))))
;; "Print the total number of unread texts for the person CONF-STAT."
(lyskom-format-insert 'his-total-unread
conf-stat
lyskom-count-var))))))
lyskom-count-var
lyskom-passive-count-var))))))
......
src/english-strings.el
View file @ cd382642
......@@ -587,7 +587,7 @@ Read all about it at http://www.lysator.liu.se/history/")
; From commands2.el:
(your-memberships . "Your LysKOM conference memberships:\n")
(memberships-header . "Last access Prio Unread Conference\n")
(memberships-header . "Last access Prio Unread Conference\n")
(memberships-line . "%16#1s %#2d\t%#3d\t%#4M\n")
(conf-for-status . "Get status of which conference? ")
......@@ -635,9 +635,9 @@ Read all about it at http://www.lysator.liu.se/history/")
(show-membership-info-q . "Show number of unreads? ")
(conf-has-these-members . "\n%#1M has the following members:\n")
(conf-has-no-members . "\n%#1M has no members.\n")
(member-list-header . "Last entered Unread Name\n\n")
(member-list-header . "\nLast entered Unread Name\n")
(secret-membership . "--- Secret line ---\n")
(conf-membership-line . "%#1s%#2M %#3s\n")
(conf-membership-line . "%#4@%#1s%#2M %#3s\n")
(conf-membership-line-2 . " Added %#1s by %#2P\n")
(pers-for-status . "Get status of which user? ")
(text-to-see-author-status-of . "Get status of the author of which text? ")
......@@ -664,13 +664,13 @@ Read all about it at http://www.lysator.liu.se/history/")
(show-membership-list-also-q . "List memberships? ")
(not-allowed-see-confs . "%#1P is not a member of any conferences.\n")
(is-member-of . "\n%#1P is a member of the following conferences:\n")
(membership-list-header . "Last access Unread Conference\n\n")
(pers-membership-line . "%#1s%#2s%#3M %#4s\n")
(membership-list-header . "\nLast access Unread Conference\n")
(pers-membership-line . "%#5@%#1s%#2s%#3M %#4s\n")
(pers-membership-line-2 . " Added %#1s by %#2P\n")
(is-supervisor-mark . "O ")
(who-to-send-message-to . "Send message to whom? (%s) ")
(send-empty-message-p . "The message is empty. Send it anyway? ")
(his-total-unread . "\n%#1M has a total of %#2d unread texts.\n")
(his-total-unread . "\n%#1M has %#2d unread texts (plus %#3d in passive memberships).\n")
(message-prompt . "Message: ")
(message-sent-to-user . "\
%[%#3$================================================================
......
src/swedish-strings.el
View file @ cd382642
......@@ -618,9 +618,9 @@ i svensk datorhistoria. L
(show-membership-info-q . "Visa antalet olsta? ")
(conf-has-these-members . "\n%#1M har fljande medlemmar:\n")
(conf-has-no-members . "\n%#1M har inga medlemmar.\n")
(member-list-header . "Senast inne Osett Namn\n\n")
(member-list-header . "\nSenast inne Osett Namn\n")
(secret-membership . "*** Hemlig rad ***\n")
(conf-membership-line . "%#1s%#2M %#3s\n")
(conf-membership-line . "%#4@%#1s%#2M %#3s\n")
(conf-membership-line-2 . " Adderad %#1s av %#2P\n")
(pers-for-status . "Vem vill du se statusen fr? ")
(text-to-see-author-status-of . "Vilken texts frfattare vill du statusen fr? ")
......@@ -647,13 +647,13 @@ i svensk datorhistoria. L
(show-membership-list-also-q . "Vill du se vilka mten personen r medlem i ocks? ")
(not-allowed-see-confs . "%#1P r inte medlem i ngra mten.\n")
(is-member-of . "\n%#1P r medlem i fljande mten:\n")
(membership-list-header . "Senast inne Osett Namn\n\n")
(pers-membership-line . "%#1s%#2s%#3M %#4s\n")
(membership-list-header . "\nSenast inne Osett Namn\n")
(pers-membership-line . "%#5@%#1s%#2s%#3M %#4s\n")
(pers-membership-line-2 . " Adderad %#1s av %#2P\n")
(is-supervisor-mark . "O ")
(who-to-send-message-to . "Vem vill du skicka meddelandet till? (%s) ")
(send-empty-message-p . "Meddelandet r tomt. Vill du nd skicka det? ")
(his-total-unread . "\n%#1M har totalt %#2d olsta.\n")
(his-total-unread . "\n%#1M har totalt %#2d olsta (plus %#3d i passiva medlemskap).\n")
(message-prompt . "Meddelande: ")
(message-sent-to-user . "\
%[%#3$\
......
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