diff --git a/apps/meteor/app/file-upload/server/lib/FileUpload.ts b/apps/meteor/app/file-upload/server/lib/FileUpload.ts index 9864bd4a4bd6..51c66841b246 100644 --- a/apps/meteor/app/file-upload/server/lib/FileUpload.ts +++ b/apps/meteor/app/file-upload/server/lib/FileUpload.ts @@ -562,7 +562,23 @@ export const FileUpload = { ) { res.setHeader('Content-Disposition', `${forceDownload ? 'attachment' : 'inline'}; filename="${encodeURI(fileName)}"`); - request.get(fileUrl, (fileRes) => fileRes.pipe(res)); + request.get(fileUrl, (fileRes) => { + let status = fileRes.statusCode; + if (status !== 200) { + res.setHeader('x-debug-status', status); + res.setHeader('x-debug-url', fileUrl); + res.setHeader('content-length', 0); + res.writeHead(404) + return; + } + + let contentType = fileRes.headers['content-type'], + contentLength = fileRes.headers['content-length']; + if (contentType) { res.setHeader('content-type', contentType) }; + if (contentLength) { res.setHeader('content-length', contentLength) }; + + fileRes.pipe(res); + }); }, generateJWTToFileUrls({ rid, userId, fileId }: { rid: string; userId: string; fileId: string }) { diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index cf4267c34713..fcd02720c221 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -5741,7 +5741,7 @@ "registration.component.login.incorrectPassword": "Incorrect password", "registration.component.switchLanguage": "Switch to <1>en", "registration.component.resetPassword": "Reset password", - "registration.component.form.emailOrUsername": "Email or username", + "registration.component.form.emailOrUsername": "Email address", "registration.component.form.username": "Username", "registration.component.form.name": "Name", "registration.component.form.nameOptional": "Name optional", diff --git a/packages/web-ui-registration/src/components/RegisterTitle.tsx b/packages/web-ui-registration/src/components/RegisterTitle.tsx index e00e010fd674..00def5ac58fd 100644 --- a/packages/web-ui-registration/src/components/RegisterTitle.tsx +++ b/packages/web-ui-registration/src/components/RegisterTitle.tsx @@ -1,13 +1,18 @@ import { useSetting } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; -import { Trans } from 'react-i18next'; export const RegisterTitle = (): ReactElement | null => { - const siteName = useSetting('Site_Name'); const hideTitle = useSetting('Layout_Login_Hide_Title'); if (hideTitle) { return null; } - return Welcome to {siteName} workspace; + + return( + <> + Seeking Alpha +
+ Investing Groups + + ); };