Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove mentions of VOIP on Onboarding page. #805

Merged
merged 2 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions modules/tchap-translations/tchap_translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -1131,5 +1131,9 @@
"Unverified sessions are sessions that have logged in with your credentials but have not been cross-verified.": {
"fr": "Les appareils non vérifiés sont identifiés avec vos identifiants mais n’ont pas fait de vérification croisée (échange d'emojis ou Code de Récupération).",
"en": "Unverified devices are devices that have logged in with your credentials but have not been cross-verified (emoji exchange or ou Recovery Code)."
},
"onboarding_free_e2ee_messaging_tchap_limited_voip": {
"en": "With free end-to-end encrypted messaging, %(brand)s is a great way to stay in touch.",
"fr": "Grâce à la messagerie chiffrée de bout en bout gratuite, %(brand)s est un excellent moyen de rester en contact."
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/node_modules/matrix-react-sdk/src/components/views/user-onboarding/UserOnboardingHeader.tsx b/node_modules/matrix-react-sdk/src/components/views/user-onboarding/UserOnboardingHeader.tsx
index 67e5367..df71ad1 100644
--- a/node_modules/matrix-react-sdk/src/components/views/user-onboarding/UserOnboardingHeader.tsx
+++ b/node_modules/matrix-react-sdk/src/components/views/user-onboarding/UserOnboardingHeader.tsx
@@ -49,10 +49,11 @@ export function UserOnboardingHeader({ useCase }: Props): JSX.Element {
break;
case UseCase.WorkMessaging:
title = _t("onboarding|work_messaging_title");
- description = _t("onboarding|free_e2ee_messaging_unlimited_voip", {
+ description = _t("onboarding_free_e2ee_messaging_tchap_limited_voip", { // :TCHAP:
brand: SdkConfig.get("brand"),
});
- image = require("../../../../res/img/user-onboarding/WorkMessaging.png");
+ // :TCHAP: image = require("../../../../res/img/user-onboarding/WorkMessaging.png");
+ image = require("../../../../../../res/img/tchap/multi-device-messaging.png"); // :TCHAP:
actionLabel = _t("onboarding|work_messaging_action");
break;
case UseCase.CommunityMessaging:
9 changes: 8 additions & 1 deletion patches/patches.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
]
},
"remove-fdroid": {
"comments" : "remove when issue is fixed in element-web : https://github.com/vector-im/element-web/issues/26309",
"comments" : "Fixed in 1.11.47 : remove when issue is fixed in element-web : https://github.com/vector-im/element-web/issues/26309",
"package": "matrix-react-sdk",
"files": [
"src/components/views/dialogs/AppDownloadDialog.tsx"
Expand All @@ -226,5 +226,12 @@
"files": [
"src/languageHandler.tsx"
]
},
"no-voip-mentions-in-onboarding": {
"comments" : "Remove custom string when translations are finished migrating (1.11.46). Custom image stays though.",
"package": "matrix-react-sdk",
"files": [
"src/components/views/user-onboarding/UserOnboardingHeader.tsx"
]
}
}
Binary file added res/img/tchap/multi-device-messaging.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading