From 713120eb1d6a15613867028eadd03f5e49b8e05f Mon Sep 17 00:00:00 2001 From: Carlos Rodrigues Date: Mon, 30 May 2022 17:59:57 -0300 Subject: [PATCH] fix git conflict (#25684) --- apps/meteor/app/federation-v2/server/settings.ts | 2 ++ apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/apps/meteor/app/federation-v2/server/settings.ts b/apps/meteor/app/federation-v2/server/settings.ts index 3be8a336af90..f10264a3ea37 100644 --- a/apps/meteor/app/federation-v2/server/settings.ts +++ b/apps/meteor/app/federation-v2/server/settings.ts @@ -44,12 +44,14 @@ settingsRegistry.addGroup('Federation', function () { type: 'string', i18nLabel: 'Federation_Matrix_homeserver_url', i18nDescription: 'Federation_Matrix_homeserver_url_desc', + alert: 'Federation_Matrix_homeserver_url_alert', }); this.add('Federation_Matrix_homeserver_domain', 'local.rocket.chat', { type: 'string', i18nLabel: 'Federation_Matrix_homeserver_domain', i18nDescription: 'Federation_Matrix_homeserver_domain_desc', + alert: 'Federation_Matrix_homeserver_domain_alert', }); this.add('Federation_Matrix_bridge_url', 'http://host.docker.internal:3300', { diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index 8de95b3caae6..3b2158bfdbdb 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1989,8 +1989,10 @@ "Federation_Matrix_hs_token": "Homeserver Token", "Federation_Matrix_as_token": "AppService Token", "Federation_Matrix_homeserver_url": "Homeserver URL", + "Federation_Matrix_homeserver_url_alert": "We recommend a new, empty homeserver, to use with our federation", "Federation_Matrix_homeserver_domain": "Homeserver Domain", "Federation_Matrix_only_owners_can_invite_users": "Only owners can invite users", + "Federation_Matrix_homeserver_domain_alert": "No user should connect to the homeserver with third party clients, only Rocket.Chat", "Federation_Matrix_bridge_url": "Bridge URL", "Federation_Matrix_bridge_localpart": "AppService User Localpart", "Federation_Matrix_registration_file": "Registration File",