From f85f62ced256abc65a2783fbdbf0c5a4fb590042 Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Thu, 25 May 2023 22:33:48 +0000 Subject: [PATCH 1/6] [a11y] slightly change text colour for better contrast with links (see: https://contrast-triangle.com/) --- assets/variables.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/variables.scss b/assets/variables.scss index 3756ee32e..0ba3aa303 100644 --- a/assets/variables.scss +++ b/assets/variables.scss @@ -10,6 +10,7 @@ $btn-font-family: $font-family-sans-serif; $font-family-base: $font-family-sans-serif; $primary: #C71585; +$body-color: #000; $alert-border-level: -3; $link-decoration: none; From fa0a18111709480d8862269e62b8473823fca418 Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Thu, 25 May 2023 22:34:30 +0000 Subject: [PATCH 2/6] [api] minor request validator to avoid spamming logs on invalid requests --- server/routes/profile.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/routes/profile.js b/server/routes/profile.js index 57e96928d..6a2d39e1a 100644 --- a/server/routes/profile.js +++ b/server/routes/profile.js @@ -563,6 +563,10 @@ router.post('/profile/save', handleErrorAsync(async (req, res) => { })); router.post('/profile/delete/:locale', handleErrorAsync(async (req, res) => { + if (!req.user) { + return res.status(400).json({error: 'Missing user'}); + } + await req.db.get(SQL`DELETE FROM profiles WHERE userId = ${req.user.id} AND locale = ${req.params.locale}`); return res.json(await fetchProfiles(req.db, req.user.username, true)); From 8482dbdbb5e56507b5789f83e926ddec1f3bfca5 Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Sun, 28 May 2023 09:10:02 +0200 Subject: [PATCH 3/6] [ru][pronouns] fix missing example --- locale/ru/pronouns/examples.tsv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/ru/pronouns/examples.tsv b/locale/ru/pronouns/examples.tsv index 2b503d22e..5a6d84a03 100644 --- a/locale/ru/pronouns/examples.tsv +++ b/locale/ru/pronouns/examples.tsv @@ -11,5 +11,5 @@ singular plural isHonorific {'nominative} замечательн{adjective}. {'nominative} замечательн{adjective}. FALSE {'possessive} знаком{adjective} умеет играть на гитаре. {'possessive} знаком{adjective} умеют играть на гитаре. FALSE {'nominative} собра{reflexive_verb_past} на работу. {'nominative} собра{reflexive_verb_past} на работу. FALSE -{'nominative} сказа{nonreflexive_verb_past}, что пойдёт с нами! {'nominative} сказа{nonreflexive_verb_past}, что пойдут с нами! ЛОЖЬ +{'nominative} сказа{nonreflexive_verb_past}, что пойдёт с нами! {'nominative} сказа{nonreflexive_verb_past}, что пойдут с нами! FALSE {'nominative} сделает это {definitive}. {'nominative} сделают это {definitive}. FALSE From dcf373b58243293897b64b0ae62b246a87c35d1f Mon Sep 17 00:00:00 2001 From: Andrea Vos Date: Mon, 29 May 2023 11:39:58 +0200 Subject: [PATCH 4/6] [bug] #347 Null pronouns links are broken --- locale/_base/config.suml | 4 ++-- locale/ar/config.suml | 4 ++-- locale/en/config.suml | 2 +- locale/eo/config.suml | 4 ++-- locale/it/config.suml | 4 ++-- locale/ko/config.suml | 2 +- locale/ro/config.suml | 4 ++-- locale/yi/config.suml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/locale/_base/config.suml b/locale/_base/config.suml index 6fcd7ed02..ee33865ed 100644 --- a/locale/_base/config.suml +++ b/locale/_base/config.suml @@ -23,8 +23,8 @@ pronouns: history: > Some people prefer not using any pronouns, instead being referred by name, initial, omitting pronouns with passive voice, or restructuring the sentence. - See: {https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide}, - {https://lgbta.wikia.org/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki} + See: {https://web.archive.org/web/20211214214513/https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide}, + {https://web.archive.org/web/20230326021305/https://www.lgbtqia.wiki/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki} morphemes: pronoun_subject: '#' pronoun_object: '#' diff --git a/locale/ar/config.suml b/locale/ar/config.suml index 42a0f5d89..baf156905 100644 --- a/locale/ar/config.suml +++ b/locale/ar/config.suml @@ -24,8 +24,8 @@ pronouns: history: > Some people prefer not using any pronouns, instead being referred by name, initial, omitting pronouns with passive voice, or restructuring the sentence. - See: {https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide}, - {https://lgbta.wikia.org/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki} + See: {https://web.archive.org/web/20211214214513/https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide}, + {https://web.archive.org/web/20230326021305/https://www.lgbtqia.wiki/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki} morphemes: pronoun_subject: '#' pronoun_object: '#' diff --git a/locale/en/config.suml b/locale/en/config.suml index 67d8ff392..fa1e1f221 100644 --- a/locale/en/config.suml +++ b/locale/en/config.suml @@ -26,7 +26,7 @@ pronouns: Some people prefer not using any pronouns, instead being referred by name, initial, omitting pronouns with passive voice, or restructuring the sentence. See: {https://web.archive.org/web/20211214214513/https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide}, - {https://www.lgbtqia.wiki/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki} + {https://web.archive.org/web/20230326021305/https://www.lgbtqia.wiki/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki} morphemes: pronoun_subject: '#' pronoun_object: '#' diff --git a/locale/eo/config.suml b/locale/eo/config.suml index f75ce2d97..40bd25485 100644 --- a/locale/eo/config.suml +++ b/locale/eo/config.suml @@ -23,8 +23,8 @@ pronouns: history: > Some people prefer not using any pronouns, instead being referred by name, initial, omitting pronouns with passive voice, or restructuring the sentence. - See: {https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide}, - {https://lgbta.wikia.org/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki} + See: {https://web.archive.org/web/20211214214513/https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide}, + {https://web.archive.org/web/20230326021305/https://www.lgbtqia.wiki/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki} morphemes: pronoun_subject: '#' examples: [':Andrea', ':S'] diff --git a/locale/it/config.suml b/locale/it/config.suml index a65cc1430..2d0ccd577 100644 --- a/locale/it/config.suml +++ b/locale/it/config.suml @@ -23,8 +23,8 @@ pronouns: history: > Some people prefer not using any pronouns, instead being referred by name, initial, omitting pronouns with passive voice, or restructuring the sentence. - See: {https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide}, - {https://lgbta.wikia.org/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki} + See: {https://web.archive.org/web/20211214214513/https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide}, + {https://web.archive.org/web/20230326021305/https://www.lgbtqia.wiki/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki} morphemes: pronoun_subject: '#' pronoun_object: '#' diff --git a/locale/ko/config.suml b/locale/ko/config.suml index f06674854..e38530aa6 100644 --- a/locale/ko/config.suml +++ b/locale/ko/config.suml @@ -18,7 +18,7 @@ pronouns: examples: ['그와 그녀', '그와 그들', '그녀와 그들'] null: description: '대명사 없음 / 무효 대명사 / 자기 이름' - history: '어떤 사람들은 대명사를 사용하지 않고 대신 이름, 이니셜 또는 수동태로 대명사를 생략하는 것을 선호합니다({https://lgbta.wikia.org/wiki/Nullpronominal=널 의례적인}.' + history: '어떤 사람들은 대명사를 사용하지 않고 대신 이름, 이니셜 또는 수동태로 대명사를 생략하는 것을 선호합니다({https://web.archive.org/web/20230326021305/https://www.lgbtqia.wiki/wiki/Nullpronominal=널 의례적인}.' morphemes: pronoun_subject: '#' pronoun_object: '#' diff --git a/locale/ro/config.suml b/locale/ro/config.suml index aa5f24e31..bd8d98791 100644 --- a/locale/ro/config.suml +++ b/locale/ro/config.suml @@ -22,8 +22,8 @@ pronouns: history: > Unele persoane preferă să nu folosească niciun pronume, fiind referiți după nume, inițială, evitând pronume cu voce pasivă sau restructurând propoziția. - Vezi: {https://twitter.com/lypomania/status/1290274971642544128=ghidul lui lypomania (în lb. Engleză)}, - {https://lgbta.wikia.org/wiki/Nullpronominal=Nul-pronominal pe LGBTA Wiki (în lb. Engleză)} + Vezi: {https://web.archive.org/web/20211214214513/https://twitter.com/lypomania/status/1290274971642544128=ghidul lui lypomania (în lb. Engleză)}, + {https://web.archive.org/web/20230326021305/https://www.lgbtqia.wiki/wiki/Nullpronominal=Nul-pronominal pe LGBTA Wiki (în lb. Engleză)} morphemes: pronoun_n: '#' pronoun_dg: 'lui #' diff --git a/locale/yi/config.suml b/locale/yi/config.suml index dbc98b6e1..903857735 100644 --- a/locale/yi/config.suml +++ b/locale/yi/config.suml @@ -16,7 +16,7 @@ pronouns: examples: ['ער&זי', 'זי&זיי', 'ער&זיי'] null: description: 'No pronouns / null pronouns / pronounless / nameself' - history: 'Some people prefer not using any pronouns, instead being referred by name, initial, or by omitting pronouns with passive voice, see: {https://lgbta.wikia.org/wiki/Nullpronominal=nullpronominal}.' + history: 'Some people prefer not using any pronouns, instead being referred by name, initial, or by omitting pronouns with passive voice, see: {https://web.archive.org/web/20230326021305/https://www.lgbtqia.wiki/wiki/Nullpronominal=nullpronominal}.' morphemes: pronoun_subject: '#' pronoun_object: '#' From 1612e4751db0ce0ca2c361a18415c0ee57d27fe1 Mon Sep 17 00:00:00 2001 From: Gradient1058 <14628263-Gradient1058@users.noreply.gitlab.com> Date: Mon, 29 May 2023 19:46:50 +0300 Subject: [PATCH 5/6] Unhardcode footer strings --- components/Footer.vue | 7 +++---- locale/en/translations.suml | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/components/Footer.vue b/components/Footer.vue index 0ce6f0794..7b2c58268 100644 --- a/components/Footer.vue +++ b/components/Footer.vue @@ -85,7 +85,7 @@

- Version: + footer.version / @@ -128,8 +128,7 @@

  • - Using gradientmagic.com - and Noto Color Emoji + footer.using
    • @@ -150,7 +149,7 @@
  • - Source code + api.source
  • diff --git a/locale/en/translations.suml b/locale/en/translations.suml index da276937f..4129a3951 100644 --- a/locale/en/translations.suml +++ b/locale/en/translations.suml @@ -979,6 +979,8 @@ crud: footer: license: > {https://gitlab.com/PronounsPage/PronounsPage=Source code} and content are licensed under {/license=OQL}. + using: > + Using {https://www.gradientmagic.com/=gradientmagic.com} and {https://fonts.google.com/noto/specimen/Noto+Color+Emoji=Noto Color Emoji} links: 'Contact & social media' legal: 'Legal' financial: 'Financial transparency' @@ -998,6 +1000,7 @@ footer: uptime: 'Uptime' responseTime: 'Avg response time' month: 'month' + version: 'Version:' notFound: message: 'Page was not found' @@ -1186,6 +1189,7 @@ api: header: 'Public API' example: 'Example' query: 'Query string parameters' + source: 'Source code' quotation: start: '“' From 0355f963671c23dd38d021d125bda27f4adf1a48 Mon Sep 17 00:00:00 2001 From: Gradient1058 <14628263-Gradient1058@users.noreply.gitlab.com> Date: Mon, 29 May 2023 21:15:39 +0300 Subject: [PATCH 6/6] Add missing --- locale/_base/translations.suml | 4 ++++ locale/expectedTranslations.js | 3 +++ 2 files changed, 7 insertions(+) diff --git a/locale/_base/translations.suml b/locale/_base/translations.suml index 3f13695b0..368dad538 100644 --- a/locale/_base/translations.suml +++ b/locale/_base/translations.suml @@ -806,6 +806,8 @@ crud: footer: license: > {https://gitlab.com/PronounsPage/PronounsPage=Source code} and content are licensed under {/license=OQL}. + using: > + Using {https://www.gradientmagic.com/=gradientmagic.com} and {https://fonts.google.com/noto/specimen/Noto+Color+Emoji=Noto Color Emoji} links: 'Contact, social media' legal: 'Legal' financial: 'Financial transparency' @@ -825,6 +827,7 @@ footer: uptime: 'Uptime' responseTime: 'Avg response time' month: 'month' + version: 'Version:' notFound: message: 'Page was not found' @@ -1029,6 +1032,7 @@ api: header: 'Public API' example: 'Example' query: 'Query string parameters' + source: 'Source code' quotation: start: '“' diff --git a/locale/expectedTranslations.js b/locale/expectedTranslations.js index f865ccbab..204ae359d 100644 --- a/locale/expectedTranslations.js +++ b/locale/expectedTranslations.js @@ -45,6 +45,8 @@ module.exports = [ 'footer.stats.keys.visitDuration', 'footer.stats.keys.uptime', 'footer.stats.keys.responseTime', + 'footer.using', + 'footer.version', 'privacy.header', 'user.avatar.failed', 'user.qr.header', @@ -121,4 +123,5 @@ module.exports = [ 'mode.reducedItems', 'user.socialLookup', 'user.socialLookupWhy', + 'api.source' ];