zo/pronoun.fyi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add descriptive headers for multiple pronoun sets #38

Browse Source
This commit is contained in:
Morgan Astra 2016-08-07 03:18:47 -07:00
parent f0f6c207da
commit f7e3f082ce
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/pronouns/pages.clj
View File

@ -43,13 +43,17 @@
(defn examples-block (defn examples-block
[subject object possessive-determiner possessive-pronoun reflexive] [subject object possessive-determiner possessive-pronoun reflexive]
[:div {:class "examples"} (let [sub-obj (str subject "/" object)
[:p [:h2 "Here are some usage examples for my pronouns:"]] header-str (str "Here are some usage examples for my "
(subject-example subject) sub-obj
(object-example object) " pronouns")]
(posessive-determiner-example subject possessive-determiner) [:div {:class "examples"}
(possessive-pronoun-example possessive-pronoun) [:p [:h2 header-str]]
(reflexive-example subject reflexive)]) (subject-example subject)
(object-example object)
(posessive-determiner-example subject possessive-determiner)
(possessive-pronoun-example possessive-pronoun)
(reflexive-example subject reflexive)]))
(defn about-block [] (defn about-block []
[:div {:class "about"} [:div {:class "about"}
@ -72,8 +76,6 @@
(defn format-pronoun-examples (defn format-pronoun-examples
[pronoun-declension alternates] [pronoun-declension alternates]
(println pronoun-declension)
(println alternates)
(let [title "Pronoun Island: English Language Examples"] (let [title "Pronoun Island: English Language Examples"]
(html (html
[:html [:html
@ -88,7 +90,7 @@
(about-block) (about-block)
(contact-block)]]))) (contact-block)]])))
(defn parse-pronouns-with-lookup [pronouns-string pronouns-table] (defn lookup-pronouns [pronouns-string pronouns-table]
(let [inputs (s/split pronouns-string #"/") (let [inputs (s/split pronouns-string #"/")
n (count inputs)] n (count inputs)]
(if (>= n 5) (if (>= n 5)
@ -124,16 +126,13 @@
"https://github.com/witch-house/pronoun.is/blob/master/resources/pronouns.tab")) "https://github.com/witch-house/pronoun.is/blob/master/resources/pronouns.tab"))
(defn pronouns [params pronouns-table] (defn pronouns [params pronouns-table]
(println params)
(let [path (params :*) (let [path (params :*)
ors (u/vec-coerce (params "or")) ors (u/vec-coerce (params "or"))
a (println path) pronoun-declension (lookup-pronouns (escape-html path)
pronoun-declension (parse-pronouns-with-lookup (escape-html path) pronouns-table)
pronouns-table) alternates (map #(lookup-pronouns (escape-html %)
alternates (map #(parse-pronouns-with-lookup (escape-html %) pronouns-table)
pronouns-table) ors)]
ors)
]
(println pronoun-declension) (println pronoun-declension)
(if pronoun-declension (if pronoun-declension
(format-pronoun-examples pronoun-declension alternates) (format-pronoun-examples pronoun-declension alternates)