Backport commit f1f57a541 from Emacs

* lisp/oc-csl.el (org-cite-csl-locales-dir)
(org-cite-csl-styles-dir):
* lisp/org-plot.el (org-plot/preset-plot-types): Fix :type.

Fix some custom types
f1f57a541e4c74eec68a27c47c7416ed6c7d75dd
Glenn Morris
Fri Oct 1 08:33:32 2021 -0700

lisp/oc-csl.el

@@ -123,7 +123,7 @@ If nil then only the fallback en-US locale will be available."
   :group 'org-cite
   :package-version '(Org . "9.5")
   :type '(choice
-          (dir :tag "Locales directory")
+          (directory :tag "Locales directory")
           (const :tag "Use en-US locale only" nil))
   :safe t)
 
@@ -134,7 +134,7 @@ directory.  This variable is ignored when style file is absolute."
   :group 'org-cite
   :package-version '(Org . "9.5")
   :type '(choice
-          (dir :tag "Styles directory")
+          (directory :tag "Styles directory")
           (const :tag "Use absolute file names" nil))
   :safe t)
 

lisp/org-plot.el

@@ -392,7 +392,7 @@ be set.
    Accepts string, nil, or lambda function which returns string
    or nil.  Defaults to nil."
   :group 'org-plot
-  :type '(alist :value-type (symbol group)))
+  :type 'alist)
 
 (defvar org--plot/radar-template
   "### spider plot/chart with gnuplot