KayFaraday
/
Zaimki
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flags asterisk

This commit is contained in:
Andrea 2022-05-07 15:52:18 -05:00
parent 1fc557d412
commit 8e268faee8
23 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/Flag.vue
View File

@ -2,15 +2,19 @@
<span class="flag-wrapper">
<a v-if="link" :href="`/${config.nouns.route}/${config.terminology.route}#${link.toLowerCase()}`" :title="alt">
<img :src="img" :alt="name" class="flag-mini rounded"/>
<Twemoji><Spelling escape :text="name"/><sup v-if="custom" class="text-muted"><small><Icon v="user"/></small></sup></Twemoji>
<Twemoji><Spelling escape :text="name"/><sup v-if="custom" class="text-muted"><small><Icon v="user"/></small></sup><sup v-if="asterisk" class="text-muted"><small>*</small></sup></Twemoji>
</a>
<span v-else :title="alt">
<img :src="img" :alt="name" class="flag-mini rounded"/>
<Twemoji><Spelling escape :text="name"/><sup v-if="custom" class="text-muted"><small><Icon v="user"/></small></sup></Twemoji>
<Twemoji><Spelling escape :text="name"/><sup v-if="custom" class="text-muted"><small><Icon v="user"/></small></sup><sup v-if="asterisk" class="text-muted"><small>*</small></sup></Twemoji>
</span>
<span class="flag-preview bg-white rouded p-2 border">
<img :src="img" :alt="name" class="rounded"/>
<span v-if="custom" class="alert alert-warning small d-inline-block mt-2 mb-0 p-2">
<span v-if="asterisk" class="alert alert-warning small d-block mt-2 mb-0 p-2">
*
<T>profile.flagsAsterisk</T>
</span>
<span v-if="custom" class="alert alert-warning small d-block mt-2 mb-0 p-2">
<Icon v="user"/>
<T>profile.flagsCustomWarning</T>
</span>
@ -26,6 +30,7 @@
img: { required: true },
terms: { },
custom: { type: Boolean },
asterisk: { type: Boolean },
},
computed: {
link() {
@ -84,9 +89,15 @@
}
}
text-align: left;
font-weight: normal;
&:hover {
.flag-preview {
display: block;
span {
white-space: normal;
}
}
}
}

7
components/Profile.vue
View File

@ -39,7 +39,9 @@
<Flag :name="flag.startsWith('-') ? allFlags[flag] : $translateForPronoun(allFlags[flag], mainPronoun)"
:alt="allFlags[flag]"
:img="`/flags/${flag}.png`"
:terms="terms || []"/>
:terms="terms || []"
:asterisk="flagsAsterisk.includes(flag)"
/>
</li>
<li v-for="(desc, flag) in profile.customFlags" class="list-inline-item p-1">
<Flag :name="desc"
@ -126,7 +128,8 @@
allFlags: process.env.FLAGS,
glue: ' ' + this.$t('pronouns.or') + ' ',
minAge: parseInt(process.env.MIN_AGE),
}
flagsAsterisk: process.env.FLAGS_ASTERISK,
};
},
computed: {
pronounOpinions() {

1
locale/_base/translations.suml
View File

@ -569,6 +569,7 @@ profile:
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).' # TODO
links: 'Links'
linksRecommended: 'We recommend linking to'
verifiedLinks:

1
locale/de/translations.suml
View File

@ -490,6 +490,7 @@ profile:
flagsInfo: 'Ziehe deine Pride Flaggen per drag & drop in diesen Rahmen.'
flagsCustom: 'Benutzerdefinierte Flaggen hochladen'
flagsCustomWarning: 'Diese Flagge wurde von einer*m Nutzer*in hochgeladen. Das Team von pronouns.page ist nicht dafür verantwortlich.'
flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
links: 'Links'
linksRecommended: 'Wir empfehlen Verlinkung zu'
# TODO

1
locale/en/translations.suml
View File

@ -603,6 +603,7 @@ profile:
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).'
links: 'Links'
linksRecommended: 'We recommend linking to'
verifiedLinks:

1
locale/eo/translations.suml
View File

@ -555,6 +555,7 @@ profile:
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).' # TODO
links: 'Ligiloj'
linksRecommended: 'We recommend linking to'
# TODO

1
locale/es/translations.suml
View File

@ -575,6 +575,7 @@ profile:
flagsInfo: 'Arrastra tus banderas de orgullo a este marco.'
flagsCustom: 'Sube una bandera personalizada'
flagsCustomWarning: 'Esta bandera fue subida por un usuario. El equipo de pronouns.page no es responsable de ella.'
flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
links: 'Enlaces'
linksRecommended: 'Recomendamos enlaces a'
# TODO

1
locale/fr/translations.suml
View File

@ -493,6 +493,7 @@ profile:
flagsInfo: 'Glissez et déposer vos drapeaux de fierté dans ce cadre.'
flagsCustom: 'Uploader un drapeau personnalisé'
flagsCustomWarning: 'Ce drapeau a été uploadé par un.e utilisateur.rice. L’équipe de pronouns.page n’en est pas tenue responsable.'
flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
links: 'Liens'
linksRecommended: 'Nous vous recommandons ces liens'
# TODO

1
locale/gl/translations.suml
View File

@ -474,6 +474,7 @@ profile:
flagsInfo: 'Arrasta as bandeiras de orgulho para este ponto.'
flagsCustom: 'Enviar bandeira personalizada'
flagsCustomWarning: 'Esta bandeira foi enviada por ume usuárie. O time da pronouns.page não é responsável por este conteúdo.'
flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
links: 'Links'
linksRecommended: 'Recomendamos linkar com'
# TODO

1
locale/it/translations.suml
View File

@ -571,6 +571,7 @@ profile:
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).' # TODO
links: 'Links'
linksRecommended: 'We recommend linking to'
# TODO

1
locale/ja/translations.suml
View File

@ -492,6 +492,7 @@ profile:
flagsInfo: 'このフレームにあなたのプライドフラッグをドラッグ&ドロップします'
flagsCustom: 'カスタムフラグをアップロード'
flagsCustomWarning: 'このフラグはユーザーによってアップロードされました。Pronouns.pageのチームは関わっていません。'
flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
links: 'リンク'
linksRecommended: ''
linksRecommendedAfter: 'にリンクすることをお勧めします。'

1
locale/ko/translations.suml
View File

@ -568,6 +568,7 @@ profile:
flagsInfo: '이 프레임에 프라이드 플래그를 끌어다 놓세요.'
flagsCustom: '맞춤 플래그 업로드'
flagsCustomWarning: '이 플래그는 사용자가 업로드했습니다. pronouns.page 팀은 이에 대한 책임을 지지 않습니다.'
flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).'
links: '링크'
linksRecommended: '여기 연결하는 것이 좋습니다.'
# TODO

1
locale/lad/translations.suml
View File

@ -470,6 +470,7 @@ profile:
flagsInfo: 'Arrastra tus bandieras de orgolyo a este marko.'
flagsCustom: 'Karga una bandiera personalizada'
flagsCustomWarning: 'Esta bandiera fue kargada por un uzadore. La taifa de pronouns.page no es responsable de eya.'
flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
links: 'Atadijos'
linksCake: 'Rekomendamos atadijos a'
column: 'Kolona'

1
locale/nl/translations.suml
View File

@ -494,6 +494,7 @@ profile:
flagsInfo: 'Klik en sleep jouw pridevlaggen naar deze frame.'
flagsCustom: 'Upload zelfgemaakte vlaggen'
flagsCustomWarning: 'Deze vlag werd geuploaded door een gebruiker. Het team van pronouns.page is hier niet verantwoordelijk voor.'
flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
links: 'Links'
linksRecommended: 'We raden aan te linken naar'
# TODO

1
locale/no/translations.suml
View File

@ -471,6 +471,7 @@ profile:
flagsInfo: 'Dra og dropp pride flaggene dine inn i denne rammen.'
flagsCustom: 'Last opp tilpasset flagg'
flagsCustomWarning: 'Dette flagget har blitt lastet opp av en bruker. Teamet som har laget pronouns.page er ikke ansvarlig for det.'
flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
links: 'Linker'
linksRecommended: 'Vi anbefaler å linke til'
# TODO

1
locale/pl/translations.suml
View File

@ -1264,6 +1264,7 @@ profile:
Więcej informacji o etykietkach znajdziesz w naszym <a href="/terminologia" target="_blank">Słowniku Terminologii Queerowej</a>.
flagsCustom: 'Dodaj inne flagi'
flagsCustomWarning: 'Ta flaga została wgrana przez osobę użytkującą. Ekipa zaimki.pl nie jest za nią odpowiedzialna.'
flagsAsterisk: 'To nie jest queerowa tożsamość, ale uwględniamy ją tutaj przez wzgląd na osoby, które są queerowe na inne sposoby (np. hetero osoby trans).'
links: 'Linki'
linksRecommended: 'Polecamy dodać link do'
verifiedLinks:

1
locale/pt/translations.suml
View File

@ -496,6 +496,7 @@ profile:
flagsInfo: 'Arrasta as bandeiras de orgulho para este ponto.'
flagsCustom: 'Enviar bandeira personalizada'
flagsCustomWarning: 'Esta bandeira foi enviada por ume usuárie. O time da pronouns.page não é responsável por este conteúdo.'
flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
links: 'Links'
linksRecommended: 'Recomendamos linkar com'
# TODO

1
locale/ru/translations.suml
View File

@ -574,6 +574,7 @@ profile:
flagsInfo: 'Перетащите ваши прайд-флаги в эту рамку.'
flagsCustom: 'Загрузить пользовательский прайд-флаг'
flagsCustomWarning: 'Этот прайд-флаг был добавлен пользователикс. Команда pronouns.page не несет ответственность за это.'
flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
links: 'Ссылки'
linksRecommended: 'Рекомендуем перейти по этим ссылкам'
# TODO

1
locale/sv/translations.suml
View File

@ -547,6 +547,7 @@ profile:
flagsInfo: 'Dra och släpp dina pride flaggor här.'
flagsCustom: 'Ladda upp anpassad flagga'
flagsCustomWarning: 'Denna flagga har laddats upp av en användare. Pronouns.page är inte ansvarig.'
flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
links: 'Länkar'
column: 'Kolumn'

1
locale/ua/translations.suml
View File

@ -607,6 +607,7 @@ profile:
flagsInfo: 'Перетягніть ваші прайд-прапори в цю рамку.'
flagsCustom: 'Завантажити користувацький прайд-прапор'
flagsCustomWarning: 'Цей прайд-прапор був доданий користувач_кою. Команда pronouns.page не несе відповідальності за це.'
flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
links: 'Посилання'
linksRecommended: 'Рекомендуємо перейти за цими посиланням'
# TODO

1
locale/zh/translations.suml
View File

@ -448,6 +448,7 @@ profile:
flagsInfo: '將您的驕傲旗幟拖放到此框架中.'
flagsCustom: '上傳自定義旗幟'
flagsCustomWarning: '此旗幟由一名用戶上傳。pronouns.page團隊不為此負責'
flagsAsterisk: 'This is not a queer identity, but we include it for people who are queer in other ways (eg. straight trans people).' # TODO
links: '鏈接'
linksRecommended: '我們建議鏈接至'
# TODO

1
nuxt.config.js
View File

@ -195,6 +195,7 @@ export default {
LOCALE: config.locale,
LOCALES: locales,
FLAGS: buildFlags(),
FLAGS_ASTERISK: ['Heteroromantic', 'Heterosexual', 'Monoamorous', 'Monogamous'],
BUCKET: `https://${process.env.AWS_S3_BUCKET}.s3-${process.env.AWS_REGION}.amazonaws.com`,
CLOUDFRONT: `https://${process.env.AWS_CLOUDFRONT_ID}.cloudfront.net`,
STATS_FILE: process.env.STATS_FILE,

8
routes/profileEditor.vue
View File

@ -132,7 +132,12 @@
<T>profile.flagsInfo</T>
</p>
<ButtonList v-model="flags" :options="allFlags" v-slot="s">
<Flag :name="s.desc.split('|')[0]" :alt="s.desc.split('|')[1]" :img="`/flags/${s.v}.png`"/>
<Flag
:name="s.desc.split('|')[0]"
:alt="s.desc.split('|')[1]"
:img="`/flags/${s.v}.png`"
:asterisk="flagsAsterisk.includes(s.v)"
/>
</ButtonList>
<PropagateCheckbox field="flags" :before="beforeChanges.flags" :after="flags" v-if="otherProfiles > 0" @change="propagateChanged"/>
@ -310,6 +315,7 @@
from: maxBirthdate,
},
propagate: [],
flagsAsterisk: process.env.FLAGS_ASTERISK,
};
},
async asyncData({ app, store }) {