Remove a custom key and reuse the element one

tchapgouv · Jan 23, 2024 · 4ef5582 · 4ef5582
1 parent 07931a0
commit 4ef5582
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/modules/tchap-translations/tchap_translations.json b/modules/tchap-translations/tchap_translations.json
@@ -227,10 +227,6 @@
         "en": "Known issues",
         "fr": "Problèmes connus"
     },
-    "Lock my messages and disconnect me from all my devices (in case your account is hacked or a device loss)": {
-        "en": "Lock my messages and disconnect me from all my devices (in case your account is hacked or a device loss)",
-        "fr": "Verrouiller mes messages et me déconnecter de tous mes appareils (en cas de piratage de votre compte ou perte d'un appareil)"
-    },
     "One of your devices <b>wants to check your Tchap Keys</b> to unlock your messages.": {
         "en": "One of your devices <b>wants to check your Tchap Keys</b> to unlock your messages.",
         "fr": "L'un de vos appareils <b>demande à partager vos Clés Tchap</b> pour déverrouiller vos messages."
@@ -544,6 +540,10 @@
             "other_devices_logout_warning_2": {
                 "en": "If you want to keep your messages, save your Tchap keys from one of your devices before proceeding. They will help to restore your messages",
                 "fr": "Si vous voulez garder un accès à vos messages, sauvegardez vos clés Tchap à partir de l’un de vos appareils avant de continuer. Elles vous permettront de déverrouiller vos messages"
+            },
+            "sign_out_other_devices": {
+                "en": "Lock my messages and disconnect me from all my devices (in case your account is hacked or a device loss)",
+                "fr": "Verrouiller mes messages et me déconnecter de tous mes appareils (en cas de piratage de votre compte ou perte d'un appareil)"
             }
         },
         "reset_password_title": {

diff --git a/patches/forgot-password/matrix-react-sdk+3.82.0.patch b/patches/forgot-password/matrix-react-sdk+3.82.0.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/matrix-react-sdk/src/components/structures/auth/ForgotPassword.tsx b/node_modules/matrix-react-sdk/src/components/structures/auth/ForgotPassword.tsx
-index 9487fc5..dd1ca5e 100644
+index 9487fc5..0177f0a 100644
 --- a/node_modules/matrix-react-sdk/src/components/structures/auth/ForgotPassword.tsx
 +++ b/node_modules/matrix-react-sdk/src/components/structures/auth/ForgotPassword.tsx
 @@ -42,6 +42,8 @@ import { VerifyEmailModal } from "./forgot-password/VerifyEmailModal";
@@ -102,17 +102,6 @@ index 9487fc5..dd1ca5e 100644
                  loading={this.state.phase === Phase.SendingEmail}
                  onInputChanged={this.onInputChanged}
                  onLoginClick={this.props.onLoginClick!} // set by default props
-@@ -409,7 +446,9 @@ export default class ForgotPassword extends React.Component<Props, State> {
-                                 onChange={() => this.setState({ logoutDevices: !this.state.logoutDevices })}
-                                 checked={this.state.logoutDevices}
-                             >
--                                {_t("auth|reset_password|sign_out_other_devices")}
-+                                {/* :TCHAP: _t("auth|reset_password|sign_out_other_devices") */
-+                                    _t('Lock my messages and disconnect me from all my devices (in case your account is hacked or a device loss)')
-+                                /*end :TCHAP: */}
-                             </StyledCheckbox>
-                         </div>
-                         {this.state.errorText && <ErrorMessage message={this.state.errorText} />}
 diff --git a/node_modules/matrix-react-sdk/src/components/structures/auth/forgot-password/EnterEmail.tsx b/node_modules/matrix-react-sdk/src/components/structures/auth/forgot-password/EnterEmail.tsx
 index fbb08c7..f1a53f2 100644
 --- a/node_modules/matrix-react-sdk/src/components/structures/auth/forgot-password/EnterEmail.tsx