Merge branch 'main' into estonian

This commit is contained in:
Gradient1058 2023-05-29 21:17:38 +03:00
commit e9752e9fe4
14 changed files with 30 additions and 14 deletions

View File

@ -10,6 +10,7 @@ $btn-font-family: $font-family-sans-serif;
$font-family-base: $font-family-sans-serif; $font-family-base: $font-family-sans-serif;
$primary: #C71585; $primary: #C71585;
$body-color: #000;
$alert-border-level: -3; $alert-border-level: -3;
$link-decoration: none; $link-decoration: none;

View File

@ -23,8 +23,8 @@ pronouns:
history: > history: >
Some people prefer not using any pronouns, instead being referred by name, initial, Some people prefer not using any pronouns, instead being referred by name, initial,
omitting pronouns with passive voice, or restructuring the sentence. omitting pronouns with passive voice, or restructuring the sentence.
See: {https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide}, See: {https://web.archive.org/web/20211214214513/https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide},
{https://lgbta.wikia.org/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki} {https://web.archive.org/web/20230326021305/https://www.lgbtqia.wiki/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki}
morphemes: morphemes:
pronoun_subject: '#' pronoun_subject: '#'
pronoun_object: '#' pronoun_object: '#'

View File

@ -806,6 +806,8 @@ crud:
footer: footer:
license: > license: >
{https://gitlab.com/PronounsPage/PronounsPage=Source code} and content are licensed under {/license=OQL}. {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' links: 'Contact, social media'
legal: 'Legal' legal: 'Legal'
financial: 'Financial transparency' financial: 'Financial transparency'
@ -825,6 +827,7 @@ footer:
uptime: 'Uptime' uptime: 'Uptime'
responseTime: 'Avg response time' responseTime: 'Avg response time'
month: 'month' month: 'month'
version: 'Version:'
notFound: notFound:
message: 'Page was not found' message: 'Page was not found'
@ -1029,6 +1032,7 @@ api:
header: 'Public API' header: 'Public API'
example: 'Example' example: 'Example'
query: 'Query string parameters' query: 'Query string parameters'
source: 'Source code'
quotation: quotation:
start: '“' start: '“'

View File

@ -24,8 +24,8 @@ pronouns:
history: > history: >
Some people prefer not using any pronouns, instead being referred by name, initial, Some people prefer not using any pronouns, instead being referred by name, initial,
omitting pronouns with passive voice, or restructuring the sentence. omitting pronouns with passive voice, or restructuring the sentence.
See: {https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide}, See: {https://web.archive.org/web/20211214214513/https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide},
{https://lgbta.wikia.org/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki} {https://web.archive.org/web/20230326021305/https://www.lgbtqia.wiki/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki}
morphemes: morphemes:
pronoun_subject: '#' pronoun_subject: '#'
pronoun_object: '#' pronoun_object: '#'

View File

@ -26,7 +26,7 @@ pronouns:
Some people prefer not using any pronouns, instead being referred by name, initial, Some people prefer not using any pronouns, instead being referred by name, initial,
omitting pronouns with passive voice, or restructuring the sentence. 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}, 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: morphemes:
pronoun_subject: '#' pronoun_subject: '#'
pronoun_object: '#' pronoun_object: '#'

View File

@ -979,6 +979,8 @@ crud:
footer: footer:
license: > license: >
{https://gitlab.com/PronounsPage/PronounsPage=Source code} and content are licensed under {/license=OQL}. {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' links: 'Contact & social media'
legal: 'Legal' legal: 'Legal'
financial: 'Financial transparency' financial: 'Financial transparency'
@ -998,6 +1000,7 @@ footer:
uptime: 'Uptime' uptime: 'Uptime'
responseTime: 'Avg response time' responseTime: 'Avg response time'
month: 'month' month: 'month'
version: 'Version:'
notFound: notFound:
message: 'Page was not found' message: 'Page was not found'
@ -1186,6 +1189,7 @@ api:
header: 'Public API' header: 'Public API'
example: 'Example' example: 'Example'
query: 'Query string parameters' query: 'Query string parameters'
source: 'Source code'
quotation: quotation:
start: '“' start: '“'

View File

@ -23,8 +23,8 @@ pronouns:
history: > history: >
Some people prefer not using any pronouns, instead being referred by name, initial, Some people prefer not using any pronouns, instead being referred by name, initial,
omitting pronouns with passive voice, or restructuring the sentence. omitting pronouns with passive voice, or restructuring the sentence.
See: {https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide}, See: {https://web.archive.org/web/20211214214513/https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide},
{https://lgbta.wikia.org/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki} {https://web.archive.org/web/20230326021305/https://www.lgbtqia.wiki/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki}
morphemes: morphemes:
pronoun_subject: '#' pronoun_subject: '#'
examples: [':Andrea', ':S'] examples: [':Andrea', ':S']

View File

@ -45,6 +45,8 @@ module.exports = [
'footer.stats.keys.visitDuration', 'footer.stats.keys.visitDuration',
'footer.stats.keys.uptime', 'footer.stats.keys.uptime',
'footer.stats.keys.responseTime', 'footer.stats.keys.responseTime',
'footer.using',
'footer.version',
'privacy.header', 'privacy.header',
'user.avatar.failed', 'user.avatar.failed',
'user.qr.header', 'user.qr.header',
@ -121,4 +123,5 @@ module.exports = [
'mode.reducedItems', 'mode.reducedItems',
'user.socialLookup', 'user.socialLookup',
'user.socialLookupWhy', 'user.socialLookupWhy',
'api.source'
]; ];

View File

@ -23,8 +23,8 @@ pronouns:
history: > history: >
Some people prefer not using any pronouns, instead being referred by name, initial, Some people prefer not using any pronouns, instead being referred by name, initial,
omitting pronouns with passive voice, or restructuring the sentence. omitting pronouns with passive voice, or restructuring the sentence.
See: {https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide}, See: {https://web.archive.org/web/20211214214513/https://twitter.com/lypomania/status/1290274971642544128=lypomania's guide},
{https://lgbta.wikia.org/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki} {https://web.archive.org/web/20230326021305/https://www.lgbtqia.wiki/wiki/Nullpronominal=Nullpronominal on LGBTA Wiki}
morphemes: morphemes:
pronoun_subject: '#' pronoun_subject: '#'
pronoun_object: '#' pronoun_object: '#'

View File

@ -18,7 +18,7 @@ pronouns:
examples: ['그와 그녀', '그와 그들', '그녀와 그들'] examples: ['그와 그녀', '그와 그들', '그녀와 그들']
null: null:
description: '대명사 없음 / 무효 대명사 / 자기 이름' description: '대명사 없음 / 무효 대명사 / 자기 이름'
history: '어떤 사람들은 대명사를 사용하지 않고 대신 이름, 이니셜 또는 수동태로 대명사를 생략하는 것을 선호합니다({https://lgbta.wikia.org/wiki/Nullpronominal=널 의례적인}.' history: '어떤 사람들은 대명사를 사용하지 않고 대신 이름, 이니셜 또는 수동태로 대명사를 생략하는 것을 선호합니다({https://web.archive.org/web/20230326021305/https://www.lgbtqia.wiki/wiki/Nullpronominal=널 의례적인}.'
morphemes: morphemes:
pronoun_subject: '#' pronoun_subject: '#'
pronoun_object: '#' pronoun_object: '#'

View File

@ -22,8 +22,8 @@ pronouns:
history: > history: >
Unele persoane preferă să nu folosească niciun pronume, fiind referiți după nume, inițială, 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. evitând pronume cu voce pasivă sau restructurând propoziția.
Vezi: {https://twitter.com/lypomania/status/1290274971642544128=ghidul lui lypomania (în lb. Engleză)}, Vezi: {https://web.archive.org/web/20211214214513/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ă)} {https://web.archive.org/web/20230326021305/https://www.lgbtqia.wiki/wiki/Nullpronominal=Nul-pronominal pe LGBTA Wiki (în lb. Engleză)}
morphemes: morphemes:
pronoun_n: '#' pronoun_n: '#'
pronoun_dg: 'lui #' pronoun_dg: 'lui #'

View File

@ -11,5 +11,5 @@ singular plural isHonorific
{'nominative} замечательн{adjective}. {'nominative} замечательн{adjective}. FALSE {'nominative} замечательн{adjective}. {'nominative} замечательн{adjective}. FALSE
{'possessive} знаком{adjective} умеет играть на гитаре. {'possessive} знаком{adjective} умеют играть на гитаре. FALSE {'possessive} знаком{adjective} умеет играть на гитаре. {'possessive} знаком{adjective} умеют играть на гитаре. FALSE
{'nominative} собра{reflexive_verb_past} на работу. {'nominative} собра{reflexive_verb_past} на работу. 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 {'nominative} сделает это {definitive}. {'nominative} сделают это {definitive}. FALSE

1 singular plural isHonorific
11 {'nominative} замечательн{adjective}. {'nominative} замечательн{adjective}. FALSE
12 {'possessive} знаком{adjective} умеет играть на гитаре. {'possessive} знаком{adjective} умеют играть на гитаре. FALSE
13 {'nominative} собра{reflexive_verb_past} на работу. {'nominative} собра{reflexive_verb_past} на работу. FALSE
14 {'nominative} сказа{nonreflexive_verb_past}, что пойдёт с нами! {'nominative} сказа{nonreflexive_verb_past}, что пойдут с нами! ЛОЖЬ FALSE
15 {'nominative} сделает это {definitive}. {'nominative} сделают это {definitive}. FALSE

View File

@ -16,7 +16,7 @@ pronouns:
examples: ['ער&זי', 'זי&זיי', 'ער&זיי'] examples: ['ער&זי', 'זי&זיי', 'ער&זיי']
null: null:
description: 'No pronouns / null pronouns / pronounless / nameself' 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: morphemes:
pronoun_subject: '#' pronoun_subject: '#'
pronoun_object: '#' pronoun_object: '#'

View File

@ -563,6 +563,10 @@ router.post('/profile/save', handleErrorAsync(async (req, res) => {
})); }));
router.post('/profile/delete/:locale', 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}`); 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)); return res.json(await fetchProfiles(req.db, req.user.username, true));