Skip to content

Commit 2073cd3

Browse files
authored
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
1 parent 9f2f1d8 commit 2073cd3

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

config/config.devenv.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
"features": {
1212
"feature_use_device_session_member_events": true
1313
},
14-
"eula": "https://static.element.io/legal/online-EULA.pdf"
14+
"ssla": "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf"
1515
}

config/config.sample.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
"features": {
1212
"feature_use_device_session_member_events": true
1313
},
14-
"eula": "https://static.element.io/legal/online-EULA.pdf"
14+
"ssla": "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf"
1515
}

locales/en/app.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@
144144
"rageshake_sending": "Sending…",
145145
"rageshake_sending_logs": "Sending debug logs…",
146146
"rageshake_sent": "Thanks!",
147-
"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>",
148147
"recaptcha_dismissed": "Recaptcha dismissed",
149148
"recaptcha_not_loaded": "Recaptcha not loaded",
149+
"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>",
150150
"register": {
151151
"passwords_must_match": "Passwords must match",
152152
"registering": "Registering…"
@@ -156,7 +156,7 @@
156156
"register_heading": "Create your account",
157157
"return_home_button": "Return to home screen",
158158
"room_auth_view_continue_button": "Continue",
159-
"room_auth_view_eula_caption": "By clicking \"Continue\", you agree to our <2>End User Licensing Agreement (EULA)</2>",
159+
"room_auth_view_ssla_caption": "By clicking \"Join call now\", you agree to our <2>Software and Services License Agreement (SSLA)</2>",
160160
"screenshare_button_label": "Share screen",
161161
"settings": {
162162
"audio_tab": {
@@ -202,8 +202,8 @@
202202
"submitting": "Submitting…",
203203
"switch_camera": "Switch camera",
204204
"unauthenticated_view_body": "Not registered yet? <2>Create an account</2>",
205-
"unauthenticated_view_eula_caption": "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>",
206205
"unauthenticated_view_login_button": "Login to your account",
206+
"unauthenticated_view_ssla_caption": "By clicking \"Go\", you agree to our <2>Software and Services License Agreement (SSLA)</2>",
207207
"unmute_microphone_button_label": "Unmute microphone",
208208
"version": "{{productName}} version: {{version}}",
209209
"video_tile": {

src/auth/RegisterPage.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ export const RegisterPage: FC = () => {
204204
/>
205205
</FieldRow>
206206
<Text size="sm">
207-
<Trans i18nKey="recaptcha_caption">
207+
<Trans i18nKey="recaptcha_ssla_caption">
208208
This site is protected by ReCAPTCHA and the Google{" "}
209209
<ExternalLink href="https://www.google.com/policies/privacy/">
210210
Privacy Policy
@@ -216,8 +216,8 @@ export const RegisterPage: FC = () => {
216216
apply.
217217
<br />
218218
By clicking "Register", you agree to our{" "}
219-
<ExternalLink href={Config.get().eula}>
220-
End User Licensing Agreement (EULA)
219+
<ExternalLink href={Config.get().ssla}>
220+
Software and Services License Agreement (SSLA)
221221
</ExternalLink>
222222
</Trans>
223223
</Text>

src/config/ConfigOptions.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ export interface ConfigOptions {
7777
};
7878

7979
/**
80-
* A link to the end-user license agreement (EULA)
80+
* A link to the software and services license agreement (SSLA)
8181
*/
82-
eula?: string;
82+
ssla?: string;
8383

8484
media_devices?: {
8585
/**
@@ -134,7 +134,7 @@ export interface ResolvedConfigOptions extends ConfigOptions {
134134
server_name: string;
135135
};
136136
};
137-
eula: string;
137+
ssla: string;
138138
media_devices: {
139139
enable_audio: boolean;
140140
enable_video: boolean;
@@ -152,7 +152,7 @@ export const DEFAULT_CONFIG: ResolvedConfigOptions = {
152152
features: {
153153
feature_use_device_session_member_events: true,
154154
},
155-
eula: "https://static.element.io/legal/online-EULA.pdf",
155+
ssla: "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf",
156156
media_devices: {
157157
enable_audio: true,
158158
enable_video: true,

src/home/UnauthenticatedView.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ export const UnauthenticatedView: FC = () => {
185185
</Text>
186186
)}
187187
<Text size="sm" className={styles.notice}>
188-
<Trans i18nKey="unauthenticated_view_eula_caption">
188+
<Trans i18nKey="unauthenticated_view_ssla_caption">
189189
By clicking "Go", you agree to our{" "}
190-
<ExternalLink href={Config.get().eula}>
191-
End User Licensing Agreement (EULA)
190+
<ExternalLink href={Config.get().ssla}>
191+
Software and Services License Agreement (SSLA)
192192
</ExternalLink>
193193
</Trans>
194194
</Text>

src/room/RoomAuthView.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ export const RoomAuthView: FC = () => {
8080
/>
8181
</FieldRow>
8282
<Text size="sm">
83-
<Trans i18nKey="room_auth_view_eula_caption">
83+
<Trans i18nKey="room_auth_view_ssla_caption">
8484
By clicking "Join call now", you agree to our{" "}
85-
<ExternalLink href={Config.get().eula}>
86-
End User Licensing Agreement (EULA)
85+
<ExternalLink href={Config.get().ssla}>
86+
Software and Services License Agreement (SSLA)
8787
</ExternalLink>
8888
</Trans>
8989
</Text>

0 commit comments

Comments
 (0)