From 98a69fc2ff4cc286f45b47a2d86374af5a0177de Mon Sep 17 00:00:00 2001 From: Theodore Dubois Date: Tue, 9 Jan 2024 12:14:42 -0800 Subject: [PATCH 1/7] (tok) Attempt to remove disabled site sections Hopefully I didn't delete anything that's in use, but that's what git history is for. --- locale/tok/translations.suml | 153 ----------------------------------- 1 file changed, 153 deletions(-) diff --git a/locale/tok/translations.suml b/locale/tok/translations.suml index 31f3eea8d..b17f8c87b 100644 --- a/locale/tok/translations.suml +++ b/locale/tok/translations.suml @@ -4,8 +4,6 @@ description: 'Usage examples of personal pronouns and gender neutral language.' home: link: 'lipu open' - header: 'Pronouns' - headerLong: 'List of pronouns' welcome: 'lipu nimi la kama pona' intro: > lipu ni li pana e nimi wile jan e sona tonsi. @@ -16,16 +14,6 @@ home: - > ilo ni la sina ken pana e nimi sina tawa lipu. lipu la ale li ken sona e ni: ona o toki e sina kepeken nimi seme? - pronouns: 'nasin nimi jan mute' - generator: - header: 'ilo nimi' - description: > - sina pana e nimi tawa ni la ilo li toki e jan kepeken nimi ni. - button: 'Show the generator' - header2: 'Generate a link' - base: 'Based on' - alt: 'You can also enter interchangeable forms in each field separately, eg. him&her = “him” or “her”.' - pronunciation: 'You can also specify the pronunciation after a pipe character, using IPA, eg. faerself|fɛɹsɛlf = “faerself” pronounced as /fɛɹsɛlf/.' whatisit: 'ni li suli tan seme?' mission: header: 'wile mi' @@ -42,151 +30,10 @@ home: ken la mi toki e nasin jan e jan wan ala. nimi o pona lon ni kin. -pronouns: - header: 'nimi' - headerLong: 'nimi jan' - examples: 'o kepeken lon toki sama ni' - plural: 'Plural' - intro: 'nimi mi li' - normative: 'Normative' - alt: - button: 'Generate a link to interchangeable forms' - header: 'Interchangeable forms' - raw: 'interchangeable' - generated: 'Those pronouns have been created using a generator. The team of pronouns.page is not responsible for it.' - any: - header: 'Any pronouns' - short: 'any' - description: > - Even though for many people it's incredibly important that people use specific pronouns to talk about them, - others don't mind being addressed in any way – as long as the context is clear as to who one talks about. - options: 'check out the options [share]{/pronouns=here}.' - others: 'Other forms' - othersRaw: 'other' - or: 'or' - grammarTable: 'Table' - -sources: - header: 'Sources' - headerLong: 'Examples from cultural texts' - headerLonger: 'Nonbinary and gender neutral language in cultural texts' - subheader: 'Text corpus of nonbinary and gender neutral language' - toc: 'Show table of contents' - type: - All: 'All' - Book: 'Books' - Article: 'Articles' - Movie: 'Movies' - Series: 'Series' - Song: 'Music' - Poetry: 'Poetry' - Comics: 'Comics' - Game: 'Game' - Other: 'Other' - submit: - header: 'Submit an example to be added' - action: 'Submit' - pronouns: 'Which pronouns have been used?' - pronounsInfo: 'Enter the simplest form of the pronoun, the way it''s in the link, np. “they”, “e/em/es”, “he&she”' - type: 'Source type' - author: 'Author' - title: 'Title' - extra: 'Additional info (translator, name of journal, …)' - year: 'Release year (of the English version)' - fragments: 'Fragments' - fragmentsInfo: 'You can mark the relevant pronouns using square brackets: “Then \[\[they]] saw how \[\[they]] did all of that to \[\[themselves]].”' - comment: 'Comment' - link: 'Link to the content' - thanks: 'Thanks for contributing!' - another: 'Submit another one' - moderation: 'Submissions will have to get approved before getting published.' - key: 'Key' - keyInfo: 'Identifier for linking sources between language versions and linking with the dictionary' - images: 'Images' - spoiler: 'Spoiler' - otherVersions: 'In other languages' - referenced: 'Examples of use' - -nouns: - header: 'Dictionary' - headerLong: 'Dictionary of neutral nouns' - headerLonger: 'Dictionary of gender neutral language' - description: 'It''s not just pronouns! Check out our dictionary of gender neutral nouns.' - intro: - - > - Inclusive and gender neutral is not just respecting someone's pronouns. - It's also describing their job, position, relationship etc. - in a way that doesn't assume their gender. - Not all firefighters are “firemen”. Not every spouse is a “husband” or a “wife”. - - > - When referring to someone whose gender you don't know, - to a group of people of mixed gender, - and especially to nonbinary people who explicitly prefer them, - use the neutral forms. - - > - Below we present a dictionary of the words to watch out for. - You can contribute to it and add your suggestions. - - > - Keep in mind that it's a dictionary of ideas, proposals. - Not all quoted forms will make sense in every context, not all are fully gender neutral - (but they're used by some nonbinary people to express themselves outside of the gender binary), - and not every word here can be used for any given nonbinary person – just ask what they prefer to be called. - - approved: 'approved entries' - pending: 'awaiting moderation' - edit: 'Propose a change' - edited: 'Proposed change of' - editing: 'You''re editing an existing entry' - empty: 'No words found that match your criteria.' - - submit: - action: 'Submit' - actionLong: 'Submit a word' - thanks: 'Thank you for contributing!' - another: 'Submit another one' - moderation: 'Submissions will have to get approved before getting published.' - - template: 'Use a template' - root: 'Root' - - masculine: 'masculine' - masculineShort: 'masc.' - feminine: 'feminine' - feminineShort: 'fem.' - neuter: 'neutral' - neuterShort: 'neutr.' - - singular: 'singular' - singularShort: 'sing.' - plural: 'plural' - pluralShort: 'pl.' - - image: 'Picture' - community: header: 'kulupu' headerLong: 'kulupu tonsi' -terminology: - header: 'Terminology' - headerLong: 'Dictionary of queer terminology' - info: - - > - Many of the terms and phrases related to the LGBTQ+ community - are used as English inserts into texts. - We'd like to present a glossary of those terms, describe their meaning, - and propose their translations. - - > - Keep in mind that identity labels are inherently subjective and flexible. - This dictionary is a community effort to find the most widely accepted definitions of queer terms, - but shouldn't be treated as any kind of authority on the subject. - The only authority on someone's identity and what words best describe it is… that person themself. - term: 'Term' - original: 'Etymology' - category: 'Category' - images: 'Additional images, from outside the flag catalogue' - definition: 'Definition' - faq: header: 'sona' headerLong: 'sona pi nasin nimi jan' From 528ceaff6d64367672910e030a208d7b3478b70f Mon Sep 17 00:00:00 2001 From: Theodore Dubois Date: Tue, 9 Jan 2024 12:51:15 -0800 Subject: [PATCH 2/7] (tok) trans --- locale/tok/translations.suml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/tok/translations.suml b/locale/tok/translations.suml index b17f8c87b..fabdb65ee 100644 --- a/locale/tok/translations.suml +++ b/locale/tok/translations.suml @@ -44,7 +44,7 @@ faq: - > mi ante e toki la mi ante mute e nasin ilo kin. mi weka e ni: lipu li wile toki e kule mute pi nimi "ona". nasin lipu li kama ni: sina ken toki e nimi sina. flags: - question: 'o pana e sitelen kule ni! o weka e sitelen kule ni!' + question: 'kulupu pali o! o pana e sitelen kule ni! o weka e sitelen kule ni!' answer: - > mu: From 4aa523bea405058e3c26bfead58c82ac4f855e13 Mon Sep 17 00:00:00 2001 From: Theodore Dubois Date: Tue, 9 Jan 2024 12:52:05 -0800 Subject: [PATCH 3/7] (tok) Remove the pronoun list and all technical reasons to have a pronoun list --- locale/tok/config.suml | 2 -- locale/tok/pronouns/pronouns.tsv | 4 ---- plugins/globals.js | 10 ++++++---- routes/profileEditor.vue | 5 ++++- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/locale/tok/config.suml b/locale/tok/config.suml index 466b8d44a..ca66acb60 100644 --- a/locale/tok/config.suml +++ b/locale/tok/config.suml @@ -114,8 +114,6 @@ profile: - header: ~ values: [] - flags: - defaultPronoun: 'ona' longNames: true calendar: diff --git a/locale/tok/pronouns/pronouns.tsv b/locale/tok/pronouns/pronouns.tsv index f648c09f2..fd0b33a10 100644 --- a/locale/tok/pronouns/pronouns.tsv +++ b/locale/tok/pronouns/pronouns.tsv @@ -1,5 +1 @@ key description normative pronoun plural pluralHonorific pronounceable history thirdForm smallForm sourcesInfo -ona FALSE ona FALSE FALSE TRUE -jan ni FALSE jan ni FALSE FALSE TRUE -jan Sonja FALSE jan Sonja FALSE FALSE TRUE -mama sama Mawijo FALSE mama sama Mawijo FALSE FALSE TRUE diff --git a/plugins/globals.js b/plugins/globals.js index 03adffbd0..084adaa35 100644 --- a/plugins/globals.js +++ b/plugins/globals.js @@ -20,10 +20,12 @@ export default ({ app, store }) => { } return false; } - Vue.prototype.$translateForPronoun = (str, pronoun) => - pronoun.format( - translator.translate(`flags.${str.replace(/ /g, '_').replace(/'/g, `*`)}`, {}, false) || str - ); + Vue.prototype.$translateForPronoun = (str, pronoun) => { + let translation = translator.translate(`flags.${str.replace(/ /g, '_').replace(/'/g, `*`)}`, {}, false) || str; + if (pronoun) + translation = pronoun.format(translation); + return translation; + } Vue.prototype.config = config; diff --git a/routes/profileEditor.vue b/routes/profileEditor.vue index bcbbef4a6..afc84cbd2 100644 --- a/routes/profileEditor.vue +++ b/routes/profileEditor.vue @@ -564,7 +564,10 @@ }, computed: { mainPronoun() { - let mainPronoun = buildPronoun(pronouns, this.config.profile.flags.defaultPronoun); + if (!this.config.profile?.flags?.defaultPronoun) { + return null; + } + let mainPronoun = buildPronoun(pronouns, this.config.profile.flags?.defaultPronoun); let mainOpinion = -1; for (let {value: pronoun, opinion} of this.pronouns) { const opinionValue = opinions[opinion]?.value || 0; From 1436c89d7bbb1ff8be8bb183fc06e7b2c8223412 Mon Sep 17 00:00:00 2001 From: Theodore Dubois Date: Tue, 9 Jan 2024 14:11:26 -0800 Subject: [PATCH 4/7] (tok) trans --- locale/tok/translations.suml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/locale/tok/translations.suml b/locale/tok/translations.suml index fabdb65ee..271d92164 100644 --- a/locale/tok/translations.suml +++ b/locale/tok/translations.suml @@ -298,7 +298,7 @@ profile: publishArea: 'Publish the continent in your card' publishLocation: 'Publish the area in your card' time: 'mi la tenpo ni li %time% lon tenpo suno %weekday%' - approximate: 'It''s just an approximate location' + approximate: 'ni li ma poka suli taso' areas: Africa: 'ma Apika' America: 'ma Mewika' @@ -310,11 +310,11 @@ profile: Europe: 'ma Elopa' Indian: 'ma Palata' Pacific: 'telo Pasipi' - flags: 'Flags' + flags: 'sitelen kule' flagsInfo: 'Drag & drop your pride flags into this frame.' flagsCustom: 'Upload custom flags' flagsCustomWarning: 'This flag has been uploaded by a user. The team of pronouns.page is not responsible for it.' - flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' + flagsAsterisk: 'nasin ni li nasa ala, taso sitelen ona li lon tan ni: ken la jan li nasa lon ijo ante li nasa ala lon ni, sama ni: jan meli li olin mije li tonsi.' links: 'Links' linksRecommended: 'We recommend linking to' column: 'Column' @@ -398,6 +398,10 @@ profile: removeSelf: action: 'o weka e mi' confirm: 'sina wile ala wile weka a e sina tan kulupu pi jan @%username%?' + share: + customise: 'nasin nasin' + local: 'o tawa lipu pi toki ni taso' + atAlternative: 'o kepeken nimi /u/' backup: header: 'awen lipu' export: @@ -424,6 +428,7 @@ crud: validation: genericForm: 'The submitted form is invalid. Correct the issues and send it again.' listMaxLength: 'The maximum number of elements in this list is %maxlength%.' + alt: 'toki sitelen:' footer: license: > @@ -451,6 +456,7 @@ footer: uptime: 'Uptime' responseTime: 'Avg response time' month: 'li lon lipu ni' + version: 'ilo li sin nanpa' notFound: message: 'lipu li lon ala' From a7fc54d51c614f38520b372f945f6208dce819f2 Mon Sep 17 00:00:00 2001 From: Theodore Dubois Date: Tue, 9 Jan 2024 16:29:53 -0800 Subject: [PATCH 5/7] (tok) trans --- locale/tok/translations.suml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/tok/translations.suml b/locale/tok/translations.suml index 271d92164..1f565ca40 100644 --- a/locale/tok/translations.suml +++ b/locale/tok/translations.suml @@ -311,11 +311,11 @@ profile: Indian: 'ma Palata' Pacific: 'telo Pasipi' flags: 'sitelen kule' - flagsInfo: 'Drag & drop your pride flags into this frame.' + flagsInfo: 'o tawa e sitelen pi wile sina tawa poki ni.' flagsCustom: 'Upload custom flags' flagsCustomWarning: 'This flag has been uploaded by a user. The team of pronouns.page is not responsible for it.' flagsAsterisk: 'nasin ni li nasa ala, taso sitelen ona li lon tan ni: ken la jan li nasa lon ijo ante li nasa ala lon ni, sama ni: jan meli li olin mije li tonsi.' - links: 'Links' + links: 'lipu ante' linksRecommended: 'We recommend linking to' column: 'Column' opinions: From b1b790979d0693f87cda04a48515ac656cf5e974 Mon Sep 17 00:00:00 2001 From: Theodore Dubois Date: Tue, 9 Jan 2024 16:34:02 -0800 Subject: [PATCH 6/7] (tok) trans --- locale/tok/translations.suml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/tok/translations.suml b/locale/tok/translations.suml index 1f565ca40..c32cd366e 100644 --- a/locale/tok/translations.suml +++ b/locale/tok/translations.suml @@ -416,9 +416,9 @@ crud: removeConfirm: 'Are you sure you want to remove this item?' edit: 'Edit' add: 'Add' - filter: 'Search…' - filterLong: 'Search…' - search: 'Search…' + filter: 'o alasa…' + filterLong: 'o alasa…' + search: 'o alasa…' author: 'Added by' saved: 'Changes saved successfully!' loginRequired: '{/account=Log in} to submit an entry' From 3eb7091e15db7f999b971f8c2021c2ef78c2fb12 Mon Sep 17 00:00:00 2001 From: Theodore Dubois Date: Tue, 9 Jan 2024 17:12:33 -0800 Subject: [PATCH 7/7] Fix translation buttons inside file upload buttons The invisible input element covering the button also covered the translation text. I found a post on stackoverflow that suggested hiding the input element entirely and instead attaching a label to it and styling that. This seems to still work for uploads and can be translated now. https://stackoverflow.com/questions/572768/styling-an-input-type-file-button --- components/FileUploader.vue | 47 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/components/FileUploader.vue b/components/FileUploader.vue index 70466f766..e44e9a14b 100644 --- a/components/FileUploader.vue +++ b/components/FileUploader.vue @@ -1,27 +1,31 @@ @@ -40,6 +44,7 @@ uploading: false, drag: false, errorMessage: '', + id: `upload-${this.name}`, } }, methods: { @@ -87,12 +92,6 @@ } input[type="file"] { - opacity: 0; - position: absolute; - left: 0; - top: 0; - width: 100%; - height: 100%; - cursor: pointer; + display: none; }