X-Git-Url: http://git.sourceforge.jp/view?p=howm%2Fhowm.git;a=blobdiff_plain;f=howm-vars.el;h=fccdfa962e95768d8fb3ced775151fa3fb4fc59a;hp=6795d088fc7120cd227731aa7254a7fa9d51ff5c;hb=866d97cc2811ddcea369b1b285d182493c738078;hpb=6952aa08422946017fe5c852314851a33bcbdf33

diff --git a/howm-vars.el b/howm-vars.el
index 6795d08..fccdfa9 100644
--- a/howm-vars.el
+++ b/howm-vars.el
@@ -240,13 +240,21 @@ A file is excluded iff this regexp matches with all the relative paths."
   :group 'howm)
 
 (defcustom howm-menu-lang
-  (if (or (and (boundp 'current-language-environment)
-               (string= current-language-environment "Japanese"))
-          (string-match "^ja" (howm-get-locale)))
-      'ja
-    'en)
+  (let ((lang-table '((fr "French" "^fr")
+                      (ja "Japanese" "^ja"))))
+    (let ((lang (or (and (boundp 'current-language-environment)
+                        current-language-environment)
+                   ""))
+          (locale (howm-get-locale))
+          (ret 'en))
+      (mapc (lambda (rule)
+              (if (or (string= lang (cadr rule))
+                      (string-match (caddr rule) locale))
+                  (setq ret (car rule))))
+            lang-table)
+      ret))
   "*Language of menu."
-  :type '(radio (const en) (const ja))
+  :type '(radio (const en) (const fr) (const ja))
   :group 'howm-menu)
 
 (howm-defcustom-risky howm-menu-file nil