diff --git a/res/css/structures/_UserMenu.scss b/res/css/structures/_UserMenu.scss index 90292e812c..f2577938e5 100644 --- a/res/css/structures/_UserMenu.scss +++ b/res/css/structures/_UserMenu.scss @@ -273,7 +273,7 @@ limitations under the License. mask-image: url('$(res)/img/element-icons/roomlist/home.svg'); } .mx_UserMenu_iconHosting::before { - mask-image: url('$(res)/img/element-icons/roomlist/home.svg'); + mask-image: url('$(res)/img/element-icons/brands/element.svg'); } .mx_UserMenu_iconBell::before { diff --git a/res/img/element-icons/brands/element.svg b/res/img/element-icons/brands/element.svg new file mode 100644 index 0000000000..6861de0955 --- /dev/null +++ b/res/img/element-icons/brands/element.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/components/structures/HostSignupAction.tsx b/src/components/structures/HostSignupAction.tsx index 1c31c9d721..39185acd05 100644 --- a/src/components/structures/HostSignupAction.tsx +++ b/src/components/structures/HostSignupAction.tsx @@ -36,7 +36,7 @@ export default class HostSignupAction extends React.PureComponent diff --git a/src/components/views/dialogs/HostSignupDialog.tsx b/src/components/views/dialogs/HostSignupDialog.tsx index f1731fef84..45a03b7cf0 100644 --- a/src/components/views/dialogs/HostSignupDialog.tsx +++ b/src/components/views/dialogs/HostSignupDialog.tsx @@ -172,32 +172,44 @@ export default class HostSignupDialog extends React.PureComponent { - const termsDialog = this.config.termsDialog; const textComponent = ( <>

- {termsDialog.text} + {_t("Continuing temporarily allows the %(hostSignupBrand)s setup process to access your " + + "account to fetch verified email addresses. This data is not stored.", { + hostSignupBrand: this.config.brand, + })}

- {_t("Learn more in our")}  - - {termsDialog.privacyPolicy.text} - ,  - - {termsDialog.termsOfService.text} - {_t("and")}  - - {termsDialog.cookiePolicy.text} - . + {_t("Learn more in our , and .", + {}, + { + cookiePolicyLink: () => ( + + {_t("Cookie Policy")} + + ), + privacyPolicyLink: () => ( + + {_t("Privacy Policy")} + + ), + termsOfServiceLink: () => ( + + {_t("Terms of Service")} + + ), + }, + )}

); Modal.createDialog( QuestionDialog, { - title: termsDialog.title, + title: _t("You should know"), description: textComponent, - button: termsDialog.acceptText, + button: _t("Continue"), onFinished: this.onAccountDetailsDialogFinished, }, ); @@ -230,7 +242,9 @@ export default class HostSignupDialog extends React.PureComponent
- {this.config.minimizedDialogTitle} + {_t("%(hostSignupBrand)s Setup", { + hostSignupBrand: this.config.brand, + })}
; - minimizedDialogTitle: string; - termsDialog: IHostSignupTermsDialogConfig; + privacyPolicyUrl: string; + termsOfServiceUrl: string; url: string; } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 5bb7b356d9..a9d31bb9f2 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -2088,12 +2088,17 @@ "Please view existing bugs on Github first. No match? Start a new one.": "Please view existing bugs on Github first. No match? Start a new one.", "PRO TIP: If you start a bug, please submit debug logs to help us track down the problem.": "PRO TIP: If you start a bug, please submit debug logs to help us track down the problem.", "Send feedback": "Send feedback", - "Confirm Abort Of Host Creation": "Confirm Abort Of Host Creation", + "Confirm abort of host creation": "Confirm abort of host creation", "Are you sure you wish to abort creation of the host? The process cannot be continued.": "Are you sure you wish to abort creation of the host? The process cannot be continued.", "Abort": "Abort", "Failed to connect to your homeserver. Please close this dialog and try again.": "Failed to connect to your homeserver. Please close this dialog and try again.", - "Learn more in our": "Learn more in our", - "and": "and", + "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.": "Continuing temporarily allows the %(hostSignupBrand)s setup process to access your account to fetch verified email addresses. This data is not stored.", + "Learn more in our , and .": "Learn more in our , and .", + "Cookie Policy": "Cookie Policy", + "Privacy Policy": "Privacy Policy", + "Terms of Service": "Terms of Service", + "You should know": "You should know", + "%(hostSignupBrand)s Setup": "%(hostSignupBrand)s Setup", "Maximize dialog": "Maximize dialog", "Minimize dialog": "Minimize dialog", "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.", @@ -2246,7 +2251,6 @@ "Find others by phone or email": "Find others by phone or email", "Be found by phone or email": "Be found by phone or email", "Use bots, bridges, widgets and sticker packs": "Use bots, bridges, widgets and sticker packs", - "Terms of Service": "Terms of Service", "To continue you need to accept the terms of this service.": "To continue you need to accept the terms of this service.", "Service": "Service", "Summary": "Summary", @@ -2446,7 +2450,7 @@ "Send a Direct Message": "Send a Direct Message", "Explore Public Rooms": "Explore Public Rooms", "Create a Group Chat": "Create a Group Chat", - "Get your own Element!": "Get your own Element!", + "Upgrade to pro": "Upgrade to pro", "Explore rooms": "Explore rooms", "Failed to reject invitation": "Failed to reject invitation", "Cannot create rooms in this community": "Cannot create rooms in this community",