Merge branch 'main' into estonian

2025-09-25 14:09:03 -04:00 · 2023-05-29 21:17:38 +03:00 · 2023-05-29 21:17:38 +03:00 · e9752e9fe4
commit e9752e9fe4
parent dc4f364e34 c66ff0f532
14 changed files with 30 additions and 14 deletions
--- 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;
--- 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: '#'
--- 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: '“'
--- 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: '#'
--- 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: '#'
--- 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: '“'
--- 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']
--- 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'
 ];
--- 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: '#'
--- 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: '#'
--- 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 #'
--- 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
--- 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: '#'
--- 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));