diff options
| author | Morgan Astra <m@morganastra.me> | 2018-11-14 12:52:52 -0800 |
|---|---|---|
| committer | Morgan Astra <m@morganastra.me> | 2018-11-14 12:52:52 -0800 |
| commit | 4eb455368156faea64e37437f9cf16178f6035f0 (patch) | |
| tree | 6f4fba02b3304613e343db88852a760744ed9b5d | |
| parent | 4321ec5e39bdb817fbcc61cc40a42b5a23a0a1ce (diff) | |
| parent | a1f10d3b04b65030f660d41f92be2bf34c230222 (diff) | |
Merge branch 'master' into develop
| -rw-r--r-- | resources/pronouns.tab | 4 | ||||
| -rw-r--r-- | src/pronouns/pages.clj | 6 | ||||
| -rw-r--r-- | src/pronouns/web.clj | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/resources/pronouns.tab b/resources/pronouns.tab index 06587c0..c5b6788 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -30,11 +30,11 @@ zie hir hir hirs hirself si hyr hyr hyrs hyrself kit kit kits kits kitself ne nem nir nirs nemself -fey feym feir feirs feirself +fey fem feir feirs feirself xie xer xer xers xerself vi ver ver vers verself vi vim vir virs vimself vi vim vim vims vimself yo yo yos yos yosself shi hir hir hirs hirself -ae aer aer aers aerself \ No newline at end of file +ae aer aer aers aerself diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index e33893f..56830d0 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -103,10 +103,6 @@ (twitter-name "morganastra") ", whose " (href "http://pronoun.is/ze/zir?or=she" "pronoun.is/ze/zir?or=she")] - [:p "Want to support this and similar websites? " - "Join us on " - (href "https://www.patreon.com/user?u=5238484" "Patreon") - "!"] [:p "pronoun.is is free software under the " (href "https://www.gnu.org/licenses/agpl.html" "AGPLv3") "! visit the project on " @@ -184,7 +180,7 @@ [:body (header-block title) [:div {:class "section examples"} - [:p [:h2 (str "We couldn't find those pronouns in our database." + [:p [:h2 (str "We couldn't find those pronouns in our database. " "If you think we should have them, please reach out!")]]] (footer-block)]]))) diff --git a/src/pronouns/web.clj b/src/pronouns/web.clj index 872a6aa..ab4bbb6 100644 --- a/src/pronouns/web.clj +++ b/src/pronouns/web.clj @@ -50,6 +50,11 @@ (ANY "*" [] (route/not-found (slurp (io/resource "404.html"))))) +(defn wrap-gnu-natalie-nguyen [handler] + (fn [req] + (when-let [resp (handler req)] + (assoc-in resp [:headers "X-Clacks-Overhead"] "GNU Natalie Nguyen")))) + (defn wrap-error-page [handler] (fn [req] (try (handler req) @@ -66,6 +71,7 @@ wrap-not-modified ;logger/wrap-with-logger wrap-error-page + wrap-gnu-natalie-nguyen trace/wrap-stacktrace params/wrap-params)) |