fix(sso): conflict on sso translation with tchap

linked-dependencies/matrix-react-sdk/src/components/structures/auth/Registration.tsx

@@ -643,7 +643,7 @@ export default class Registration extends React.Component<IProps, IState> {
  if (!this.props.mobileRegister && this.state.ssoFlow && TchapUIFeature.isSSOFlowActive()) {
  ssoSection = <>
  <ProconnectButton/>
- <p style={{textAlign: "center", fontWeight: "bold"}}>{_t("auth|sso|or")}</p>
+ <p style={{textAlign: "center", fontWeight: "bold"}}>{_t("auth|proconnect|or")}</p>
  </>
  }
  // }

modules/tchap-translations/tchap_translations.json

@@ -838,39 +838,39 @@
  "en": "Continue anyway",
  "fr": "Continuer tout de même"
  },
- "auth|sso|sign_in_password_instead": {
+ "auth|proconnect|sign_in_password_instead": {
  "en": "Login with password",
  "fr": "Se connecter par mot de passe"
  },
- "auth|sso|email_title": {
+ "auth|proconnect|email_title": {
  "en": "Login with ProConnect",
  "fr": "Se connecter avec ProConnect"
  },
- "auth|sso|proconnect_continue": {
+ "auth|proconnect|continue": {
  "en": "Continue with ProConnect",
  "fr": "Continuer avec ProConnect"
  },
- "auth|sso|email_placeholder": {
+ "auth|proconnect|email_placeholder": {
  "en": "Your professional email",
  "fr": "Votre adresse mail professionelle"
  },
  "welcome|sso|proconnect_explanation": {
  "en": "-> What is ProConnect ?",
  "fr": "-> Qu'est-ce que ProConnect ?"
  },
- "auth|sso|error": {
+ "auth|proconnect|error": {
  "en": "An error occured during SSO login",
  "fr": "Une erreur est survenue lors de la connexion"
  },
- "auth|sso|error_homeserver": {
+ "auth|proconnect|error_homeserver": {
  "en": "There is an error with the homeserver configuration",
  "fr": "Il y a une erreur avec la configuration du serveur"
  },
- "auth|sso|error_email": {
+ "auth|proconnect|error_email": {
  "en": "You need to enter your professional email",
  "fr": "Vous devez entrer votre adresse professionelle"
  },
- "auth|sso|or": {
+ "auth|proconnect|or": {
  "en": "or",
  "fr": "ou"
  }

res/welcome_sso.html

@@ -263,13 +263,13 @@ <h1 class="mx_Header_title">_t("Welcome to Tchap")<br />
  <div class="mx_ButtonGroup">
  <div class="tc_ButtonCol">
  <a href="#/email-precheck-sso" class="tc_ButtonParent tc_ButtonProconnect tc_Button_iconPC">
- <div class="mx_ButtonLabel">_t("auth|sso|email_title")</div>
+ <div class="mx_ButtonLabel">_t("auth|proconnect|email_title")</div>
  </a>
  <a href="https://www.proconnect.gouv.fr/" class="tc_ButtonProconnect_explanation ">
  <div>_t("welcome|sso|proconnect_explanation")</div>
  </a>
  <a href="#/login" class="tc_ButtonParent tc_Button tc_ButtonBorder">
- <div>_t("auth|sso|sign_in_password_instead")</div>
+ <div>_t("auth|proconnect|sign_in_password_instead")</div>
  </a>
  <a href="#/register" class="tc_Button">
  <div>_t("action|create_account")</div>

src/tchap/components/views/sso/EmailVerificationPage.tsx

@@ -40,7 +40,7 @@ export default function EmailVerificationPage() {
  const [email, setEmail] = useState<string>("");
  const [errorText, setErrorText] = useState<string>("");
 
- const submitButtonChild = loading ? <Spinner w={16} h={16} /> : _t("auth|sso|proconnect_continue");
+ const submitButtonChild = loading ? <Spinner w={16} h={16} /> : _t("auth|proconnect|continue");
 
  const emailFieldRef = useRef<Field>(null);
 
@@ -68,7 +68,7 @@ export default function EmailVerificationPage() {
  const isFieldCorrect = await emailFieldRef.current?.validate({ allowEmpty: false });
 
  if (!isFieldCorrect) {
- displayError(_td("auth|sso|error_email"));
+ displayError(_td("auth|proconnect|error_email"));
  return;
  }
 
@@ -84,7 +84,7 @@ export default function EmailVerificationPage() {
  const validatedServerConfig = await setUpCurrentHs(hs);
 
  if (!validatedServerConfig) {
- displayError(_td("auth|sso|error_homeserver"));
+ displayError(_td("auth|proconnect|error_homeserver"));
  return
  }
 
@@ -98,7 +98,7 @@ export default function EmailVerificationPage() {
  setLoading(false);
 
  } catch(err) {
- displayError(_td("auth|sso|error"));
+ displayError(_td("auth|proconnect|error"));
  }
  }
 
@@ -115,14 +115,14 @@ export default function EmailVerificationPage() {
  <AuthHeader/>
  <AuthBody>
  <h1>
- {_t("auth|sso|email_title")}
+ {_t("auth|proconnect|email_title")}
  </h1>
  <form onSubmit={onSubmit} className="tc_pronnect">
  <fieldset disabled={loading} className="tc_login">
  <div className="mx_AuthBody_fieldRow">
  <EmailField
  name="check_email" // define a name so browser's password autofill gets less confused
- label={_td("auth|sso|email_placeholder")}
+ label={_td("auth|proconnect|email_placeholder")}
  labelRequired={_td("auth|forgot_password_email_required")}
  labelInvalid={_td("auth|forgot_password_email_invalid")}
  value={email}
@@ -145,7 +145,7 @@ export default function EmailVerificationPage() {
  onLoginByPasswordClick();
  }}
  >
- {_t("auth|sso|sign_in_password_instead")}
+ {_t("auth|proconnect|sign_in_password_instead")}
  </AccessibleButton>
  </div>
  </fieldset>

src/tchap/components/views/sso/ProconnectButton.tsx

@@ -8,7 +8,7 @@ export default function ProconnectButton(): JSX.Element {
  return (
  <div className="tc_pronnect">
  <a href="#/email-precheck-sso" className="tc_ButtonParent tc_ButtonProconnect tc_Button_iconPC">
- <div>{_t("auth|sso|email_title")}</div>
+ <div>{_t("auth|proconnect|email_title")}</div>
  </a>
  </div>
  );