fix git conflict (#25684)

RocketChat · May 30, 2022 · 713120e · 713120e
1 parent 62405c6
commit 713120e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -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",