From cbc3f68008cf47ad04ee364e3cef72d7abe35939 Mon Sep 17 00:00:00 2001 From: jakub-tldr <78603704+jakub-tldr@users.noreply.github.com> Date: Wed, 14 Jan 2026 13:10:34 +0100 Subject: [PATCH 1/2] Remove outdated information --- src-tauri/src/tray.rs | 10 +++++----- src/i18n/en/index.ts | 2 +- src/i18n/fr/index.ts | 2 +- src/i18n/i18n-types.ts | 8 ++++---- .../client/pages/CarouselPage/cards/CarouselCards.tsx | 6 +++--- .../components/InfoCard/InfoCard.tsx | 10 +++++++--- src/shared/constants.ts | 3 ++- 7 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src-tauri/src/tray.rs b/src-tauri/src/tray.rs index de27923e..09225949 100644 --- a/src-tauri/src/tray.rs +++ b/src-tauri/src/tray.rs @@ -17,7 +17,7 @@ use crate::{ }; const SUBSCRIBE_UPDATES_LINK: &str = "https://defguard.net/newsletter"; -const JOIN_COMMUNITY_LINK: &str = "https://matrix.to/#/#defguard:teonite.com"; +const JOIN_COMMUNITY_LINK: &str = "https://github.com/DefGuard/defguard/discussions/new/choose"; const FOLLOW_US_LINK: &str = "https://floss.social/@defguard"; const MAIN_WINDOW_ID: &str = "main"; @@ -28,7 +28,7 @@ const TRAY_EVENT_QUIT: &str = "quit"; const TRAY_EVENT_SHOW: &str = "show"; const TRAY_EVENT_HIDE: &str = "hide"; const TRAY_EVENT_UPDATES: &str = "updates"; -const TRAY_EVENT_COMMINITY: &str = "community"; +const TRAY_EVENT_COMMUNITY: &str = "community"; const TRAY_EVENT_FOLLOW: &str = "follow"; /// Generate contents of system tray menu. @@ -46,8 +46,8 @@ async fn generate_tray_menu(app: &AppHandle) -> Result, Error )?; let join_community = MenuItem::with_id( app, - TRAY_EVENT_COMMINITY, - "Join our community", + TRAY_EVENT_COMMUNITY, + "Community support", true, None::<&str>, )?; @@ -208,7 +208,7 @@ pub fn handle_tray_menu_event(app: &AppHandle, event: MenuEvent) { TRAY_EVENT_UPDATES => { let _ = webbrowser::open(SUBSCRIBE_UPDATES_LINK); } - TRAY_EVENT_COMMINITY => { + TRAY_EVENT_COMMUNITY => { let _ = webbrowser::open(JOIN_COMMUNITY_LINK); } TRAY_EVENT_FOLLOW => { diff --git a/src/i18n/en/index.ts b/src/i18n/en/index.ts index 20b3c0e7..0c232a3c 100644 --- a/src/i18n/en/index.ts +++ b/src/i18n/en/index.ts @@ -144,7 +144,7 @@ If you are an admin/devops - all your customers (instances) and all their tunnel githubLink: `GitHub`, spreadWordText: `spreading the word about:`, defguard: `defguard!`, - joinMatrix: `join our Matrix server:`, + githubDiscussions: `If you encounter any issues with Defguard, you can reach out to our community for support via: `, supportUs: 'Support Us!', }, }, diff --git a/src/i18n/fr/index.ts b/src/i18n/fr/index.ts index 7b7aa7af..8231692e 100644 --- a/src/i18n/fr/index.ts +++ b/src/i18n/fr/index.ts @@ -135,7 +135,7 @@ Si vous êtes un administrateur/devops - tous vos clients (instances) et tous le githubLink: `GitHub`, spreadWordText: `En faisant passer le mot sur :`, defguard: `defguard !`, - joinMatrix: `En nous rejoignant sur notre serveur Matrix :`, + githubDiscussions: `Si vous rencontrez des problèmes avec Defguard, vous pouvez contacter notre communauté pour obtenir de l’aide via :`, supportUs: 'Soutenez-nous !', }, }, diff --git a/src/i18n/i18n-types.ts b/src/i18n/i18n-types.ts index a88a420e..d1011bfa 100644 --- a/src/i18n/i18n-types.ts +++ b/src/i18n/i18n-types.ts @@ -343,9 +343,9 @@ type RootTranslation = { */ defguard: string /** - * j​o​i​n​ ​o​u​r​ ​M​a​t​r​i​x​ ​s​e​r​v​e​r​: + * I​f​ ​y​o​u​ ​e​n​c​o​u​n​t​e​r​ ​a​n​y​ ​i​s​s​u​e​s​ ​w​i​t​h​ ​D​e​f​g​u​a​r​d​,​ ​y​o​u​ ​c​a​n​ ​r​e​a​c​h​ ​o​u​t​ ​t​o​ ​o​u​r​ ​c​o​m​m​u​n​i​t​y​ ​f​o​r​ ​s​u​p​p​o​r​t​ ​v​i​a​:​ */ - joinMatrix: string + githubDiscussions: string /** * S​u​p​p​o​r​t​ ​U​s​! */ @@ -2047,9 +2047,9 @@ export type TranslationFunctions = { */ defguard: () => LocalizedString /** - * join our Matrix server: + * If you encounter any issues with Defguard, you can reach out to our community for support via: */ - joinMatrix: () => LocalizedString + githubDiscussions: () => LocalizedString /** * Support Us! */ diff --git a/src/pages/client/pages/CarouselPage/cards/CarouselCards.tsx b/src/pages/client/pages/CarouselPage/cards/CarouselCards.tsx index 6f0968d2..e3f6f97b 100644 --- a/src/pages/client/pages/CarouselPage/cards/CarouselCards.tsx +++ b/src/pages/client/pages/CarouselPage/cards/CarouselCards.tsx @@ -7,7 +7,7 @@ import { useI18nContext } from '../../../../../i18n/i18n-react'; import { IconDefguard } from '../../../../../shared/components/icons/IconDefguard/IconDeguard'; import SvgDefguardLogoText from '../../../../../shared/components/svg/DefguardLogoText'; import { GitHubIcon } from '../../../../../shared/components/svg/GithubIcon'; -import { githubUrl, mastodonUrl, matrixUrl } from '../../../../../shared/constants'; +import { discussionsUrl, githubUrl, mastodonUrl } from '../../../../../shared/constants'; import { Button } from '../../../../../shared/defguard-ui/components/Layout/Button/Button'; import { ButtonSize, @@ -172,8 +172,8 @@ export const SupportSlide = () => { {localLL.defguard()}
  • - {localLL.joinMatrix()} - openLink(matrixUrl)}>{matrixUrl} + {localLL.githubDiscussions()} + openLink(discussionsUrl)}>{discussionsUrl}
    • diff --git a/src/pages/client/pages/ClientSettingsPage/components/InfoCard/InfoCard.tsx b/src/pages/client/pages/ClientSettingsPage/components/InfoCard/InfoCard.tsx index f3d46404..bb7fde19 100644 --- a/src/pages/client/pages/ClientSettingsPage/components/InfoCard/InfoCard.tsx +++ b/src/pages/client/pages/ClientSettingsPage/components/InfoCard/InfoCard.tsx @@ -2,7 +2,11 @@ import Markdown from 'react-markdown'; import { useI18nContext } from '../../../../../../i18n/i18n-react'; import { GitHubIcon } from '../../../../../../shared/components/svg/GithubIcon'; -import { githubUrl, mastodonUrl, matrixUrl } from '../../../../../../shared/constants'; +import { + discussionsUrl, + githubUrl, + mastodonUrl, +} from '../../../../../../shared/constants'; import { Button } from '../../../../../../shared/defguard-ui/components/Layout/Button/Button'; import { ButtonSize, @@ -73,8 +77,8 @@ export const InfoCard = () => { {supportLL.defguard()}
  • - {supportLL.joinMatrix()} - openLink(matrixUrl)}>{matrixUrl} + {supportLL.githubDiscussions()} + openLink(discussionsUrl)}>{discussionsUrl}
    • diff --git a/src/shared/constants.ts b/src/shared/constants.ts index 25182bef..8cb26e98 100644 --- a/src/shared/constants.ts +++ b/src/shared/constants.ts @@ -11,7 +11,8 @@ export const mastodonUrl = export const githubUrl = 'https://github.com/Defguard/defguard'; -export const matrixUrl = 'https://matrix.to/#/#defguard:teonite.com'; +export const discussionsUrl = + 'https://github.com/DefGuard/defguard/discussions/new/choose'; export const CLIENT_VERSION_HEADER = 'defguard-client-version'; From 3035c2f2f60f6f00d141c60a04fa6d02e24e20f1 Mon Sep 17 00:00:00 2001 From: jakub-tldr <78603704+jakub-tldr@users.noreply.github.com> Date: Wed, 14 Jan 2026 14:18:56 +0100 Subject: [PATCH 2/2] change description --- src/i18n/en/index.ts | 2 +- src/i18n/fr/index.ts | 2 +- src/i18n/i18n-types.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i18n/en/index.ts b/src/i18n/en/index.ts index 0c232a3c..aa0ade37 100644 --- a/src/i18n/en/index.ts +++ b/src/i18n/en/index.ts @@ -144,7 +144,7 @@ If you are an admin/devops - all your customers (instances) and all their tunnel githubLink: `GitHub`, spreadWordText: `spreading the word about:`, defguard: `defguard!`, - githubDiscussions: `If you encounter any issues with Defguard, you can reach out to our community for support via: `, + githubDiscussions: `Reach out to our community via `, supportUs: 'Support Us!', }, }, diff --git a/src/i18n/fr/index.ts b/src/i18n/fr/index.ts index 8231692e..51bf3260 100644 --- a/src/i18n/fr/index.ts +++ b/src/i18n/fr/index.ts @@ -135,7 +135,7 @@ Si vous êtes un administrateur/devops - tous vos clients (instances) et tous le githubLink: `GitHub`, spreadWordText: `En faisant passer le mot sur :`, defguard: `defguard !`, - githubDiscussions: `Si vous rencontrez des problèmes avec Defguard, vous pouvez contacter notre communauté pour obtenir de l’aide via :`, + githubDiscussions: `Contactez notre communauté via `, supportUs: 'Soutenez-nous !', }, }, diff --git a/src/i18n/i18n-types.ts b/src/i18n/i18n-types.ts index d1011bfa..0808669e 100644 --- a/src/i18n/i18n-types.ts +++ b/src/i18n/i18n-types.ts @@ -343,7 +343,7 @@ type RootTranslation = { */ defguard: string /** - * I​f​ ​y​o​u​ ​e​n​c​o​u​n​t​e​r​ ​a​n​y​ ​i​s​s​u​e​s​ ​w​i​t​h​ ​D​e​f​g​u​a​r​d​,​ ​y​o​u​ ​c​a​n​ ​r​e​a​c​h​ ​o​u​t​ ​t​o​ ​o​u​r​ ​c​o​m​m​u​n​i​t​y​ ​f​o​r​ ​s​u​p​p​o​r​t​ ​v​i​a​:​ + * R​e​a​c​h​ ​o​u​t​ ​t​o​ ​o​u​r​ ​c​o​m​m​u​n​i​t​y​ ​v​i​a​ */ githubDiscussions: string /** @@ -2047,7 +2047,7 @@ export type TranslationFunctions = { */ defguard: () => LocalizedString /** - * If you encounter any issues with Defguard, you can reach out to our community for support via: + * Reach out to our community via */ githubDiscussions: () => LocalizedString /**