From 38fe8df228400a5dcd02c429f3519be74e15fa51 Mon Sep 17 00:00:00 2001 From: William Oldham Date: Thu, 4 Jan 2024 20:43:05 +0000 Subject: [PATCH 1/3] Move flags into flag directory --- public/{ => flags}/skull.svg | 0 public/{ => flags}/tokiPona.svg | 0 src/components/FlagIcon.tsx | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename public/{ => flags}/skull.svg (100%) rename public/{ => flags}/tokiPona.svg (100%) diff --git a/public/skull.svg b/public/flags/skull.svg similarity index 100% rename from public/skull.svg rename to public/flags/skull.svg diff --git a/public/tokiPona.svg b/public/flags/tokiPona.svg similarity index 100% rename from public/tokiPona.svg rename to public/flags/tokiPona.svg diff --git a/src/components/FlagIcon.tsx b/src/components/FlagIcon.tsx index fbc3dae2..4adb8b46 100644 --- a/src/components/FlagIcon.tsx +++ b/src/components/FlagIcon.tsx @@ -15,14 +15,14 @@ export function FlagIcon(props: FlagIconProps) { if (props.langCode === "tok") return (
- +
); if (props.langCode === "pirate") return (
- +
); From d1fb06c0e8d9b8547e782677a598315316b5263f Mon Sep 17 00:00:00 2001 From: William Oldham Date: Thu, 4 Jan 2024 20:43:22 +0000 Subject: [PATCH 2/3] en-US shouldn't have the British flag... --- src/utils/language.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/language.ts b/src/utils/language.ts index f9f47250..ad784c20 100644 --- a/src/utils/language.ts +++ b/src/utils/language.ts @@ -8,7 +8,7 @@ const languageOrder = ["en", "hi", "fr", "de", "nl", "pt"]; // This mapping purely exists to prioritize a country over another in languages. // iso639_1 -> iso3166 Alpha-2 const countryPriority: Record = { - en: "gb", + en: "us", nl: "nl", fr: "fr", de: "de", From d0ef78020aa1e7778565f12f908b4caac2582580 Mon Sep 17 00:00:00 2001 From: William Oldham Date: Thu, 4 Jan 2024 20:44:11 +0000 Subject: [PATCH 3/3] Add Galician Flag --- public/flags/galicia.svg | 199 ++++++++++++++++++++++++++++++++++++ src/components/FlagIcon.tsx | 8 ++ src/utils/language.ts | 1 - 3 files changed, 207 insertions(+), 1 deletion(-) create mode 100644 public/flags/galicia.svg diff --git a/public/flags/galicia.svg b/public/flags/galicia.svg new file mode 100644 index 00000000..2eb27952 --- /dev/null +++ b/public/flags/galicia.svg @@ -0,0 +1,199 @@ + + + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/FlagIcon.tsx b/src/components/FlagIcon.tsx index 4adb8b46..5546aaad 100644 --- a/src/components/FlagIcon.tsx +++ b/src/components/FlagIcon.tsx @@ -37,6 +37,14 @@ export function FlagIcon(props: FlagIconProps) { ); + // Galicia - Not a country (Is a region of Spain) so have to add the flag manually + if (props.langCode === "gl-ES") + return ( +
+ +
+ ); + let backgroundClass = "bg-video-context-flagBg"; if (countryCode === "np") backgroundClass = "bg-white"; diff --git a/src/utils/language.ts b/src/utils/language.ts index ad784c20..5f05113c 100644 --- a/src/utils/language.ts +++ b/src/utils/language.ts @@ -18,7 +18,6 @@ const countryPriority: Record = { zh: "cn", ko: "kr", ta: "lk", - gl: "es", }; // list of iso639_1 Alpha-2 codes used as default languages