Questions: more tweaks

app/resources/surveys/SurveysController.jl

@@ -186,7 +186,7 @@ const DONATION_ENTITIES = [
     ("https://my.fsf.org/donate",
      "The Free Software Foundation",
      "https://www.fsf.org/",
-     "principle organisational sponsor of the GNU project"),
+     "principal organisational sponsor of the GNU project"),
     ("https://liberapay.com/org-mode/",
      "The Org Project",
      "https://orgmode.org",

config/survey.jl

@@ -74,16 +74,17 @@ the questions you see now will not necessarily be in the final survey.",
              "I have a solid understanding of Emacs internals" => "understand internals"]),
         MultiSelect(:languages,
             "Which languages do you program (in Emacs) in?",
-            ["Assembly", "C++", "C", "C#", "Clojure", "Elixir",
+            ["Assembly", "C++", "C", "C#", "Clojure", "Elisp", "Elixir",
              "Erlang", "Go", "HTML/CSS", "Haskell", "Javascript",
-             "Julia", "Java", "Elisp", "Python", "PHP", "Perl",
-             "R", "Rust", "Ruby", "Scheme", "Shell scripting" => "Shell",
+             "Julia", "Java", "Python", "PHP", "Perl", "R", "Rust",
+             "Ruby", "Scheme", "Shell scripting" => "Shell",
              "SQL", "Typescript", :other]),
         RadioSelect(:prose,
             "Do you use Emacs for writing prose?",
             ["Frequently", "Often", "Sometimes", "Rarely", "Never"])),
     SurveyPart("First time questions",
-        "All of these questions are <i>optional</i>. Answer these if you're taking the survey for the first time.",
+        "All of these questions are <em style=\"color: var(--primary)\">optional</em>, " *
+            "but please consider answering them if you are taking the survey for the first time",
         RadioSelect(:prior_editor,
             "Which editor did you use before you started using Emacs?",
             ["None", "Vim", "VS Code", "IntelliJ", "Atom",
@@ -159,6 +160,7 @@ the questions you see now will not necessarily be in the final survey.",
         MultiSelect(:package_contribution_barriers,
             "If you rarely/never contribute to packages, what are the main barriers to doing so?",
             ["Not interested",
+             "Lack of time",
              "Elisp proficiency",
              "Not knowing how to modify a package",
              "Not confident in my code quality" =>
@@ -179,7 +181,8 @@ the questions you see now will not necessarily be in the final survey.",
              "Yes, 5-10 years ago" => "5-10y",
              "Yes, 10+ years ago" => "10+y"]),
         TextArea(:package_submission,
-            "If you write packages, how you you decide which repositories to submit it to (if any)?",
+            "If you write packages, how you you decide which repositories to submit it to (if any)?" *
+                "<p style=\"font-size: 0.8em;\">GNU ELPA, NonGNU ELPA, MELPA, etc.</p>",
             mandatory=false),
         MultiSelect(:package_documentation_wish,
             "What documentation do you wish package authors would more often provide?",
@@ -261,7 +264,9 @@ the questions you see now will not necessarily be in the final survey.",
             ["No", "I have in the past", "Yes",
              "I would like to, but cannot" => "Cannot",
              :other])),
-    SurveyPart("Demographics (all questions are optional)",
+    SurveyPart("Demographics",
+        "All of these questions are <em style=\"color: var(--primary)\">optional</em>, " *
+            "respond to whichever questions you feel like answering",
         IntegerInput(:respondent_age,
             "How old are you?",
             validators = n -> if ismissing(n) # This is fine, the question is optional.
@@ -273,7 +278,7 @@ the questions you see now will not necessarily be in the final survey.",
             mandatory=false),
         RadioSelect(:respondent_gender,
             "What is your gender?",
-            ["Male", "Female", "Other"],
+            ["Male", "Female", :other],
             mandatory=false),
         RadioSelect(:respondent_education,
             "What is the highest level of education you have completed?",
@@ -334,6 +339,7 @@ the questions you see now will not necessarily be in the final survey.",
             "How strongly do the ideals of free/libre software affect your computer use?",
             replace.(["%p %f and am %w *any* %l",
                       "%p %f and am %w a *significant* %l",
+                      "%p %f and am %w a *moderate* %l",
                       "%p %f and am %w a *limited* %l",
                       "%p %f but am *not* %w a %l",
                       "I have no preference for %f"],
@@ -341,11 +347,17 @@ the questions you see now will not necessarily be in the final survey.",
                     "%f" => "free/libre software",
                     "%w" => "willing to accept",
                     "%l" => "lack of features or UI polish",
-                    r"\*(.*?)\*" => s"<em style=\"color: var(--primary-hover);\">\1</em>"))),
+                    r"\*(.*?)\*" => s"<em style=\"color: var(--primary-hover);\">\1</em>") .=>
+                        ["any comprimise",
+                         "significant comprimise",
+                         "moderate comprimise",
+                         "limited comprimise",
+                         "no comprimise",
+                         "do not prefer"])),
     SurveyPart("Survey bookkeeping",
         RadioSelect(:survey_prior,
             "Did you respond to the 2020 Emacs survey?",
-            ["Yes", "No"]),
+            ["Yes", "No", "Not sure"]),
         RadioSelect(:survey_referrer,
             "How did you find out about this survey?",
             ["r/emacs", "Hacker News", "Direct message / friend" => "Friend",