Rename EULA to SSLA (#3135)

* Change EULA to SSLA
 - rename i18n fields
 - update the config property to `ssla` and deprecate `eula`
 - use `eula` instead of ssla in case it is provided in the config.

* fix default config

* completely remove eula fallback
This commit is contained in:
Timo
2025-03-31 14:18:45 +02:00
committed by GitHub
parent 9f2f1d8641
commit 2073cd3ac1
7 changed files with 18 additions and 18 deletions

View File

@@ -11,5 +11,5 @@
"features": { "features": {
"feature_use_device_session_member_events": true "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"
} }

View File

@@ -11,5 +11,5 @@
"features": { "features": {
"feature_use_device_session_member_events": true "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"
} }

View File

@@ -144,9 +144,9 @@
"rageshake_sending": "Sending…", "rageshake_sending": "Sending…",
"rageshake_sending_logs": "Sending debug logs…", "rageshake_sending_logs": "Sending debug logs…",
"rageshake_sent": "Thanks!", "rageshake_sent": "Thanks!",
"recaptcha_caption": "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>End User Licensing Agreement (EULA)</12>",
"recaptcha_dismissed": "Recaptcha dismissed", "recaptcha_dismissed": "Recaptcha dismissed",
"recaptcha_not_loaded": "Recaptcha not loaded", "recaptcha_not_loaded": "Recaptcha not loaded",
"recaptcha_ssla_caption": "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Software and Services License Agreement (SSLA)</12>",
"register": { "register": {
"passwords_must_match": "Passwords must match", "passwords_must_match": "Passwords must match",
"registering": "Registering…" "registering": "Registering…"
@@ -156,7 +156,7 @@
"register_heading": "Create your account", "register_heading": "Create your account",
"return_home_button": "Return to home screen", "return_home_button": "Return to home screen",
"room_auth_view_continue_button": "Continue", "room_auth_view_continue_button": "Continue",
"room_auth_view_eula_caption": "By clicking \"Continue\", you agree to our <2>End User Licensing Agreement (EULA)</2>", "room_auth_view_ssla_caption": "By clicking \"Join call now\", you agree to our <2>Software and Services License Agreement (SSLA)</2>",
"screenshare_button_label": "Share screen", "screenshare_button_label": "Share screen",
"settings": { "settings": {
"audio_tab": { "audio_tab": {
@@ -202,8 +202,8 @@
"submitting": "Submitting…", "submitting": "Submitting…",
"switch_camera": "Switch camera", "switch_camera": "Switch camera",
"unauthenticated_view_body": "Not registered yet? <2>Create an account</2>", "unauthenticated_view_body": "Not registered yet? <2>Create an account</2>",
"unauthenticated_view_eula_caption": "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>",
"unauthenticated_view_login_button": "Login to your account", "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)</2>",
"unmute_microphone_button_label": "Unmute microphone", "unmute_microphone_button_label": "Unmute microphone",
"version": "{{productName}} version: {{version}}", "version": "{{productName}} version: {{version}}",
"video_tile": { "video_tile": {

View File

@@ -204,7 +204,7 @@ export const RegisterPage: FC = () => {
/> />
</FieldRow> </FieldRow>
<Text size="sm"> <Text size="sm">
<Trans i18nKey="recaptcha_caption"> <Trans i18nKey="recaptcha_ssla_caption">
This site is protected by ReCAPTCHA and the Google{" "} This site is protected by ReCAPTCHA and the Google{" "}
<ExternalLink href="https://www.google.com/policies/privacy/"> <ExternalLink href="https://www.google.com/policies/privacy/">
Privacy Policy Privacy Policy
@@ -216,8 +216,8 @@ export const RegisterPage: FC = () => {
apply. apply.
<br /> <br />
By clicking "Register", you agree to our{" "} By clicking "Register", you agree to our{" "}
<ExternalLink href={Config.get().eula}> <ExternalLink href={Config.get().ssla}>
End User Licensing Agreement (EULA) Software and Services License Agreement (SSLA)
</ExternalLink> </ExternalLink>
</Trans> </Trans>
</Text> </Text>

View File

@@ -77,9 +77,9 @@ export interface ConfigOptions {
}; };
/** /**
* A link to the end-user license agreement (EULA) * A link to the software and services license agreement (SSLA)
*/ */
eula?: string; ssla?: string;
media_devices?: { media_devices?: {
/** /**
@@ -134,7 +134,7 @@ export interface ResolvedConfigOptions extends ConfigOptions {
server_name: string; server_name: string;
}; };
}; };
eula: string; ssla: string;
media_devices: { media_devices: {
enable_audio: boolean; enable_audio: boolean;
enable_video: boolean; enable_video: boolean;
@@ -152,7 +152,7 @@ export const DEFAULT_CONFIG: ResolvedConfigOptions = {
features: { features: {
feature_use_device_session_member_events: true, 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: { media_devices: {
enable_audio: true, enable_audio: true,
enable_video: true, enable_video: true,

View File

@@ -185,10 +185,10 @@ export const UnauthenticatedView: FC = () => {
</Text> </Text>
)} )}
<Text size="sm" className={styles.notice}> <Text size="sm" className={styles.notice}>
<Trans i18nKey="unauthenticated_view_eula_caption"> <Trans i18nKey="unauthenticated_view_ssla_caption">
By clicking "Go", you agree to our{" "} By clicking "Go", you agree to our{" "}
<ExternalLink href={Config.get().eula}> <ExternalLink href={Config.get().ssla}>
End User Licensing Agreement (EULA) Software and Services License Agreement (SSLA)
</ExternalLink> </ExternalLink>
</Trans> </Trans>
</Text> </Text>

View File

@@ -80,10 +80,10 @@ export const RoomAuthView: FC = () => {
/> />
</FieldRow> </FieldRow>
<Text size="sm"> <Text size="sm">
<Trans i18nKey="room_auth_view_eula_caption"> <Trans i18nKey="room_auth_view_ssla_caption">
By clicking "Join call now", you agree to our{" "} By clicking "Join call now", you agree to our{" "}
<ExternalLink href={Config.get().eula}> <ExternalLink href={Config.get().ssla}>
End User Licensing Agreement (EULA) Software and Services License Agreement (SSLA)
</ExternalLink> </ExternalLink>
</Trans> </Trans>
</Text> </Text>