Merge pull request #1639 from ajnart/fix-flags

src/pages/onboard.tsx

@@ -119,8 +119,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
         },
       };
     }
-
-    Consola.info(`Database at '${rawDatabaseUrl}' is writeable and mounted`);
+    Consola.info('Database is writeable');
   }
 
   return {

src/pages/user/preferences.tsx

@@ -11,7 +11,6 @@ import {
 } from '@mantine/core';
 import { createFormContext } from '@mantine/form';
 import { IconArrowLeft } from '@tabler/icons-react';
-import { changeLanguage } from 'i18next';
 import { GetServerSideProps } from 'next';
 import { useTranslation } from 'next-i18next';
 import Head from 'next/head';
@@ -74,6 +73,7 @@ const SettingsComponent = ({
     label: language.originalName,
     description: language.translatedName,
     value: language.shortName,
+    country: language.country,
   }));
 
   const { t, i18n } = useTranslation(['user/preferences', 'common']);

src/tools/language.ts

@@ -6,7 +6,7 @@ export type Language = {
   /**
    * https://www.iso.org/obp/ui/#search
    */
-
+  country: string;
   locale: string;
 };
 
@@ -15,6 +15,7 @@ export const languages = [
     shortName: 'en',
     originalName: 'English',
     translatedName: 'English',
+    country: 'GB',
     locale: 'en-gb',
   },
   {
@@ -22,161 +23,188 @@ export const languages = [
     originalName: 'Crowdin',
     translatedName: '(Live translation)',
     locale: 'cr',
+    country: 'CROWDIN',
   },
   {
     shortName: 'fr',
     originalName: 'Français',
     translatedName: 'French',
+    country: 'FR',
     locale: 'fr',
   },
   {
     shortName: 'cn',
     originalName: '中文',
     translatedName: 'Chinese (Simplified)',
+    country: 'CN',
     locale: 'zh-cn',
   },
   {
     shortName: 'cs',
     originalName: 'Čeština',
     translatedName: 'Czech',
+    country: 'CZ',
     locale: 'cs',
   },
   {
     shortName: 'da',
     originalName: 'Dansk',
     translatedName: 'Danish',
+    country: 'DK',
     locale: 'da',
   },
   {
     shortName: 'de',
     originalName: 'Deutsch',
     translatedName: 'German',
+    country: 'DE',
     locale: 'de',
   },
   {
+    shortName: 'el',
     originalName: 'Ελληνικά',
     translatedName: 'Greek',
-    shortName: 'el',
+    country: 'GR',
     locale: 'el',
   },
   {
     shortName: 'es',
     originalName: 'Español',
     translatedName: 'Spanish',
+    country: 'ES',
     locale: 'es',
   },
   {
     shortName: 'he',
     originalName: 'עברית',
     translatedName: 'Hebrew',
+    country: 'IL',
     locale: 'he',
   },
   {
     shortName: 'hr',
     originalName: 'Hrvatski',
     translatedName: 'Croatian',
+    country: 'HR',
     locale: 'hr',
   },
   {
     shortName: 'hu',
     originalName: 'Magyar',
     translatedName: 'Hungarian',
+    country: 'HU',
     locale: 'hu',
   },
   {
     shortName: 'it',
     originalName: 'Italiano',
     translatedName: 'Italian',
+    country: 'IT',
     locale: 'it',
   },
   {
     shortName: 'ja',
     originalName: '日本語',
     translatedName: 'Japanese',
+    country: 'JP',
     locale: 'ja',
   },
   {
     shortName: 'ko',
     originalName: '한국어',
     translatedName: 'Korean',
+    country: 'KR',
     locale: 'ko',
   },
   {
     shortName: 'lv',
     originalName: 'Latvian',
     translatedName: 'Latvian',
+    country: 'LV',
     locale: 'lv',
   },
   {
     shortName: 'nl',
     originalName: 'Nederlands',
     translatedName: 'Dutch',
+    country: 'NL',
     locale: 'nl',
   },
   {
     shortName: 'no',
     originalName: 'Norsk',
     translatedName: 'Norwegian',
+    country: 'NO',
     locale: 'no',
   },
   {
     shortName: 'pl',
     originalName: 'Polski',
     translatedName: 'Polish',
+    country: 'PL',
     locale: 'pl',
   },
   {
     shortName: 'pt',
     originalName: 'Português',
     translatedName: 'Portuguese',
+    country: 'PT',
     locale: 'pt',
   },
   {
     shortName: 'ru',
     originalName: 'Русский',
     translatedName: 'Russian',
+    country: 'RU',
     locale: 'ru',
   },
   {
     shortName: 'sk',
     originalName: 'Slovenčina',
     translatedName: 'Slovak',
+    country: 'SK',
     locale: 'sk',
   },
   {
     shortName: 'sl',
     originalName: 'Slovenščina',
     translatedName: 'Slovenian',
+    country: 'SI',
     locale: 'sl',
   },
   {
     shortName: 'sv',
     originalName: 'Svenska',
     translatedName: 'Swedish',
+    country: 'SE',
     locale: 'sv',
   },
   {
     shortName: 'tr',
     originalName: 'Türkçe',
     translatedName: 'Turkish',
+    country: 'TR',
     locale: 'tr',
   },
   {
     shortName: 'tw',
     originalName: '中文',
     translatedName: 'Chinese (Traditional)',
+    country: 'TW',
     locale: 'zh-tw',
   },
   {
     shortName: 'uk',
     originalName: 'Українська',
     translatedName: 'Ukrainian',
+    country: 'UA',
     locale: 'uk',
   },
   {
     shortName: 'vi',
     originalName: 'Tiếng Việt',
     translatedName: 'Vietnamese',
+    country: 'VN',
     locale: 'vi',
   },
 ] as const satisfies Readonly<Language[]>;