Skip to content

GitLab

Commit 79afadfe authored by David Byers's avatar David Byers
Browse files

Updated strings for the settings buffer. 

Updated the settings buffer.
New command for saving texts.
parent d6a9a7e5
Hide whitespace changes
Inline Side-by-side
doc/NEWS-0.46
View file @ 79afadfe
......@@ -27,6 +27,23 @@ f
* Fitjurs, förbättringar och andra förändringar
** Kommandot "Spara text (på fil)" har bytt namn till "Arkivera inlägg
(till fil)". Ett nytt kommando "Spara inläggstext (på fil)" sparar
bara inläggskroppen (och tömmer filen om den redan fanns.)
** Mail som importeras av en modern importör, till exempel
komimportmail, visas prydligt. Variablerna
kom-show-imported-envelope-sender,
kom-show-imported-external-recipients och
kom-show-imported-importer styr detaljerna.
** Nytt kommando Återse brevhuvud visar e-mail-headers för mail
importerade med en modern importör.
** Se tiden kan visa veckonummer.
** Personliga meddelanden kan visas med klockslaget då de kom.
** Nytt kommando "Ändra prioritet" för att ändra prioritet på ett
visst möte. Det går som förut att göra med "Bli medlem" också.
......
src/ChangeLog
View file @ 79afadfe
1999-10-11 David Byers <davby@ida.liu.se>
* option-edit.el: Added several missing variables to widget
definitions and buffer format.
* english-strings.el: Added customize strings.
* swedish-strings.el: Added customize strings.
1999-10-10 David Byers <davby@ida.liu.se>
* lyskom-rest.el (kom-save-text): Use def-kom-command.
(kom-save-text-body): New command.
* vars.el.in (kom-show-imported-envelope-sender): New variable.
(kom-show-imported-importer): New variable.
(kom-show-imported-external-recipients): New variable.
* view-text.el (lyskom-deferred-insert-footer): Always set the
name variable so that the footer will have the right number of
dashes.
(lyskom-view-text): Only show importer, external recipients and
envelope sender if the user wants to.
Sat Oct 9 18:54:16 1999 David Byers <davby@sen2.ida.liu.se>
* Release av 0.46-BETA-8
......
src/english-strings.el
View file @ 79afadfe
......@@ -253,6 +253,7 @@ Be ashamed of being You! You have a very good reason.\n\n")
(where-to-add-self . "Join which conference? ")
(priority-q . "Conference priority? (0 (passive membership), 1 (low) - 255 (high)) ")
(done . "done.\n")
(cancelled . "cancelled.\n")
(nope . "didn't work.\n")
(cant-find-supervisor . "Can't find supervisor of %#1M.\n")
......@@ -975,7 +976,11 @@ You should set it to a better value.\n")
(several-unread . "%#1M - %#2d unread texts\n")
(enter-conf . "%#1M\n")
(save-on-file-q . "Save which text in file: (%#1s) ")
(save-on-file-q . "Archive text on file: (%#1s) ")
(save-text-to-file-q . "Save body of text %#1n in which file: ")
(save-text-confirm . "File %#1s exists. Overwrite? ")
(saving-text . "Saving text %#1n as %#2s...")
(what-save-no . "Which text do you want to save? ")
(wait-for-prompt . "Wait for the prompt.")
(conference-no . "<mte %#1d>")
......@@ -1449,7 +1454,8 @@ You must become an active member of the conference to enter it.\n")
(kom-set-super-conf . "Change superconference")
(kom-set-permitted-submitters . "Change allowed authors")
(kom-unset-conf-motd . "Remove notice")
(kom-save-text . "Save text (in file)")
(kom-save-text . "Archive text (in file)")
(kom-save-text-body . "Save text body (in file)")
(kom-edit-options . "Change options")
(kom-save-options . "Save options")
(kom-shutdown-server . "Shut down (server)")
......@@ -2103,6 +2109,17 @@ Select whether to execute command or keyboard macro.")
(truncate-threshold-lines . "Max lines")
(first . "First")
(last . "Last")
(specific-placement . "Specific location")
(priority . "Priority")
(same-as-conf . "Same as current conference")
(custom-format . "Custom format")
(default-format . "Standard format")
(a-string . "The string")
(some-string . "A random string")
(unspecified . "Unspecified")
;;
;; Misc doc strings
;;
......@@ -2632,6 +2649,113 @@ be saved in the server. Otherwise it will be saved in your .emacs.")
This only works in Swedish. If you're running LysKOM in Swedish, turning
this on causes today's names to be shown when you ask for the time.")
(kom-show-week-number-doc . "\
The Time command shows week numbers if this is on.")
(kom-membership-default-placement-doc . "\
This controls where new memberships are placed. First means before
all existing memberships of the same priority. Last means after all
existing memberships of the same priority. A number indicates a
fixed placement (although the client will eventually sort the membership
list in order of priority.)")
(kom-show-imported-importer-doc . "\
The importer of an imported e-mail message is shown if this is on.
This only works with compliant e-mail importers.")
(kom-show-imported-envelope-sender-doc . "\
The actual sender (the envelope sender) of imported e-mails is shown
if this is on. This only works with compliant e-mail importers.")
(kom-show-imported-external-recipients-doc . "\
Show external recipients and CC recipients of imported e-mails if this
is on. This only works with compilant e-mail importers.")
(kom-agree-text-doc . "\
Default text for the Agree command. It can either be a text of a list
of texts. If it is a list, one of the texts will be chosen at random.")
(kom-silent-ansaphone-doc . "\
If this is off, the client will not beep when a personal, group, or
public message is received when the auto reply feature is on.")
(kom-default-session-priority-doc . "\
The session priority of new sessions. Conferences with a lower priority
will not be read.")
(kom-unsubscribe-makes-passive-doc . "\
When this is on, the first time you leave a conference you become a
passive member. Leaving the conference again ubsubscribes you completely.
When this is off, leaving a conference unsubscribes you immediately.")
(kom-review-priority-doc . "\
Priority for review commands. This setting can be used to give review
commands a higher priority than normal. The default priority is the
same as the conference currently being read. Set this to 256 or higher
if you want review commands to take precedence over all conferences.")
(kom-show-creating-software-doc . "\
Show the name of the client used to create a text if the information
is present and this setting is on.")
(kom-text-footer-format-doc . "\
Format for the text footer. In the format string, %n is replaced by the
text number, %P with the author's name, %p with the authods number, %f
with information about the text (HTML, filled, etc), and %- with a
suitable dashed line. A number after the percent sign is the minimum
number of characters to use. A minus sign before the number causes text
to be left justified within the field. An equals sign causes text
longer than the indicated width to be truncated.")
(kom-long-lines-doc . "\
When this is on, most of the dashed lines are made longer than normal.")
(kom-postpone-default-doc . "\
Number of texts to postpone with the Postpone reading command.")
(kom-allow-incompleteness-doc . "\
When this is on, the client will not wait for information about all
unread texts, even if it is needed. The result is that List news and
some other commands do not yield accurate results shortly after logging
in. When this is off, the client will wait for informationn on all
unread texts when it is needed.")
(kom-smileys-doc . "\
When this is on, Emacs supports it, and the appropriate package
(smiley.el, which is part of gnus) is installed, smileys will be
shown graphically.")
(kom-ignore-message-senders-doc . "\
Don't show personal, group or alarm messages from these senders.")
(kom-ignore-message-recipients-doc . "\
Don't show group messages to these recipients.")
(kom-text-footer-dash-length-doc . "\
The total length of the text footer when long dashed lines are not
in effect and no custom format is being used.")
(kom-text-header-dash-length-doc . "\
The total length of the text header when long dashed lines are not
in effect.")
(kom-show-personal-message-date-doc . "\
When this is on, the date and time is shown on all personal, group and
alarm messages.")
(kom-ding-on-no-subject-doc . "")
(kom-ding-on-personal-messages-doc . "")
(kom-ding-on-group-messages-doc . "")
(kom-ding-on-common-messages-doc . "")
(kom-ding-on-no-subject-doc . "")
(kom-ding-on-wait-done-doc . "")
(kom-ding-on-priority-break-doc . "")
(kom-ding-on-new-letter-doc . "")
(kom-check-for-new-comments-doc . "")
(kom-check-commented-author-membership . "")
(kom-confirm-multiple-recipients-doc . "")
;;
;; Tags for variables
;;
......@@ -2747,6 +2871,28 @@ be saved in the server. Otherwise it will be saved in your .emacs.")
(kom-default-language-tag . "Default language: ")
(kom-show-namedays-tag . "Show today's names:")
(kom-ispell-dictionary-tag . "Spelling dictionary:")
(kom-show-week-number-tag . "Show week number:")
(kom-membership-default-placement-tag . "Placement of new memberships:")
(kom-show-imported-importer-tag . "Show importer of imported messages:")
(kom-show-imported-envelope-sender-tag . "Show sender of imported messages:")
(kom-show-imported-external-recipients-tag . "Show external recipients of impoted messages:")
(kom-agree-text-tag . "Default text for Agree:")
(kom-silent-ansaphone-tag . "Beep when auto reply is on:")
(kom-default-session-priority-tag . "Default session priority:")
(kom-unsubscribe-makes-passive-tag . "Leaving a conference converts membership to passive:")
(kom-review-priority-tag . "Priority for review commands:")
(kom-show-creating-software-tag . "Show creating software:")
(kom-text-footer-format-tag . "Text footer format:")
(kom-long-lines-tag . "Long dashed lines:")
(kom-postpone-default-tag . "Default number of texts to postpone:")
(kom-allow-incompleteness-tag . "Allow incomplete information about unread texts:")
(kom-smileys-tag . "Show smileys graphically")
(kom-ignore-message-senders-tag . "Don't show messages from")
(kom-ignore-message-recipients-tag . "Don't show messages to")
(kom-text-footer-dash-length-tag . "Text footer length")
(kom-text-header-dash-length-tag . "Length of dashed line before text")
(kom-show-personal-message-date-tag . "Show date and time of messages")
)
)
......
src/lyskom-rest.el
View file @ 79afadfe
......@@ -2165,14 +2165,14 @@ A list of pairs means OPTARG will be used as a key to look up the real
(forward-paragraph arg)))
(defun kom-save-text (&optional arg)
(def-kom-command kom-save-text (&optional arg)
"Saves/appends the article before point to a file.
The article is determined by a search-backward the same as backward-text
and then a forward-text.
With an argument ARG the search is done over that number of texts.
The name of the file is read using the minibuffer and the default is kom-text."
(interactive "p")
(let ((buf (lyskom-get-buffer-create 'temp " *kom*-text"))
(let ((buf (lyskom-get-buffer-create 'temp " *kom*-text" t))
(lyskom-print-complex-dates nil)
(list-of-texts nil)
(kom-deferred-printing nil)
......@@ -2187,6 +2187,7 @@ The name of the file is read using the minibuffer and the default is kom-text."
arg (1- arg))
(setq arg 0)))
(set-buffer buf)
(erase-buffer)
(mapcar (function
(lambda (n)
(lyskom-view-text n)
......@@ -2206,8 +2207,51 @@ The name of the file is read using the minibuffer and the default is kom-text."
lyskom-saved-file-name))))
(append-to-file (point-min) (point-max) (expand-file-name name))
(setq lyskom-saved-file-name name))
; (kill-buffer buf)
)))
)))
(def-kom-command kom-save-text-body (text-no &optional filename)
"Save the body of text TEXT-NO to file FILENAME."
(interactive (list (lyskom-read-text-no-prefix-arg 'what-save-no t)
nil))
(blocking-do-multiple ((text-stat (get-text-stat text-no))
(text (get-text text-no)))
(if (or (null text-stat) (null text))
(lyskom-format-insert 'no-such-text-no text-no)
(let* ((mx-filename (lyskom-get-aux-item (text-stat->aux-items text-stat) 10104))
(filename nil))
(while (null filename)
(setq filename
(read-file-name (lyskom-format 'save-text-to-file-q text-no)
(and mx-filename
(file-name-directory (aux-item->data (car mx-filename))))
nil
nil
(and mx-filename
(aux-item->data (car mx-filename)))))
(if (file-directory-p filename)
(setq filename nil)
(if (or (not (file-exists-p filename))
(prog1
(lyskom-j-or-n-p
(lyskom-format 'save-text-confirm filename)
t)
(lyskom-message "")))
(let ((buf (lyskom-get-buffer-create 'temp " *kom*-text" t))
(str (text->text-mass text)))
(condition-case nil
(progn
(lyskom-format-insert 'saving-text text-no filename)
(when (string-match "\n" str)
(setq str (substring str (match-end 0))))
(save-excursion
(set-buffer buf)
(erase-buffer)
(insert str)
(write-region (point-min) (point-max) filename))
(lyskom-insert (lyskom-get-string 'done)))
(quit (lyskom-insert (lyskom-get-string 'cancelled)))
(error (lyskom-insert (lyskom-get-string 'nope))))))))))))
......
src/option-edit.el
View file @ 79afadfe
......@@ -63,6 +63,7 @@
"\n"
[kom-default-language]
[kom-show-namedays]
[kom-show-week-number]
"\n"
[kom-idle-hide]
[kom-show-where-and-what]
......@@ -74,6 +75,7 @@
[kom-presence-messages-in-buffer]
"\n"
[kom-page-before-command]
[kom-agree-text]
"\n\n"
section
(window-locations bold centered)
......@@ -105,31 +107,51 @@
[kom-ding-on-priority-break]
[kom-ding-on-new-letter]
[kom-ding-on-wait-done]
[kom-ding-on-no-subject]
[kom-ding-on-common-messages]
[kom-ding-on-group-messages]
[kom-ding-on-personal-messages]
[kom-ding-on-no-subject]
[kom-silent-ansaphone]
"\n\n"
section
(reading bold centered)
section
"\n"
[kom-default-session-priority]
[kom-print-number-of-unread-on-entrance]
[kom-allow-incompleteness]
[kom-created-texts-are-read]
[kom-higher-priority-breaks]
[kom-review-priority]
[kom-show-footnotes-immediately]
[kom-follow-comments-outside-membership]
"\n"
[kom-default-mark]
[kom-membership-default-priority]
[kom-membership-default-placement]
[kom-unsubscribe-makes-passive]
[kom-postpone-default]
"\n"
[kom-print-number-of-unread-on-entrance]
[kom-autowrap]
[kom-dashed-lines]
[kom-show-author-at-end]
[kom-show-creating-software]
[kom-show-imported-importer]
[kom-show-imported-external-recipients]
[kom-show-imported-envelope-sender]
[kom-smileys]
"\n"
[kom-dashed-lines]
[kom-long-lines]
[kom-text-footer-format]
[kom-text-header-dash-length]
[kom-text-footer-dash-length]
"\n"
[kom-truncate-threshold]
[kom-truncate-show-lines]
"\n"
[kom-ignore-message-senders]
[kom-ignore-message-recipients]
[kom-show-personal-message-date]
"\n\n"
section
(writing bold centered)
......@@ -535,6 +557,46 @@ customize buffer but do not save them to the server."
(kom-self-control (toggle (yes no)))
(kom-ispell-dictionary (ispell-dictionary))
(kom-show-namedays (toggle (on off)))
(kom-show-week-number (toggle (on off)))
(kom-membership-default-placement (choice ((const (last last))
(const (first first))
(number nil
:tag specific-placement
))))
(kom-show-imported-importer (toggle (on off)))
(kom-show-imported-envelope-sender (toggle (on off)))
(kom-show-imported-external-recipients (toggle (on off)))
(kom-agree-text (choice ((string nil :tag a-string)
(repeat (string nil
:tag a-string
:format "%[%t%] `%v'\n")
:indent 4
:tag some-string
:menu-tag some-string))))
(kom-silent-ansaphone (noggle (on off)))
(kom-default-session-priority (choice ((const (unspecified nil))
(number nil
:tag priority))))
(kom-unsubscribe-makes-passive (toggle (on off)))
(kom-review-priority (choice ((const (same-as-conf nil))
(number nil :tag fixed-priority))))
(kom-show-creating-software (toggle (on off)))
(kom-text-footer-format (choice ((const (default-format nil))
(string nil :tag custom-format))))
(kom-long-lines (toggle (on off)))
(kom-postpone-default (number))
(kom-allow-incompleteness (toggle (on off)))
(kom-smileys (toggle (on off)))
(kom-ignore-message-senders (repeat (person nil :tag name)
:indent 4))
(kom-ignore-message-recipients (repeat (person nil
:tag name
:lyskom-predicate (pers conf))
:indent 4))
(kom-text-header-dash-length (number))
(kom-text-footer-dash-length (number))
(kom-show-personal-message-date (toggle (on off)))
))
(defvar lyskom-widget-functions
......
src/swedish-strings.el
View file @ 79afadfe
......@@ -239,6 +239,7 @@ Guran vill helst s
(where-to-add-self . "Vilket mte vill du bli medlem i? ")
(priority-q . "Prioritet p mtet? (0 (passivt medlemskap), 1 (lg) - 255 (hg)) ")
(done . "klart.\n")
(cancelled . "avbrutet.\n")
(nope . "Det gick inte.\n")
(cant-find-supervisor . "Hittar inte organisatren fr %#1M.\n")
......@@ -983,7 +984,11 @@ Du b
(several-unread . "%#1M - %#2d olsta\n")
(enter-conf . "%#1M\n")
(save-on-file-q . "Spara inlgg p fil: (%#1s) ")
(save-on-file-q . "Arkivera inlgg till fil: (%#1s) ")
(save-text-to-file-q . "Spara inlggstext %#1n p fil: ")
(save-text-confirm . "Filen %#1s finns redan. Vill du skriva ver den? ")
(saving-text . "Sparar inlgg %#1n som %#2s...")
(what-save-no . "Vilket inlgg vill du spara? ")
(wait-for-prompt . "Vnta p prompten.")
(conference-no . "<mte %#1d>")
......@@ -1461,7 +1466,8 @@ Du m
(kom-set-super-conf . "ndra supermte")
(kom-set-permitted-submitters . "ndra tilltna frfattare")
(kom-unset-conf-motd . "Ta bort lapp p drren")
(kom-save-text . "Spara text (p fil)")
(kom-save-text . "Arkivera inlgg (till fil)")
(kom-save-text-body . "Spara inlggstext (p fil)")
(kom-edit-options . "ndra variabler")
(kom-save-options . "Spara variabler")
(kom-shutdown-server . "Stng av servern")
......@@ -2090,6 +2096,8 @@ Du m
(ask . "Frga varje gng")
(before . "Fre texten")
(after . "Efter texten")
(fist . "Frst")
(last . "Sist ")
(depth-first . "I kommentarsordning")
(time-order . "I tidsordning")
......@@ -2143,6 +2151,17 @@ Du m
(short-format . "Gm hjlptexter ")
(truncate-threshold-lines . "Max rader")
(first . "Frst")
(last . "Sist")
(specific-placement . "Specifik plats")
(priority . "Prioritet")
(same-as-conf . "Samma som aktuellt mte")
(custom-format . "Eget format")
(default-format . "Standardformat")
(a-string . "En text")
(some-string . "En slumpmssig text")
(unspecified . "Ospecificerat")
;;
;; Misc doc strings
......@@ -2685,6 +2704,111 @@ i servern. Annars sparas det i din .emacs.")
kommer detta att ersttas av ett nytt kommando i ngon kommande version
av elispklienten, men det var visst ngon som ville ha det, s ...")
(kom-show-week-number-doc . "\
Se tiden visar veckonummer om detta r pslaget. Annars visas inte
veckonummer.")
(kom-membership-default-placement-doc . "\
Denna instllning styr var nya medlemskap hamnar. Frst betyder att nya
medlemskap hamnar fre gamla med samma prioritet. Sist betyder att nya
medlemskap hamnar efter gamla med samma prioritet. En siffra r en fix
placering i medlemskapslistan (men medlemskapet kommer att flyttas
ssmningom.)")
(kom-show-imported-importer-doc . "\
Pslaget betyder visa vilken person som importerade ett importerat e-mail.")
(kom-show-imported-envelope-sender-doc . "\
Visa den verkliga avsndaren till ett importerat e-mail om detta r
pslaget.")
(kom-show-imported-external-recipients-doc . "\
Visa externa mottagare och extra-kopiemottagare om detta r pslaget.")
(kom-agree-text-doc . "\
Text som anvnds av kommandot Hlla med. Det kan antingen vara en text
eller en lista av texter. Om det r en lista s vljs ett alternativ
slumpmssigt.")
(kom-silent-ansaphone-doc . "\
On detta r avslaget s piper inte klienten nr det kommer meddelanden och
automatsvar r pslaget.")
(kom-default-session-priority-doc . "\
Lsniv fr nya sessioner. Detta r den lsniv som nya sessioner fr
automatiskt.")
(kom-unsubscribe-makes-passive-doc . "\
Om detta r pslaget s gr kommandot Uttrda ur mte att man frst blir
passiv medlem i mtet. Om man uttrder ur mtet igen s gr man ur p
riktigt. Om detta r avslaget s gr man ur mtet frsta gngen man frsker
uttrda.")
(kom-review-priority-doc . "\
Prioritet fr tersekommandon. Detta r den prioritet som inlggen man ser
nr man gr terse fr. Det anvnds fr att avgra om nya inlgg skall
avbryta tersefunktionen. Stt till 256 eller hgre om du inte vill att nya
inlgg ngonsin skall avbryta en tersefunktion.")
(kom-show-creating-software-doc . "\
Om detta r pslaget s visas vilken klient som skapade inlgget tillsammans
med varje inlgg, frutsatt att informationen finns verhuvudtaget.")
(kom-text-footer-format-doc . "\
Format fr inlggsfoten. I texten erstts %n med inlggsnumret, %P med
frfattarens namn, %p med frfattarens nummer, %f med information om
inlgget (ombruten, HTML mm.) och %- med en lagom lng streckad linje.
En siffra efter procenttecknet r minsta bredd p texten. Ett minustecken
fre siffran betyder att texten skall vnsterjusteras. Ett likhetstecken
betyder att fltlngden r exakt och texten kanske kortas av.")
(kom-long-lines-doc . "\
Om detta r pslaget s grs de flesta streckade linjer i klienten mycket
lngre n normalt.")
(kom-postpone-default-doc . "\
Antalet inlgg som skall uppskjutas med Uppskjuta lsning.")
(kom-allow-incompleteness-doc . "\
Pslaget betyder att klienten inte vntar p att information om alla
olsta har kommit fram innan den tillter kommandon som Lista nyheter.
Avslaget innebr att klienten vntar p information om olsta inlgg om
den upptcker att informationen behvs och inte har kommit fram.")
(kom-smileys-doc . "\
Gladmn, som :-), visas grafiskt nr denna instllning r p, frutsatt
att Emacs klarar det och paketet smiley.el (en del av gnus) r installerat.")
(kom-ignore-message-senders-doc . "\
Visa inte personliga, grupp och alarmmeddelanden frn dessa personer.")
(kom-ignore-message-recipients-doc . "\
Visa inte gruppmeddelanden riktade till dessa mten.")
(kom-text-footer-dash-length-doc . "\
Den totala lngden p inlggsfoten nr streckade linjer, men inte extra
lnga linjer, och inte ett eget format anvnds.")
(kom-text-header-dash-length-doc . "\
Den totala lngden p den streckade linjen ovanfr inlggstexten nr
extra lnga linjer inte anvnds.")
(kom-show-personal-message-date-doc . "\
Nr detta r pslaget s visas datum och klockslag fr alla personliga,
grupp och alarmmeddelanden.")
(kom-ding-on-no-subject-doc . "")
(kom-ding-on-personal-messages-doc . "")
(kom-ding-on-group-messages-doc . "")
(kom-ding-on-common-messages-doc . "")
(kom-ding-on-no-subject-doc . "")
(kom-ding-on-wait-done-doc . "")
(kom-ding-on-priority-break-doc . "")
(kom-ding-on-new-letter-doc . "")
(kom-check-for-new-comments-doc . "")
(kom-check-commented-author-membership . "")
(kom-confirm-multiple-recipients-doc . "")
;;
;; Tags for variables
......@@ -2799,9 +2923,30 @@ i servern. Annars sparas det i din .emacs.")
(kom-customize-format-tag . "Visa hjlptexterna fr instllningar:")
(kom-default-language-tag . "Sprk: ")
(kom-show-namedays-tag . "Visa dagens namn:")
(kom-ispell-dictionary-tag . "Ordlista:")
(kom-show-namedays-tag . "Visa dagens namn:")
(kom-show-week-number-tag . "Visa veckonummer:")
(kom-membership-default-placement-tag . "Placering av nya medlemskap:")