From 5825031b17ef78bab03aafef72f3a48ebac262f0 Mon Sep 17 00:00:00 2001 From: czkmt Date: Fri, 3 Sep 1999 15:44:25 +0000 Subject: [PATCH] (gnus-offline-lang,gnus-ofsetup-resource-en, gnus-ofsetup-resource-ja): New variables. (gnus-ofsetup-get-message): New function. (gnus-setup-for-offline): Use it. (gnus-ofsetup-find-parameters): Ditto. (gnus-ofsetup-prepapre-for-miee): Ditto. (gnus-ofsetup-completing-read-symbol): Ditto. (gnus-ofsetup-customize): Ditto. (gnus-ofsetup-customize-done): Ditto. --- lisp/gnus-ofsetup.el | 418 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 323 insertions(+), 95 deletions(-) diff --git a/lisp/gnus-ofsetup.el b/lisp/gnus-ofsetup.el index 925d969..8160950 100644 --- a/lisp/gnus-ofsetup.el +++ b/lisp/gnus-ofsetup.el @@ -1,6 +1,6 @@ ;;; gnus-ofsetup.el --- Setup advisor for Offline reading for Mail/News. ;;; -;;; $Id: gnus-ofsetup.el,v 1.1.2.19.4.5 1999-08-27 16:57:12 czkmt Exp $ +;;; $Id: gnus-ofsetup.el,v 1.1.2.19.4.6 1999-09-03 15:44:25 czkmt Exp $ ;;; ;;; Copyright (C) 1998 Tatsuya Ichikawa ;;; Author: Tatsuya Ichikawa @@ -62,10 +62,7 @@ (if (not (file-exists-p news-spool)) (make-directory news-spool t))) (error - (error - "%s%s" - "Making directories failed." - "Set mail/news spool directories properly."))))) + (error (gnus-ofsetup-get-message 'prepare-miee-1)))))) (defvar gnus-ofsetup-update-setting-file '((save-excursion @@ -181,9 +178,243 @@ (let ((forms (symbol-value list))) `(progn ,@forms)))) +(defvar gnus-offline-lang + (cond ((and (featurep 'meadow) + (string= current-language-environment "Japanese")) + "ja_complete") + ((and (boundp 'current-language-environment) + (string= current-language-environment "Japanese")) + "ja") + (t + "en")) + "This variable decides which language will be used for display.") + +(defvar gnus-ofsetup-resource-en + '((prepare-miee-1 + . "Making directories failed. Set mail/news spool directories properly.") + (completing-read-symbol-1 . " (TAB to completion): ") + (setup-1 . "Method for offline News reading") + (setup-2 . "Agent directory: ") + (setup-3 . "Dialup program (give a null string if you do not use): ") + (setup-4 . "Dialup program options: ") + (setup-5 . "Hangup program (give a null string if you do not use): ") + (setup-6 . "Hangup program options: ") + (setup-7 . "Select MTA type for sending mail") + (setup-8 . "Use MIEE post/send message ") + (setup-9 . "News spool directory for sending: ") + (setup-10 . "Mail spool directory for sending: ") + (setup-11 . "How many e-mail address do you have: ") + (setup-12 . "Mail Account name : ") + (setup-13 . "Mail server : ") + (setup-14 . "Authentification Method (TAB to completion): ") + (setup-15 . "Do you use pop3.el to fetch mail? ") + (setup-16 . "movemail program name: ") + (setup-17 . "movemail options: ") + (setup-18 . "Do you save password information to newsrc file? ") + (param-news-method-1 . "News Method") + (param-news-method-2 . "Gnus Agent") + (param-news-method-3 . "nnspool") + (param-news-method-4 . "\ +Method to fetch news articles.") + (param-dialup-program-1 . "Dialup Program") + (param-dialup-program-2 . "Use program..") + (param-dialup-program-3 . "Don't auto-dial.") + (param-dialup-program-4 . "\ +Program which does dial.") + (param-dialup-program-arg-1 . "Dialup Program Arguments") + (param-dialup-program-arg-2 . "Argument") + (param-dialup-program-arg-3 . "\ +Program arguments of gnus-offline-dialup-program.") + (param-hangup-program-1 . "Hangup Program") + (param-hangup-program-2 . "Use program..") + (param-hangup-program-3 . "Don't auto-hangup.") + (param-hangup-program-4 . "\ +Program which does hangup.") + (param-hangup-program-arg-1 . "Hangup Program Arguments") + (param-hangup-program-arg-2 . "Argument") + (param-hangup-program-arg-3 . "\ +Program arguments of gnus-offline-hangup-program.") + (param-interval-1 . "Interval between Jobs") + (param-interval-2 . "\ +Interval time(minutes) to do online jobs. +If set to 0 , timer call is disabled.") + (param-drafts-queue-type-1 . "Drafts Queue Type") + (param-drafts-queue-type-2 . "Gnus Draft for queuing.") + (param-drafts-queue-type-3 . "I prefer MIEE for queuing.") + (param-drafts-queue-type-4 . "\ +Type of queue used for draft messages. + +If the select method for news is nnspool, you must choose MIEE. +MIEE is another library for offline messaging. It isn't part of +Semi-gnus. If you want to know about MIEE, see README-offline.{en,ja}.") + (param-mail-spool-1 . "Mail Spool Directory for MIEE") + (param-news-spool-1 . "News Spool Directory for MIEE") + (param-MTA-type-1 . "MTA Type") + (param-MTA-type-2 . "Use smtp.el") + (param-MTA-type-3 . "Use sendmail") + (param-MTA-type-4 . "\ +Type of MTA used for sending mail.") + (param-save-passwd-1 . "Save Password in Startup File") + (param-save-passwd-2 . "OK, I'm sure it's safe.") + (param-save-passwd-3 . "No way, it's too dangerous!") + (param-save-passwd-4 . "\ +Whether you want your POP passwords written in .newsrc.eld or not.") + (param-mail-source-1 . "Mail Sources") + (param-mail-source-2 . "\ +Information of mail sources. Actually, a list of `Mail Source Specifiers'. + +The format of this variable is just the same as `mail-sources' (or +`nnmail-spool-file' which seems obsolete). + +`Mail Source Specifiers' can take a lot of keywords. For example, +if you want to use movemail instead of pop3.el which comes with +Gnus, you can set a specifier using the kerword :program as shown +below: + + (pop :program \"movemail -pf po:%u %t %p\") + +If you want to know more about mail source specifiers and keywords, +click the button below.") + (customize-1 . "Customize the Gnus Offline Parameters, and press ") + (customize-2 . "done") + (customize-3 . "Push me when done customizing.") + (customize-4 . "Parameters") + (customize-5 . "\ +These parameters will be saved in ~/.gnus-offline.el. + +Note: Touching these parameters may require Gnus or even Emacs to be +restarted.") + (customize-6 . "Push me to learn more.") + (customize-done-1 . "(No changes need to be saved)") + (customize-done-2 + . "Invalid parameters. Check the news method and drafts queue type."))) + +(defvar gnus-ofsetup-resource-ja + '((prepare-miee-1 + . "ディレクトリが作れません。スプールの設定を正しくしてください。") + (completing-read-symbol-1 . "(TAB で補完します): ") + (setup-1 . "オフラインでニュースを読む方法を選んでください ") + (setup-2 . "Gnus Agent のディレクトリ: ") + (setup-3 + . "ダイヤル接続プログラム名 (使わない場合は空文字列を返して下さい): ") + (setup-4 . "ダイヤル接続プログラムの引数: ") + (setup-5 + . "ダイヤル切断プログラム名 (使わない場合は空文字列を返して下さい): ") + (setup-6 . "ダイヤル切断プログラムの引数: ") + (setup-7 . "メール送信に使う MTA を選んで下さい ") + (setup-8 . "メッセージの送信に MIEE を使いますか? ") + (setup-9 . "ニュースのスプールディレクトリ: ") + (setup-10 . "メールのスプールディレクトリ: ") + (setup-11 . "メールアカウントの数を答えてください: ") + (setup-12 . "メールのアカウント名: ") + (setup-13 . "そのアカウントのあるメールサーバ名: ") + (setup-14 . "そのサーバでの認証方式は? (TAB で補完します): ") + (setup-15 . "メールの受信には pop3.el を使いますか? ") + (setup-16 . "movemail プログラムの名前: ") + (setup-17 . "movemail プログラムに渡す引数: ") + (setup-18 . "newsrc ファイルに POP パスワードを保存しますか? ") + + (param-news-method-4 . "\ +ニュース記事を取得する方法です。") + (param-dialup-program-4 . "\ +自動ダイヤル接続に使うプログラム。") + (param-dialup-program-arg-3 . "\ +ダイヤル接続プログラムに渡す引数。") + (param-hangup-program-4 . "\ +自動ダイヤル切断に使うプログラム。") + (param-hangup-program-arg-3 . "\ +ダイヤル切断プログラムに渡す引数。") + (param-interval-2 . "\ +送受信ジョブを行う間隔。分単位で指定します。 + +これを 0 に設定すると自動送受信機能はオフになります。") + (param-drafts-queue-type-4 . "\ +ドラフト記事を保存するキューの種類を指定します。 + +ニュースの講読手段が nnspool の場合、MIEE を指定する必要があります。 +MIEE はオフラインでのメール/ニュース送信機能を提供するライブラリですが、 +Semi-gnus には付属していません。MIEE について知りたい場合は +README-offline.{en,ja} を参照してください。") + (param-MTA-type-4 . "\ +MTA はメールの送信を受け持つプログラムです。その種類を指定します。") + (param-save-passwd-4 . "\ +POP パスワードを .newsrc.eld に保存するか否かを指定します。") + (param-mail-source-2 . "\ +メール取得先や取得方法を指定します。 + +このオプションの書式は `mail-sources' という変数と同じであり、 +`mail source specifier' と呼ばれるもののリストとして記述します。 + +各々の `mail source specifier' には色々なキーワードを指定することが +できます。例えばメールの取得には pop3.el の代わりに外部プログラム +(movemail など) を使いたい、という場合には、:program をいうキーワー +ドを指定して以下の様に記述します。 + + (pop :program \"movemail -pf po:%u %t %p\") + +mail source specifier とか上記のようなキーワードについてもっとよく +知りたい場合は、以下のボタンをクリックしてください。(Info の該当箇所 +へのリンクになっています。)" ) + + (customize-1 + . "Gnus Offline のパラメータ。終わったら右のボタンを押してください。") + (customize-2 . "done") + (customize-3 . "設定し終わったらボクを押してね。") + (customize-4 . "パラメータ") + (customize-5 . "\ +これらのパラメータは ~/.gnus-offline.el に保存されます。 + +注意: これらのパラメータの変更は場合によっては Gnus (さらに場合に +よっては Emacs) の再起動を必要とすることがあります。") + (customize-6 . "もっと知りたい場合はボクを押してね。") + (customize-done-1 . "(保存すべき変更はありません)") + (customize-done-2 + . "ニュース講読手段とドラフト記事取り扱い手段の設定を見直してください。") + )) + +(defvar gnus-ofsetup-resource-ja_complete + (append + gnus-ofsetup-resource-ja + '((param-news-method-1 . "ニュース講読方法") + (param-news-method-2 . "Gnus Agent") + (param-news-method-3 . "nnspool") + (param-dialup-program-1 . "ダイヤル接続プログラム") + (param-dialup-program-2 . "プログラムを使う..") + (param-dialup-program-3 . "自動ダイヤル接続はしない") + (param-dialup-program-arg-1 . "ダイヤル接続プログラムの引数") + (param-dialup-program-arg-2 . "引数") + (param-hangup-program-1 . "ダイヤル切断プログラム") + (param-hangup-program-2 . "プログラムを使う..") + (param-hangup-program-3 . "自動ダイヤル切断はしない") + (param-hangup-program-arg-1 . "ダイヤル切断プログラムの引数") + (param-hangup-program-arg-2 . "引数") + (param-interval-1 . "自動送受信ジョブの間隔") + (param-drafts-queue-type-1 . "ドラフト記事を保存するキューの種類") + (param-drafts-queue-type-2 . "Gnus Draft の機能を利用する") + (param-drafts-queue-type-3 . "MIEE の機能を利用する") + (param-mail-spool-1 . "MIEE が使うメールのスプールディレクトリ") + (param-news-spool-1 . "MIEE が使うニュースのスプールディレクトリ") + (param-MTA-type-1 . "MTA の種類") + (param-MTA-type-2 . "smtp.el を使う") + (param-MTA-type-3 . "sendmail を使う") + (param-save-passwd-1 + . "ファイルに POP パスワードを保存する") + (param-save-passwd-2 . "安全なので保存する") + (param-save-passwd-3 . "危険だからやめとく") + (param-mail-source-1 . "メール取得先の情報")))) + +(defun gnus-ofsetup-get-message (symbol &optional lang) + (setq lang (or lang gnus-offline-lang)) + (or + (cdr (assq symbol (symbol-value + (intern (format "gnus-ofsetup-resource-%s" lang))))) + (cdr (assq symbol gnus-ofsetup-resource-en)))) + (defun gnus-ofsetup-completing-read-symbol (msg &rest syms) (intern - (completing-read (concat msg " (TAB to completion): ") + (completing-read (concat + msg + (gnus-ofsetup-get-message 'completing-read-symbol-1)) (mapcar (lambda (sym) (list (symbol-name sym))) @@ -201,49 +432,52 @@ num-of-address i mail-source save-passwd) (setq news-method (gnus-ofsetup-completing-read-symbol - "Method for offline News reading" + (gnus-ofsetup-get-message 'setup-1) 'nnagent 'nnspool)) ;; Setting for gnus-agent. (if (eq news-method 'nnagent) (setq agent-directory - (read-from-minibuffer "Agent directory: " "~/News/agent"))) + (read-from-minibuffer + (gnus-ofsetup-get-message 'setup-2) "~/News/agent"))) (setq mail-method 'nnmail) (setq dialup-program (read-file-name - "Dialup program (give a null string if you do not use): " + (gnus-ofsetup-get-message 'setup-3) nil nil t)) (if (string-match "^[ \t]*$" dialup-program) (setq dialup-program nil) (setq dialup-program-arguments (delete "" (split-string - (read-from-minibuffer "Dialup program options: ") + (read-from-minibuffer + (gnus-ofsetup-get-message 'setup-4)) "[\t ]+")))) (setq hangup-program (read-file-name - "Hangup program (give a null string if you do not use): " + (gnus-ofsetup-get-message 'setup-5) nil nil t)) (if (string-match "^[ \t]*$" hangup-program) (setq hangup-program nil) (setq hangup-program-arguments (delete "" (split-string - (read-from-minibuffer "Hangup program options: ") + (read-from-minibuffer + (gnus-ofsetup-get-message 'setup-6)) "[\t ]+")))) (setq MTA-type (gnus-ofsetup-completing-read-symbol - "Select MTA type for sending mail" + (gnus-ofsetup-get-message 'setup-7) 'smtp 'sendmail)) (if (eq news-method 'nnspool) (setq use-miee t) - (setq use-miee (y-or-n-p "Use MIEE post/send message "))) + (setq use-miee (y-or-n-p (gnus-ofsetup-get-message 'setup-8)))) (if use-miee (progn ;; Setting for MIEE. (setq news-spool (read-from-minibuffer - "News spool directory for sending: " + (gnus-ofsetup-get-message 'setup-9) "/usr/spool/news.out")) (setq mail-spool (read-from-minibuffer - "Mail spool directory for sending: " + (gnus-ofsetup-get-message 'setup-10) "/usr/spool/mail.out")) (setq drafts-queue-type 'miee) (gnus-ofsetup-prepare gnus-ofsetup-prepare-for-miee)) @@ -251,21 +485,23 @@ (setq drafts-queue-type 'agent)) ;; Set E-Mail Address and pop3 movemail type. (setq num-of-address - (read-from-minibuffer "How many e-mail address do you have: ")) + (read-from-minibuffer (gnus-ofsetup-get-message 'setup-11))) (setq i (string-to-int num-of-address)) (while (> i 0) - (let ((user (read-from-minibuffer "Mail Account name : ")) - (server (read-from-minibuffer "Mail server : ")) + (let ((user (read-from-minibuffer (gnus-ofsetup-get-message 'setup-12))) + (server (read-from-minibuffer + (gnus-ofsetup-get-message 'setup-13))) (auth (completing-read - "Authentification Method (TAB to completion): " + (gnus-ofsetup-get-message 'setup-14) '(("password") ("apop")) nil t nil)) - (islisp (y-or-n-p "Do you use pop3.el to fetch mail? ")) + (islisp (y-or-n-p (gnus-ofsetup-get-message 'setup-15))) source) (if (not islisp) - (let ((prog (read-file-name "movemail program name: " + (let ((prog (read-file-name (gnus-ofsetup-get-message 'setup-16) exec-directory "movemail")) - (args (read-from-minibuffer "movemail options: " - "-pf"))) + (args (read-from-minibuffer + (gnus-ofsetup-get-message 'setup-17) + "-pf"))) (setq source `(pop :user ,user :server ,server @@ -286,7 +522,7 @@ source))))) (setq i (1- i))) (setq save-passwd - (y-or-n-p "Do you save password information to newsrc file? ")) + (y-or-n-p (gnus-ofsetup-get-message 'setup-18))) ;; (gnus-ofsetup-prepare gnus-ofsetup-update-setting-file))) (load gnus-offline-setting-file)) @@ -299,53 +535,60 @@ (defun gnus-ofsetup-find-parameters () "Return the each current value of gnus-offline parameters." `((news-method - (choice :tag "News Method" :value ,gnus-offline-news-fetch-method - (const :tag "Gnus Agent" nnagent) - (const :tag "nnspool" nnspool)) "\ -Method to fetch news articles.") + (choice :tag ,(gnus-ofsetup-get-message 'param-news-method-1) + :value ,gnus-offline-news-fetch-method + (const :tag ,(gnus-ofsetup-get-message 'param-news-method-2) + nnagent) + (const :tag ,(gnus-ofsetup-get-message 'param-news-method-3) + nnspool)) + ,(gnus-ofsetup-get-message 'param-news-method-4)) (dialup-program - (choice :tag "Dialup Program" :value ,gnus-offline-dialup-program - (string :tag "Use Program..") - (const :tag "Don't auto-dial." nil)) "\ -Program which does dial.") + (choice :tag ,(gnus-ofsetup-get-message 'param-dialup-program-1) + :value ,gnus-offline-dialup-program + (string :tag ,(gnus-ofsetup-get-message 'param-dialup-program-2)) + (const :tag ,(gnus-ofsetup-get-message + 'param-dialup-program-3) nil)) + ,(gnus-ofsetup-get-message 'param-dialup-program-4)) (dialup-program-arguments - (repeat :tag "Dialup Program Arguments" + (repeat :tag ,(gnus-ofsetup-get-message 'param-dialup-program-arg-1) :value ,gnus-offline-dialup-program-arguments - (string :tag "Argument"))"\ -Program arguments of gnus-offline-dialup-program.") + (string :tag ,(gnus-ofsetup-get-message + 'param-dialup-program-arg-2))) + ,(gnus-ofsetup-get-message 'param-dialup-program-arg-3)) (hangup-program - (choice :tag "Hangup Program" :value ,gnus-offline-hangup-program - (string :tag "Use Program..") - (const :tag "Don't auto-hangup." nil)) "\ -Program which does hangup.") + (choice :tag ,(gnus-ofsetup-get-message 'param-hangup-program-1) + :value ,gnus-offline-hangup-program + (string :tag ,(gnus-ofsetup-get-message 'param-hangup-program-2)) + (const :tag ,(gnus-ofsetup-get-message 'param-hangup-program-3) + nil)) + ,(gnus-ofsetup-get-message 'param-hangup-program-4)) (hangup-program-arguments - (repeat :tag "Hangup Program Arguments" + (repeat :tag ,(gnus-ofsetup-get-message 'param-hangup-program-arg-1) :value ,gnus-offline-hangup-program-arguments - (string :tag "Argument")) "\ -Program arguments of gnus-offline-hangup-program.") + (string :tag ,(gnus-ofsetup-get-message + 'param-hangup-program-arg-2))) + ,(gnus-ofsetup-get-message 'param-hangup-program-arg-3)) (interval - (integer :tag "Interval between Jobs" - :value ,gnus-offline-interval-time) "\ -Interval time(minutes) to do online jobs. -If set to 0 , timer call is disabled.") + (integer :tag ,(gnus-ofsetup-get-message 'param-interval-1) + :value ,gnus-offline-interval-time) + ,(gnus-ofsetup-get-message 'param-interval-2)) (drafts-queue-type - (choice :tag "Drafts Queue Type" :value ,gnus-offline-drafts-queue-type - (const :tag "Gnus Draft for queuing." agent) - (const :tag "I prefer MIEE for queuing." miee)) "\ -Type of queue used for draft messages. - -If the select method for news is nnspool, you must choose MIEE. -MIEE is another library for offline messaging. It isn't part of -Semi-gnus. If you want to know about MIEE, see README-offline.{en,ja}.") + (choice :tag ,(gnus-ofsetup-get-message 'param-drafts-queue-type-1) + :value ,gnus-offline-drafts-queue-type + (const :tag ,(gnus-ofsetup-get-message 'param-drafts-queue-type-2) + agent) + (const :tag ,(gnus-ofsetup-get-message 'param-drafts-queue-type-3) + miee)) + ,(gnus-ofsetup-get-message 'param-drafts-queue-type-4)) (mail-spool - (directory :tag "Mail Spool Directory for MIEE" + (directory :tag ,(gnus-ofsetup-get-message 'param-mail-spool-1) :value ,(cond ((and (boundp 'sendmail-to-spool-directory) sendmail-to-spool-directory) sendmail-to-spool-directory) @@ -353,7 +596,7 @@ Semi-gnus. If you want to know about MIEE, see README-offline.{en,ja}.") "/usr/spool/mail.out")))) (news-spool - (directory :tag "News Spool Directory for MIEE" + (directory :tag ,(gnus-ofsetup-get-message 'param-news-spool-1) :value ,(cond ((and (boundp 'news-spool-request-post-directory) news-spool-request-post-directory) news-spool-request-post-directory) @@ -361,36 +604,26 @@ Semi-gnus. If you want to know about MIEE, see README-offline.{en,ja}.") "/usr/spool/news.out")))) (MTA-type - (choice :tag "MTA Type" :value ,gnus-offline-MTA-type - (const :tag "Use smtp.el" smtp) - (const :tag "Use sendmail" sendmail)) "\ -Type of MTA used for sending mail.") + (choice :tag ,(gnus-ofsetup-get-message 'param-MTA-type-1) + :value ,gnus-offline-MTA-type + (const :tag ,(gnus-ofsetup-get-message 'param-MTA-type-2) smtp) + (const :tag ,(gnus-ofsetup-get-message 'param-MTA-type-3) + sendmail)) + ,(gnus-ofsetup-get-message 'param-MTA-type-4)) (save-passwd - (choice :tag "Save Password in Startup File" + (choice :tag ,(gnus-ofsetup-get-message 'param-save-passwd-1) :value ,(if (memq 'mail-source-password-cache gnus-variable-list) t nil) - (const :tag "OK, I'm sure it's safe." t) - (const :tag "No way, it's too dangerous!" nil)) "\ -Whether you want your POP passwords written in .newsrc.eld or not.") + (const :tag ,(gnus-ofsetup-get-message 'param-save-passwd-2) t) + (const :tag ,(gnus-ofsetup-get-message 'param-save-passwd-3) nil)) + ,(gnus-ofsetup-get-message 'param-save-passwd-4)) (mail-source - (sexp :tag "Mail Sources" :value ,gnus-offline-mail-source) "\ -Information of mail sources. Actually, a list of `Mail Source Specifiers'. - -The format of this variable is just the same as `mail-sources' (or -`nnmail-spool-file' which seems obsolete). - -`Mail Source Specifiers' can take a lot of keywords. For example, -if you want to use movemail instead of pop3.el which comes with -Gnus, you can set a specifier using the kerword :program as shown -below: - - (pop :program \"movemail -pf po:%u %t %p\") - -If you want to know more about mail source specifiers and keywords, -click the button below."))) + (sexp :tag ,(gnus-ofsetup-get-message 'param-mail-source-1) + :value ,gnus-offline-mail-source) + ,(gnus-ofsetup-get-message 'param-mail-source-2)))) (defvar gnus-ofsetup-params) @@ -410,10 +643,10 @@ click the button below."))) (kill-buffer (gnus-get-buffer-create "*Gnus Offline Customize*")) (switch-to-buffer (gnus-get-buffer-create "*Gnus Offline Customize*")) (gnus-custom-mode) - (widget-insert "Customize the Gnus Offline Parameters, and press ") + (widget-insert (gnus-ofsetup-get-message 'customize-1)) (widget-create 'push-button - :tag "done" - :help-echo "Push me when done customizing." + :tag (gnus-ofsetup-get-message 'customize-2) + :help-echo (gnus-ofsetup-get-message 'customize-3) :action 'gnus-ofsetup-customize-done) (widget-insert "\n\n") (make-local-variable 'gnus-ofsetup-params) @@ -421,17 +654,13 @@ click the button below."))) (widget-create 'group `(set :inline t :greedy t - :tag "Parameters" + :tag ,(gnus-ofsetup-get-message 'customize-4) :format "%t:\n%h%v" - :doc "\ -These parameters will be saved in ~/.gnus-offline.el. - -Note: Touching these parameters may require Gnus or even Emacs to be -restarted." + :doc ,(gnus-ofsetup-get-message 'customize-5) ,@types))) (widget-create 'info-link - :help-echo "Push me to learn more." + :help-echo (gnus-ofsetup-get-message 'customize-6) :tag " mail sources" "(gnus)Mail Sources") @@ -467,8 +696,8 @@ restarted." (save-passwd (and (memq 'mail-source-password-cache gnus-variable-list) t))) (if (null params) - (gnus-message 4 "(No changes need to be saved)") - (mapcar (lambda (el) + (gnus-message 4 (gnus-ofsetup-get-message 'customize-done-1)) + (mapc #'(lambda (el) (let ((sym (car el)) (val (cdr el))) (set sym val) @@ -485,11 +714,10 @@ restarted." (setq gnus-variable-list (delq 'mail-source-password-cache gnus-variable-list))))))) - params) + params) (if (and (eq news-method 'nnspool) (not (eq drafts-queue-type 'miee))) - (error - "Invalid parameters. Check the news method and drafts queue type.")) + (error (gnus-ofsetup-get-message 'customize-done-2))) (if use-miee (gnus-ofsetup-prepare gnus-ofsetup-prepare-for-miee)) (gnus-ofsetup-prepare gnus-ofsetup-update-setting-file) -- 1.7.10.4