From 368c73b55e1964834e562d7b5466506fb6ffc4bd Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 8 Mar 2017 22:48:40 -0800 Subject: put an icon on the page so preview cards can grab it for #56 --- resources/images/purple-flag64.png | Bin 0 -> 3717 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/images/purple-flag64.png (limited to 'resources') diff --git a/resources/images/purple-flag64.png b/resources/images/purple-flag64.png new file mode 100644 index 0000000..ba63aee Binary files /dev/null and b/resources/images/purple-flag64.png differ -- cgit From 414909ac229ce42945e2ca834805f00d16b34bd0 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 8 Mar 2017 22:53:34 -0800 Subject: add the svg version of the logo, we will want it later #56 --- resources/images/purple-flag.svg | 112 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 resources/images/purple-flag.svg (limited to 'resources') diff --git a/resources/images/purple-flag.svg b/resources/images/purple-flag.svg new file mode 100644 index 0000000..c8e231c --- /dev/null +++ b/resources/images/purple-flag.svg @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + + + + + + + + + -- cgit From 79a95150e4f865c0e47c7b55a7c5f212b22e4835 Mon Sep 17 00:00:00 2001 From: Marie Hogebrandt Date: Fri, 24 Mar 2017 20:16:09 +0100 Subject: Update pronouns.tab Adding fey and xie pronouns --- resources/pronouns.tab | 2 ++ 1 file changed, 2 insertions(+) (limited to 'resources') diff --git a/resources/pronouns.tab b/resources/pronouns.tab index b6e00dd..8707b4a 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -29,3 +29,5 @@ 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 +xie xer xer xers xerself -- cgit From 8836c832f8c43fbd10d9c7fe1fe7ce2fbf8abc42 Mon Sep 17 00:00:00 2001 From: Marie Hogebrandt Date: Fri, 24 Mar 2017 20:17:52 +0100 Subject: Update pronouns.tab Tabs. --- resources/pronouns.tab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'resources') diff --git a/resources/pronouns.tab b/resources/pronouns.tab index 8707b4a..07fd63b 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -29,5 +29,5 @@ 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 -xie xer xer xers xerself +fey feym feir feirs feirself +xie xer xer xers xerself -- cgit From 054925bbc03601eea918429e6d1c3b8a8881239c Mon Sep 17 00:00:00 2001 From: Andrew Stiles Date: Tue, 21 Nov 2017 17:01:40 -0600 Subject: Add some v* pronoun variants --- resources/pronouns.tab | 2 ++ 1 file changed, 2 insertions(+) (limited to 'resources') diff --git a/resources/pronouns.tab b/resources/pronouns.tab index 07fd63b..5451804 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -31,3 +31,5 @@ kit kit kits kits kitself ne nem nir nirs nemself fey feym feir feirs feirself xie xer xer xers xerself +vi ver ver vers verself +vi vim vir virs vimself -- cgit From 19a9d576e791922577ba0380e55ba3676229602e Mon Sep 17 00:00:00 2001 From: Claire C <15915950+claiire@users.noreply.github.com> Date: Mon, 29 Jan 2018 20:49:24 -0800 Subject: Update pronouns.tab --- resources/pronouns.tab | 1 + 1 file changed, 1 insertion(+) (limited to 'resources') diff --git a/resources/pronouns.tab b/resources/pronouns.tab index 07fd63b..cc2cee2 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -5,6 +5,7 @@ he him his his himself they them their theirs themselves they them their theirs themself xey xem xyr xyrs xemself +xey xem xeir xeirs xemself sie hir hir hirs hirself it it its its itself ey em eir eirs eirself -- cgit From f357e476bb7c46e06887ee7044c407cbf36f0151 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 3 Mar 2018 17:25:56 -0500 Subject: added vi/vim pronouns --- resources/pronouns.tab | 1 + 1 file changed, 1 insertion(+) (limited to 'resources') diff --git a/resources/pronouns.tab b/resources/pronouns.tab index cc2cee2..ea267f5 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -32,3 +32,4 @@ kit kit kits kits kitself ne nem nir nirs nemself fey feym feir feirs feirself xie xer xer xers xerself +vi vim vim vims vimself -- cgit From 55c81599aaf127feba0773873b1231ed3a379c9b Mon Sep 17 00:00:00 2001 From: Jack Willis Date: Sun, 1 Apr 2018 16:24:42 -0500 Subject: Add 'yo' pronoun --- resources/pronouns.tab | 1 + 1 file changed, 1 insertion(+) (limited to 'resources') diff --git a/resources/pronouns.tab b/resources/pronouns.tab index cc2cee2..075f702 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -32,3 +32,4 @@ kit kit kits kits kitself ne nem nir nirs nemself fey feym feir feirs feirself xie xer xer xers xerself +yo yo yos yos yosself -- cgit From 046a82bde7ed48e91b54270984bc911318c43f16 Mon Sep 17 00:00:00 2001 From: Zzyzx Wolfe Date: Sun, 15 Apr 2018 16:24:20 -0700 Subject: Add shi/hir/hir/hirs/hirself. shi/hir is a common variant of sie/hir. --- resources/pronouns.tab | 1 + 1 file changed, 1 insertion(+) (limited to 'resources') diff --git a/resources/pronouns.tab b/resources/pronouns.tab index cc2cee2..a303c94 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -32,3 +32,4 @@ kit kit kits kits kitself ne nem nir nirs nemself fey feym feir feirs feirself xie xer xer xers xerself +shi hir hir hirs hirself -- cgit From 19a9edb7b09eb19cc2029169cee1f10d6617f008 Mon Sep 17 00:00:00 2001 From: aliengeo <34959047+aliengeo@users.noreply.github.com> Date: Sat, 15 Sep 2018 23:01:29 -0500 Subject: added ae/aer/aers pronouns --- resources/pronouns.tab | 1 + 1 file changed, 1 insertion(+) (limited to 'resources') diff --git a/resources/pronouns.tab b/resources/pronouns.tab index cc2cee2..b316424 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -32,3 +32,4 @@ kit kit kits kits kitself ne nem nir nirs nemself fey feym feir feirs feirself xie xer xer xers xerself +ae aer aer aers aerself -- cgit From 80e1c5eb26a0d0d2a732f7634a51e94bdcd9029a Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 14 Nov 2018 13:00:58 -0800 Subject: Update copyright year --- README.md | 2 +- resources/images/purple-flag.svg | 112 ------------------------------------- resources/images/purple-flag64.png | Bin 3717 -> 0 bytes src/pronouns/config.clj | 2 +- src/pronouns/pages.clj | 4 +- src/pronouns/util.clj | 2 +- src/pronouns/web.clj | 2 +- 7 files changed, 6 insertions(+), 118 deletions(-) delete mode 100644 resources/images/purple-flag.svg delete mode 100644 resources/images/purple-flag64.png (limited to 'resources') diff --git a/README.md b/README.md index a037e48..2d3cf06 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ It is possible to use these example sentences to demonstrate the usage of words ## License -Copyright © 2014-2017 Morgan Astra +Copyright © 2014-2018 Morgan Astra This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as diff --git a/resources/images/purple-flag.svg b/resources/images/purple-flag.svg deleted file mode 100644 index c8e231c..0000000 --- a/resources/images/purple-flag.svg +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - Openclipart - - - - - - - - - - - - diff --git a/resources/images/purple-flag64.png b/resources/images/purple-flag64.png deleted file mode 100644 index ba63aee..0000000 Binary files a/resources/images/purple-flag64.png and /dev/null differ diff --git a/src/pronouns/config.clj b/src/pronouns/config.clj index 19e20f1..ecde59f 100644 --- a/src/pronouns/config.clj +++ b/src/pronouns/config.clj @@ -1,5 +1,5 @@ ;; pronoun.is - a website for pronoun usage examples -;; Copyright (C) 2014 - 2017 Morgan Astra +;; Copyright (C) 2014 - 2018 Morgan Astra ;; This program is free software: you can redistribute it and/or modify ;; it under the terms of the GNU Affero General Public License as diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index 56830d0..d4051ac 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -1,5 +1,5 @@ ;; pronoun.is - a website for pronoun usage examples -;; Copyright (C) 2014 - 2017 Morgan Astra +;; Copyright (C) 2014 - 2018 Morgan Astra ;; This program is free software: you can redistribute it and/or modify ;; it under the terms of the GNU Affero General Public License as @@ -71,7 +71,7 @@ (defn header-block [header] [:div {:class "section title"} - (href "/" [:h1 (e/image "/purple-flag64.png" "flag logo") header])]) + (href "/" [:h1 header])]) (defn examples-block [subject object possessive-determiner possessive-pronoun reflexive] diff --git a/src/pronouns/util.clj b/src/pronouns/util.clj index 01571b6..fa14698 100644 --- a/src/pronouns/util.clj +++ b/src/pronouns/util.clj @@ -1,5 +1,5 @@ ;; pronoun.is - a website for pronoun usage examples -;; Copyright (C) 2014 - 2017 Morgan Astra +;; Copyright (C) 2014 - 2018 Morgan Astra ;; This program is free software: you can redistribute it and/or modify ;; it under the terms of the GNU Affero General Public License as diff --git a/src/pronouns/web.clj b/src/pronouns/web.clj index ab4bbb6..2e8184a 100644 --- a/src/pronouns/web.clj +++ b/src/pronouns/web.clj @@ -1,5 +1,5 @@ ;; pronoun.is - a website for pronoun usage examples -;; Copyright (C) 2014 - 2017 Morgan Astra +;; Copyright (C) 2014 - 2018 Morgan Astra ;; This program is free software: you can redistribute it and/or modify ;; it under the terms of the GNU Affero General Public License as -- cgit From 1af3772aa720663c81c08706a0ecf172283bc2ca Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 14 Nov 2018 21:51:20 -0800 Subject: Fix trailing whitespace in pronouns.tab The new test cases caught a real issue!!! --- resources/pronouns.tab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources') diff --git a/resources/pronouns.tab b/resources/pronouns.tab index c5b6788..492f63c 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -5,7 +5,7 @@ he him his his himself they them their theirs themselves they them their theirs themself xey xem xyr xyrs xemself -xey xem xeir xeirs xemself +xey xem xeir xeirs xemself sie hir hir hirs hirself it it its its itself ey em eir eirs eirself -- cgit From 8628d9705526e91664886e6b2588d4972716a8a5 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 14 Nov 2018 22:12:23 -0800 Subject: Highly top five pronoun sets on the front page --- resources/pronouns.tab | 50 +++++++++++++++++++++++++------------------------- src/pronouns/pages.clj | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'resources') diff --git a/resources/pronouns.tab b/resources/pronouns.tab index 492f63c..03c521b 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -1,40 +1,40 @@ -ze hir hir hirs hirself -ze zir zir zirs zirself she her her hers herself he him his his himself they them their theirs themselves -they them their theirs themself +ze hir hir hirs hirself xey xem xyr xyrs xemself -xey xem xeir xeirs xemself -sie hir hir hirs hirself -it it its its itself -ey em eir eirs eirself +ae aer aer aers aerself e em eir eirs emself +ey em eir eirs eirself +fae faer faer faers faerself +fey fem feir feirs feirself hu hum hus hus humself +it it its its itself +jee jem jeir jeirs jemself +kit kit kits kits kitself +ne nem nir nirs nemself peh pehm peh's peh's pehself per per per pers perself +sie hir hir hirs hirself +se sim ser sers serself +shi hir hir hirs hirself +si hyr hyr hyrs hyrself +they them their theirs themself thon thon thons thons thonself -jee jem jeir jeirs jemself ve ver vis vis verself -xe xem xyr xyrs xemself -zie zir zir zirs zirself -ze zem zes zes zirself -zie zem zes zes zirself -ze mer zer zers zemself -se sim ser sers serself -zme zmyr zmyr zmyrs zmyrself ve vem vir virs vemself -zee zed zeta zetas zedself -fae faer faer faers faerself -zie hir hir hirs hirself -si hyr hyr hyrs hyrself -kit kit kits kits kitself -ne nem nir nirs nemself -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 +xie xer xer xers xerself +xe xem xyr xyrs xemself +xey xem xeir xeirs xemself yo yo yos yos yosself -shi hir hir hirs hirself -ae aer aer aers aerself +ze zir zir zirs zirself +ze zem zes zes zirself +ze mer zer zers zemself +zee zed zeta zetas zedself +zie zir zir zirs zirself +zie zem zes zes zirself +zie hir hir hirs hirself +zme zmyr zmyr zmyrs zmyrself diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index 218caab..6d08519 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -156,7 +156,7 @@ [:li (href link label)])) (defn front [] - (let [abbreviations (take 10 (u/abbreviate *pronouns-table*)) + (let [abbreviations (take 5 (u/abbreviate *pronouns-table*)) links (map make-link abbreviations) title "Pronoun Island"] (html -- cgit From 6550a2e413d6b0c83d462c3f11dc0358679e5c89 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Wed, 14 Nov 2018 23:09:06 -0800 Subject: Make front page include ze/zir also Per feedback from Tavy, ze/zir is at least as common as ze/hir in modern usage, so it should be visible on the first page as well. --- resources/pronouns.tab | 2 +- src/pronouns/pages.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'resources') diff --git a/resources/pronouns.tab b/resources/pronouns.tab index 03c521b..7f788b2 100644 --- a/resources/pronouns.tab +++ b/resources/pronouns.tab @@ -2,6 +2,7 @@ she her her hers herself he him his his himself they them their theirs themselves ze hir hir hirs hirself +ze zir zir zirs zirself xey xem xyr xyrs xemself ae aer aer aers aerself e em eir eirs emself @@ -30,7 +31,6 @@ xie xer xer xers xerself xe xem xyr xyrs xemself xey xem xeir xeirs xemself yo yo yos yos yosself -ze zir zir zirs zirself ze zem zes zes zirself ze mer zer zers zemself zee zed zeta zetas zedself diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index 3b808fb..7fcbcbe 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -156,7 +156,7 @@ [:li (href link label)])) (defn front [] - (let [abbreviations (take 5 (u/abbreviate *pronouns-table*)) + (let [abbreviations (take 6 (u/abbreviate *pronouns-table*)) links (map make-link abbreviations) title "Pronoun Island"] (html -- cgit