diff --git a/external/lang b/external/lang index 8a9c21da8527b9609404ad64205f6b876c9f53d2..0da16a539dc35a0050119e1a239bd0b31eb7b962 160000 --- a/external/lang +++ b/external/lang @@ -1 +1 @@ -Subproject commit 8a9c21da8527b9609404ad64205f6b876c9f53d2 +Subproject commit 0da16a539dc35a0050119e1a239bd0b31eb7b962 diff --git a/src/context/Locale.tsx b/src/context/Locale.tsx index 5366027a528b4365c205e591974a7487a0467492..c06b701800c452d09b9390bbe92ac46f26a27912 100644 --- a/src/context/Locale.tsx +++ b/src/context/Locale.tsx @@ -32,6 +32,7 @@ export enum Language { CROATIAN = "hr", HUNGARIAN = "hu", INDONESIAN = "id", + ITALIAN = "it", LITHUANIAN = "lt", MACEDONIAN = "mk", DUTCH = "nl", @@ -41,6 +42,7 @@ export enum Language { RUSSIAN = "ru", SERBIAN = "sr", SWEDISH = "sv", + TOKIPONA = "tokipona", TURKISH = "tr", UKRANIAN = "uk", CHINESE_SIMPLIFIED = "zh_Hans", @@ -80,6 +82,7 @@ export const Languages: { [key in Language]: LanguageEntry } = { hr: { display: "Hrvatski", emoji: "ðŸ‡ðŸ‡·", i18n: "hr" }, hu: { display: "magyar", emoji: "ðŸ‡ðŸ‡º", i18n: "hu" }, id: { display: "bahasa Indonesia", emoji: "🇮🇩", i18n: "id" }, + it: { display: "italiano", emoji: "🇮🇹", i18n: "it" }, lt: { display: "Lietuvių", emoji: "🇱🇹", i18n: "lt" }, mk: { display: "МакедонÑки", emoji: "🇲🇰", i18n: "mk" }, nl: { display: "Nederlands", emoji: "🇳🇱", i18n: "nl" }, @@ -94,6 +97,12 @@ export const Languages: { [key in Language]: LanguageEntry } = { ru: { display: "РуÑÑкий", emoji: "🇷🇺", i18n: "ru" }, sr: { display: "СрпÑки", emoji: "🇷🇸", i18n: "sr" }, sv: { display: "Svenska", emoji: "🇸🇪", i18n: "sv" }, + tokipona: { + display: "Toki Pona", + emoji: "🙂", + i18n: "tokipona", + dayjs: "en-gb", + }, tr: { display: "Türkçe", emoji: "🇹🇷", i18n: "tr" }, uk: { display: "УкраїнÑька", emoji: "🇺🇦", i18n: "uk" }, zh_Hans: { diff --git a/src/pages/login/forms/FormLogin.tsx b/src/pages/login/forms/FormLogin.tsx index a2c75d623cdcd9bcf41f98c62bfa260806170e59..b7d47fd2c82c2081d1aaa83877a478275c7cf4de 100644 --- a/src/pages/login/forms/FormLogin.tsx +++ b/src/pages/login/forms/FormLogin.tsx @@ -19,7 +19,11 @@ export function FormLogin() { let device_name; if (browser) { const { name, os } = browser; - device_name = `${name} on ${os}`; + if (window.isNative) { + device_name = `Revolt Desktop on ${os}`; + } else { + device_name = `${name} on ${os}`; + } } else { device_name = "Unknown Device"; } diff --git a/src/pages/settings/panes/Account.tsx b/src/pages/settings/panes/Account.tsx index 1b8aac17bc3d8c72ed2d19eb53ad162ccdf6bfcd..b9d5fcd6a7f9b378d5b4b35354ed6d7947295871 100644 --- a/src/pages/settings/panes/Account.tsx +++ b/src/pages/settings/panes/Account.tsx @@ -61,7 +61,10 @@ export const Account = observer(() => { <div className={styles.userDetail}> @{client.user!.username} <div className={styles.userid}> - <Tooltip content={<Text id="app.settings.pages.account.unique_id" />}> + <Tooltip + content={ + <Text id="app.settings.pages.account.unique_id" /> + }> <HelpCircle size={16} /> </Tooltip> <Tooltip content={<Text id="app.special.copy" />}> @@ -89,7 +92,15 @@ export const Account = observer(() => { <div className={styles.entry}> {field === "email" ? ( revealEmail ? ( - value + <> + {value}{" "} + <a + onClick={() => + setRevealEmail(false) + }> + <Text id="app.special.modals.actions.hide" /> + </a> + </> ) : ( <> •••••••••••@{value.split("@").pop()}{" "} diff --git a/src/pages/settings/panes/Sessions.tsx b/src/pages/settings/panes/Sessions.tsx index ee7125445610fd898b6d252e333e63dab8b298d7..f615cca07834108d29d7ee25cd891015e32a7916 100644 --- a/src/pages/settings/panes/Sessions.tsx +++ b/src/pages/settings/panes/Sessions.tsx @@ -1,5 +1,5 @@ import { Chrome, Android, Apple, Windows } from "@styled-icons/boxicons-logos"; -import { HelpCircle } from "@styled-icons/boxicons-regular"; +import { HelpCircle, Desktop } from "@styled-icons/boxicons-regular"; import { Safari, Firefoxbrowser, @@ -73,6 +73,8 @@ export function Sessions() { return <Microsoftedge size={32} />; case /opera/i.test(name): return <Opera size={32} />; + case /desktop/i.test(name): + return <Desktop size={32} />; default: return <HelpCircle size={32} />; }