diff --git a/locales/en/app.json b/locales/en/app.json index d80a8502..6e42e511 100644 --- a/locales/en/app.json +++ b/locales/en/app.json @@ -142,9 +142,9 @@ "rageshake_sending": "Sending…", "rageshake_sending_logs": "Sending debug logs…", "rageshake_sent": "Thanks!", - "recaptcha_caption": "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy and <6>Terms of Service apply.<9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)", "recaptcha_dismissed": "Recaptcha dismissed", "recaptcha_not_loaded": "Recaptcha not loaded", + "recaptcha_ssla_caption": "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy and <6>Terms of Service apply.<9>By clicking \"Register\", you agree to our <12>Software and Services License Agreement (SSLA)", "register": { "passwords_must_match": "Passwords must match", "registering": "Registering…" @@ -154,7 +154,7 @@ "register_heading": "Create your account", "return_home_button": "Return to home screen", "room_auth_view_continue_button": "Continue", - "room_auth_view_eula_caption": "By clicking \"Continue\", you agree to our <2>End User Licensing Agreement (EULA)", + "room_auth_view_ssla_caption": "By clicking \"Join call now\", you agree to our <2>Software and Services License Agreement (SSLA)", "screenshare_button_label": "Share screen", "settings": { "audio_tab": { @@ -200,8 +200,8 @@ "submitting": "Submitting…", "switch_camera": "Switch camera", "unauthenticated_view_body": "Not registered yet? <2>Create an account", - "unauthenticated_view_eula_caption": "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)", "unauthenticated_view_login_button": "Login to your account", + "unauthenticated_view_ssla_caption": "By clicking \"Go\", you agree to our <2>Software and Services License Agreement (SSLA)", "unmute_microphone_button_label": "Unmute microphone", "version": "{{productName}} version: {{version}}", "video_tile": { diff --git a/src/auth/RegisterPage.tsx b/src/auth/RegisterPage.tsx index b82afd5a..3cc3f79b 100644 --- a/src/auth/RegisterPage.tsx +++ b/src/auth/RegisterPage.tsx @@ -204,7 +204,7 @@ export const RegisterPage: FC = () => { /> - + This site is protected by ReCAPTCHA and the Google{" "} Privacy Policy @@ -216,8 +216,9 @@ export const RegisterPage: FC = () => { apply.
By clicking "Register", you agree to our{" "} - - End User Licensing Agreement (EULA) + {/* if the deprecated eula field is setup we still show it. */} + + Software and Services License Agreement (SSLA)
diff --git a/src/config/ConfigOptions.ts b/src/config/ConfigOptions.ts index 87551986..ae00d3dc 100644 --- a/src/config/ConfigOptions.ts +++ b/src/config/ConfigOptions.ts @@ -77,10 +77,16 @@ export interface ConfigOptions { }; /** - * A link to the end-user license agreement (EULA) + * A link to the software and services license agreement (SSLA) + * @deprecated renamed to ssla */ eula?: string; + /** + * A link to the software and services license agreement (SSLA) + */ + ssla?: string; + media_devices?: { /** * Defines whether participants should start with audio enabled by default. @@ -134,7 +140,7 @@ export interface ResolvedConfigOptions extends ConfigOptions { server_name: string; }; }; - eula: string; + ssla: string; media_devices: { enable_audio: boolean; enable_video: boolean; @@ -152,7 +158,7 @@ export const DEFAULT_CONFIG: ResolvedConfigOptions = { features: { feature_use_device_session_member_events: true, }, - eula: "https://static.element.io/legal/online-EULA.pdf", + ssla: " https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf", media_devices: { enable_audio: true, enable_video: true, diff --git a/src/home/UnauthenticatedView.tsx b/src/home/UnauthenticatedView.tsx index d84d2309..922acc12 100644 --- a/src/home/UnauthenticatedView.tsx +++ b/src/home/UnauthenticatedView.tsx @@ -185,10 +185,11 @@ export const UnauthenticatedView: FC = () => { )} - + By clicking "Go", you agree to our{" "} - - End User Licensing Agreement (EULA) + {/* if the deprecated eula field is setup we still show it. */} + + Software and Services License Agreement (SSLA) diff --git a/src/room/RoomAuthView.tsx b/src/room/RoomAuthView.tsx index 645bd18b..04e886a7 100644 --- a/src/room/RoomAuthView.tsx +++ b/src/room/RoomAuthView.tsx @@ -80,10 +80,11 @@ export const RoomAuthView: FC = () => { /> - + By clicking "Join call now", you agree to our{" "} - - End User Licensing Agreement (EULA) + {/* if the deprecated eula field is setup we still show it. */} + + Software and Services License Agreement (SSLA)