From 8e268faee864ab5a12cd0c978a692b03e8c2f02a Mon Sep 17 00:00:00 2001
From: Andrea <andrea@avris.it>
Date: Sat, 7 May 2022 15:52:18 -0500
Subject: [PATCH] flags asterisk

---
 components/Flag.vue            | 17 ++++++++++++++---
 components/Profile.vue         |  7 +++++--
 locale/_base/translations.suml |  1 +
 locale/de/translations.suml    |  1 +
 locale/en/translations.suml    |  1 +
 locale/eo/translations.suml    |  1 +
 locale/es/translations.suml    |  1 +
 locale/fr/translations.suml    |  1 +
 locale/gl/translations.suml    |  1 +
 locale/it/translations.suml    |  1 +
 locale/ja/translations.suml    |  1 +
 locale/ko/translations.suml    |  1 +
 locale/lad/translations.suml   |  1 +
 locale/nl/translations.suml    |  1 +
 locale/no/translations.suml    |  1 +
 locale/pl/translations.suml    |  1 +
 locale/pt/translations.suml    |  1 +
 locale/ru/translations.suml    |  1 +
 locale/sv/translations.suml    |  1 +
 locale/ua/translations.suml    |  1 +
 locale/zh/translations.suml    |  1 +
 nuxt.config.js                 |  1 +
 routes/profileEditor.vue       |  8 +++++++-
 23 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/components/Flag.vue b/components/Flag.vue
index 5ecd84b8..17225f5f 100644
--- a/components/Flag.vue
+++ b/components/Flag.vue
@@ -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;
+                }
             }
         }
     }
diff --git a/components/Profile.vue b/components/Profile.vue
index 013c0ab2..9f3cb397 100644
--- a/components/Profile.vue
+++ b/components/Profile.vue
@@ -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() {
diff --git a/locale/_base/translations.suml b/locale/_base/translations.suml
index 9746bdd2..9dc6f3af 100644
--- a/locale/_base/translations.suml
+++ b/locale/_base/translations.suml
@@ -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:
diff --git a/locale/de/translations.suml b/locale/de/translations.suml
index 18b9c609..0b14e95a 100644
--- a/locale/de/translations.suml
+++ b/locale/de/translations.suml
@@ -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
diff --git a/locale/en/translations.suml b/locale/en/translations.suml
index 0ad3d50b..c71ca9a8 100644
--- a/locale/en/translations.suml
+++ b/locale/en/translations.suml
@@ -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:
diff --git a/locale/eo/translations.suml b/locale/eo/translations.suml
index 7c5a29a1..b6ab55e0 100644
--- a/locale/eo/translations.suml
+++ b/locale/eo/translations.suml
@@ -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
diff --git a/locale/es/translations.suml b/locale/es/translations.suml
index 524446b5..ddf98f03 100644
--- a/locale/es/translations.suml
+++ b/locale/es/translations.suml
@@ -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
diff --git a/locale/fr/translations.suml b/locale/fr/translations.suml
index b68da9f1..1dd2253f 100644
--- a/locale/fr/translations.suml
+++ b/locale/fr/translations.suml
@@ -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
diff --git a/locale/gl/translations.suml b/locale/gl/translations.suml
index 81027093..303afa5d 100644
--- a/locale/gl/translations.suml
+++ b/locale/gl/translations.suml
@@ -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
diff --git a/locale/it/translations.suml b/locale/it/translations.suml
index 7a4bf4a4..9d4c92e9 100644
--- a/locale/it/translations.suml
+++ b/locale/it/translations.suml
@@ -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
diff --git a/locale/ja/translations.suml b/locale/ja/translations.suml
index 94ed68d1..d19dacbe 100644
--- a/locale/ja/translations.suml
+++ b/locale/ja/translations.suml
@@ -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: 'にリンクすることをお勧めします。'
diff --git a/locale/ko/translations.suml b/locale/ko/translations.suml
index 8f5de60c..e6633aa4 100644
--- a/locale/ko/translations.suml
+++ b/locale/ko/translations.suml
@@ -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
diff --git a/locale/lad/translations.suml b/locale/lad/translations.suml
index 58071e5f..8b010dee 100644
--- a/locale/lad/translations.suml
+++ b/locale/lad/translations.suml
@@ -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'
diff --git a/locale/nl/translations.suml b/locale/nl/translations.suml
index 6e9f122a..a79f9f22 100644
--- a/locale/nl/translations.suml
+++ b/locale/nl/translations.suml
@@ -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
diff --git a/locale/no/translations.suml b/locale/no/translations.suml
index 2d63a670..c65cf165 100644
--- a/locale/no/translations.suml
+++ b/locale/no/translations.suml
@@ -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
diff --git a/locale/pl/translations.suml b/locale/pl/translations.suml
index 67adda1a..a65856bf 100644
--- a/locale/pl/translations.suml
+++ b/locale/pl/translations.suml
@@ -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:
diff --git a/locale/pt/translations.suml b/locale/pt/translations.suml
index 02de27a6..ca6d9b39 100644
--- a/locale/pt/translations.suml
+++ b/locale/pt/translations.suml
@@ -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
diff --git a/locale/ru/translations.suml b/locale/ru/translations.suml
index f76fcf6f..7e85ad89 100644
--- a/locale/ru/translations.suml
+++ b/locale/ru/translations.suml
@@ -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
diff --git a/locale/sv/translations.suml b/locale/sv/translations.suml
index 957cbb35..97b353a9 100644
--- a/locale/sv/translations.suml
+++ b/locale/sv/translations.suml
@@ -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'
 
diff --git a/locale/ua/translations.suml b/locale/ua/translations.suml
index 18d5b219..626a1ccb 100644
--- a/locale/ua/translations.suml
+++ b/locale/ua/translations.suml
@@ -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
diff --git a/locale/zh/translations.suml b/locale/zh/translations.suml
index 22045544..ba4a7d3e 100644
--- a/locale/zh/translations.suml
+++ b/locale/zh/translations.suml
@@ -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
diff --git a/nuxt.config.js b/nuxt.config.js
index eb731a62..e4fec5cc 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -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,
diff --git a/routes/profileEditor.vue b/routes/profileEditor.vue
index 4a1c24e9..8b580fe2 100644
--- a/routes/profileEditor.vue
+++ b/routes/profileEditor.vue
@@ -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 }) {