Skip to content

GitLab

Commit 195c2f84 authored by David Byers's avatar David Byers
Browse files

Made lyskom-button-actions language-independent

parent eb11b506
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 106 deletions
src/ChangeLog
View file @ 195c2f84
2000-07-05 David Byers <davby@ida.liu.se>
* vars.el.in (lyskom-button-actions): Moved definition of
lyskom-button-actions here. Removed all constant strings. Fixed
the title string symbols.
* english-strings.el (lyskom-message): Added lyskom-button-action
strings.
* swedish-strings.el (lyskom-message): Added lyskom-button-action
strings.
2000-07-03 David Byers <davby@ida.liu.se>
* swedish-strings.el (lyskom-button-actions): Added button type
......
src/english-strings.el
View file @ 195c2f84
......@@ -1408,6 +1408,42 @@ You must become an active member of the conference to enter it.\n")
(review-noconversion-q . "Review which text unconverted?")
(review-commented-q . "Review the commented for which text?")
(lyskom-button-view-text-action . "View text")
(lyskom-button-review-noconversion-action . "Review unconverted")
(lyskom-button-review-tree-action . "Review tree")
(lyskom-button-find-root-action . "Review root text")
(lyskom-button-comment-text-action . "Write commend")
(lyskom-button-private-comment-text-action . "Write personal reply")
(lyskom-button-mark-text-action . "Mark text")
(lyskom-button-unmark-text-action . "Unmark text")
(lyskom-button-save-text-action . "Save archive copy")
(lyskom-button-view-conf-presentation-action . "View presentation")
(lyskom-button-view-conf-status-action . "View conference status")
(lyskom-button-goto-conf-action . "Go to conference")
(lyskom-button-send-message-action . "Send group message")
(lyskom-button-add-self-action . "Join conference")
(lyskom-button-sub-self-action . "Leave conference")
(lyskom-button-view-pers-presentation-action . "View presentation")
(lyskom-button-view-pers-status-action . "View user status")
(lyskom-button-mail-action . "Send letter")
(lyskom-button-send-message-action . "Send personal message")
(lyskom-button-open-url-action . "Open")
(lyskom-button-copy-url-action . "Copy")
(lyskom-button-goto-info-node-action . "Open")
(lyskom-button-open-email-action . "Send mail")
(lyskom-button-copy-email-action . "Copy")
(lyskom-button-info-aux-action . "Information")
(lyskom-button-delete-aux-action . "Delete")
(lyskom-edit-toggle-secret-aux-action . "Toggle \"secret\"")
(lyskom-edit-toggle-anonymous-aux-action . "Toggle \"anonymous\"")
(lyskom-edit-toggle-inherit-aux-action . "Toggle \"inherited\"")
(lyskom-edit-delete-aux-action . "Delete")
(lyskom-prioritize-flag-toggle-action . "Toggle")
(lyskom-prioritize-flag-set-action . "Set")
(lyskom-prioritize-flag-clear-action . "Clear")
))
......
src/lyskom-buttons.el
View file @ 195c2f84
......@@ -166,7 +166,7 @@ If there is no active area, then do something else."
(mapcar (function
(lambda (entry)
(vector (encode-coding-string
(car entry) 'iso-8859-1)
(lyskom-get-string (car entry)) 'iso-8859-1)
(list (cdr entry)
buf
(if (listp arg)
......@@ -179,7 +179,7 @@ If there is no active area, then do something else."
(mapcar (function (lambda (entry)
(let ((tmp (copy-tree entry)))
(setcar tmp (encode-coding-string
(car tmp)
(lyskom-get-string (car tmp))
'iso-8859-1))
(cons (` ((, (cdr entry))
(, buf)
......@@ -197,15 +197,13 @@ If there is no active area, then do something else."
(text (get-text-property pos 'lyskom-button-text))
(buf (get-text-property pos 'lyskom-buffer))
(data (assq type lyskom-button-actions))
(title (if (get-text-property pos 'lyskom-button-menu-title)
(apply 'lyskom-format
(get-text-property pos 'lyskom-button-menu-title))
(lyskom-format
(lyskom-get-string
(or (intern-soft (concat (symbol-name type)
"-popup-title"))
'generic-popup-title))
text)))
(title (cond
((get-text-property pos 'lyskom-button-menu-title)
(apply 'lyskom-format
(get-text-property pos 'lyskom-button-menu-title)))
((elt data 1)
(lyskom-format (lyskom-get-string (elt data 1)) text))
(t (lyskom-format (lyskom-get-string 'generic-popup-title) text))))
(actl (or (and data (elt data 3)) nil)))
(cond ((null data) (goto-char pos))
((null actl) (goto-char pos))
......
src/swedish-strings.el
View file @ 195c2f84
......@@ -1376,9 +1376,9 @@ Du m
(passive-mt-type . "passiv")
(secret-mt-type . "hemlig")
(Invitation-mt-type . "inbjuden")
(Passive-mt-type . "passiv")
(Secret-mt-type . "hemlig")
(Invitation-mt-type . "Inbjuden")
(Passive-mt-type . "Passiv")
(Secret-mt-type . "Hemlig")
(not-author-try-anyway-p . "Du r inte frfattare till inlgget. Vill du frska nd? ")
(what-no-comments-no . "Vilken text vill du inte ha kommentarer till: ")
......@@ -1445,9 +1445,43 @@ Du m
(confusion-what-to-find-root . "Jag frstr inte vilket inlggs urinlgg du vill terse.\n")
(confusion-what-to-find-root-review . "Jag frstr inte vilket inlggstrd du vill terse.\n")
))
;; Button actions
(lyskom-button-view-text-action . "terse texten")
(lyskom-button-review-noconversion-action . "terse omodifierat")
(lyskom-button-review-tree-action . "terse trd")
(lyskom-button-find-root-action . "terse urinlgget")
(lyskom-button-comment-text-action . "Kommentera texten")
(lyskom-button-private-comment-text-action . "Personligt svar")
(lyskom-button-mark-text-action . "Markera texten")
(lyskom-button-unmark-text-action . "Avmarkera texten")
(lyskom-button-save-text-action . "Arkivera")
(lyskom-button-view-conf-presentation-action . "Visa presentation")
(lyskom-button-view-conf-status-action . "Visa mtesstatus")
(lyskom-button-goto-conf-action . "G till mtet")
(lyskom-button-send-message-action . "Skicka gruppmeddelande")
(lyskom-button-add-self-action . "Bli medlem i mtet")
(lyskom-button-sub-self-action . "Uttrd ur mtet")
(lyskom-button-view-pers-presentation-action . "Visa presentation")
(lyskom-button-view-pers-status-action . "Visa personstatus")
(lyskom-button-mail-action . "Skicka brev")
(lyskom-button-send-message-action . "Snd meddelande")
(lyskom-button-open-url-action . "ppna")
(lyskom-button-copy-url-action . "Kopiera")
(lyskom-button-goto-info-node-action . "ppna")
(lyskom-button-open-email-action . "Skicka mail")
(lyskom-button-copy-email-action . "Kopiera")
(lyskom-button-info-aux-action . "Information")
(lyskom-button-delete-aux-action . "Radera")
(lyskom-edit-toggle-secret-aux-action . "Vxla \"hemlig\"")
(lyskom-edit-toggle-anonymous-aux-action . "Vxla \"anonym\"")
(lyskom-edit-toggle-inherit-aux-action . "Vxla \"rvd\"")
(lyskom-edit-delete-aux-action . "Ta bort")
(lyskom-prioritize-flag-toggle-action . "Vxla")
(lyskom-prioritize-flag-set-action . "Stt p")
(lyskom-prioritize-flag-clear-action . "Stng av")
))
;;; ================================================================
......@@ -3291,95 +3325,6 @@ i servern. Annars sparas det i din .emacs.")
"svenska")
;;;; ============================================================
;;;; Text buttom menuse go here. This will probably be moved back
;;;; to vars.el.in when the strings have been replaced by
;;;; symbols, but for now they'll stay here.
(lyskom-language-var lyskom-button-actions sv
'((text
text-text
lyskom-button-view-text
(("terse texten" . lyskom-button-view-text)
("terse omodifierat" . lyskom-button-review-noconversion)
("terse trd" . lyskom-button-review-tree)
("terse urinlgget" . lyskom-button-find-root)
("Kommentera texten" . lyskom-button-comment-text)
("Personligt svar" . lyskom-button-private-comment-text)
("Markera texten" . lyskom-button-mark-text)
("Avmarkera texten" . lyskom-button-unmark-text)
("Arkivera" . lyskom-button-save-text)
)
nil
; ((nil lyskom-print-text footer lyskom-button-comment-text))
)
(conf
conf-text
lyskom-button-view-conf-presentation
(("Visa presentation" . lyskom-button-view-conf-presentation)
("Visa mtesstatus" . lyskom-button-view-conf-status)
("G till mtet" . lyskom-button-goto-conf)
("Skicka gruppmeddelande" . lyskom-button-send-message)
("Bli medlem i mtet" . lyskom-button-add-self)
("Uttrd ur mtet" . lyskom-button-sub-self))
((kom-list-news . lyskom-button-goto-conf)
(kom-membership . lyskom-button-goto-conf)))
(pers
pers-text
lyskom-button-view-pers-presentation
(("Visa presentation" .
lyskom-button-view-pers-presentation)
("Visa personstatus" . lyskom-button-view-pers-status)
("Skicka brev" . lyskom-button-mail)
("Snd meddelande" . lyskom-button-send-message))
nil)
(url
url-text
lyskom-button-open-url
(("ppna" . lyskom-button-open-url)
("Kopiera" . lyskom-button-copy-url))
nil)
(info-node
info-node-text
lyskom-button-goto-info-node
(("ppna" . lyskom-button-goto-info-node))
nil)
(email
email-text
lyskom-button-open-email
(("Skicka mail" . lyskom-button-open-email)
("Kopiera" . lyskom-button-copy-email))
nil)
(aux
aux-text
lyskom-button-info-aux
(("Information" . lyskom-button-info-aux)
("Radera" . lyskom-button-delete-aux))
nil)
(aux-edit-menu
nil
aux-edit-menu-text
(("Vxla \"hemlig\"" . lyskom-edit-toggle-secret-aux)
("Vxla \"anonym\"" . lyskom-edit-toggle-anonymous-aux)
("Vxla \"rvd\"" . lyskom-edit-toggle-inherit-aux)
("Ta bort" . lyskom-edit-delete-aux))
nil)
(prioritize-flag-menu
nil
lyskom-prioritize-flag-toggle
(("Vxla" . lyskom-prioritize-flag-toggle)
("Stt p" . lyskom-prioritize-flag-set)
("Stng av" . lyskom-prioritize-flag-clear))
nil)
(func
nil
lyskom-button-apply
nil
nil)
))
;;;; ================================================================
;;;; Tell phrases should really be configured with the default
;;;; language used at the server and not for person reading if they
......
src/vars.el.in
View file @ 195c2f84
......@@ -1081,7 +1081,86 @@ at random and used. This element may be a string, function or list."
server
inherited)
(def-kom-var lyskom-button-actions nil
(def-kom-var lyskom-button-actions
'((text
text-popup-title
lyskom-button-view-text
((lyskom-button-view-text-action . lyskom-button-view-text)
(lyskom-button-review-noconversion-action . lyskom-button-review-noconversion)
(lyskom-button-review-tree-action . lyskom-button-review-tree)
(lyskom-button-find-root-action . lyskom-button-find-root)
(lyskom-button-comment-text-action . lyskom-button-comment-text)
(lyskom-button-private-comment-text-action . lyskom-button-private-comment-text)
(lyskom-button-mark-text-action . lyskom-button-mark-text)
(lyskom-button-unmark-text-action . lyskom-button-unmark-text)
(lyskom-button-save-text-action . lyskom-button-save-text)
)
nil
;; ((nil lyskom-print-text footer lyskom-button-comment-text))
)
(conf
conf-popup-title
lyskom-button-view-conf-presentation
((lyskom-button-view-conf-presentation-action . lyskom-button-view-conf-presentation)
(lyskom-button-view-conf-status-action . lyskom-button-view-conf-status)
(lyskom-button-goto-conf-action . lyskom-button-goto-conf)
(lyskom-button-send-message-action . lyskom-button-send-message)
(lyskom-button-add-self-action . lyskom-button-add-self)
(lyskom-button-sub-self-action . lyskom-button-sub-self))
((kom-list-news . lyskom-button-goto-conf)
(kom-membership . lyskom-button-goto-conf)))
(pers
pers-popup-title
lyskom-button-view-pers-presentation
((lyskom-button-view-pers-presentation-action . lyskom-button-view-pers-presentation)
(lyskom-button-view-pers-status-action . lyskom-button-view-pers-status)
(lyskom-button-mail-action . lyskom-button-mail)
(lyskom-button-send-message-action . lyskom-button-send-message))
nil)
(url
url-popup-title
lyskom-button-open-url
((lyskom-button-open-url-action . lyskom-button-open-url)
(lyskom-button-copy-url-action . lyskom-button-copy-url))
nil)
(info-node
generic-popup-title
lyskom-button-goto-info-node
((lyskom-button-goto-info-node-action . lyskom-button-goto-info-node))
nil)
(email
generig-popup-title
lyskom-button-open-email
((lyskom-button-open-email-action . lyskom-button-open-email)
(lyskom-button-copy-email-action . lyskom-button-copy-email))
nil)
(aux
aux-popup-title
lyskom-button-info-aux
((lyskom-button-info-aux-action . lyskom-button-info-aux)
(lyskom-button-delete-aux-action . lyskom-button-delete-aux))
nil)
(aux-edit-menu
nil
aux-edit-menu-text
((lyskom-edit-toggle-secret-aux-action . lyskom-edit-toggle-secret-aux)
(lyskom-edit-toggle-anonymous-aux-action . lyskom-edit-toggle-anonymous-aux)
(lyskom-edit-toggle-inherit-aux-action . lyskom-edit-toggle-inherit-aux)
(lyskom-edit-delete-aux-action . lyskom-edit-delete-aux))
nil)
(prioritize-flag-menu
nil
lyskom-prioritize-flag-toggle
((lyskom-prioritize-flag-toggle-action . lyskom-prioritize-flag-toggle)
(lyskom-prioritize-flag-set-action . lyskom-prioritize-flag-set)
(lyskom-prioritize-flag-clear-action . lyskom-prioritize-flag-clear))
nil)
(func
nil
lyskom-button-apply
nil
nil)
)
"This variable defines valid button types in LysKOM. Each element is a
list consisting of (TYPE LABEL DEFAULT ACTIONS HINTS).
TYPE is the button type the entry defines
......
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