Fix patches/registration-for-mainlining and patches/show-icon-on-publ…

…ic-room
tchapgouv · Jan 16, 2024 · e117de9 · e117de9
1 parent 8bd1eac
commit e117de9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/...-mainlining/matrix-react-sdk+3.81.0.patch → ...-mainlining/matrix-react-sdk+3.82.0.patch b/...-mainlining/matrix-react-sdk+3.81.0.patch → ...-mainlining/matrix-react-sdk+3.82.0.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/matrix-react-sdk/src/components/structures/auth/Registration.tsx b/node_modules/matrix-react-sdk/src/components/structures/auth/Registration.tsx
-index 7a19848..d7ddd55 100644
+index f4e8ff1..4f3372e 100644
 --- a/node_modules/matrix-react-sdk/src/components/structures/auth/Registration.tsx
 +++ b/node_modules/matrix-react-sdk/src/components/structures/auth/Registration.tsx
 @@ -50,8 +50,11 @@ import InteractiveAuth, { InteractiveAuthCallback } from "../InteractiveAuth";
@@ -76,31 +76,31 @@ index 7a19848..d7ddd55 100644
                      </div>
                      <div className="mx_Register_footerActions">
 diff --git a/node_modules/matrix-react-sdk/src/components/views/auth/RegistrationForm.tsx b/node_modules/matrix-react-sdk/src/components/views/auth/RegistrationForm.tsx
-index e12ac19..a5222bf 100644
+index 41a2aed..d428627 100644
 --- a/node_modules/matrix-react-sdk/src/components/views/auth/RegistrationForm.tsx
 +++ b/node_modules/matrix-react-sdk/src/components/views/auth/RegistrationForm.tsx
 @@ -267,7 +267,7 @@ export default class RegistrationForm extends React.PureComponent<IProps, IState
      };
 
      private validateEmailRules = withValidation({
--        description: () => _t("Use an email address to recover your account"),
-+        // :TCHAP: this is confusing because email=username in the Tchap case. // description: () => _t("Use an email address to recover your account"),
+-        description: () => _t("auth|reset_password_email_field_description"),
++        // :TCHAP: this is confusing because email=username in the Tchap case. //description: () => _t("auth|reset_password_email_field_description"),
          hideDescriptionIfValid: true,
          rules: [
              {
 @@ -275,7 +275,10 @@ export default class RegistrationForm extends React.PureComponent<IProps, IState
                  test(this: RegistrationForm, { value, allowEmpty }) {
                      return allowEmpty || !this.authStepIsRequired("m.login.email.identity") || !!value;
                  },
--                invalid: () => _t("Enter email address (required on this homeserver)"),
+-                invalid: () => _t("auth|reset_password_email_field_required_invalid"),
 +                // :TCHAP: don't mention homeserver, Tchap hides the concept from users.
-+                //invalid: () => _t("Enter email address (required on this homeserver)"),
++                //invalid: () => _t("auth|reset_password_email_field_required_invalid"),
 +                invalid: () => _t("Enter email address"),
 +                // end :TCHAP:
              },
              {
                  key: "email",
-@@ -566,16 +569,23 @@ export default class RegistrationForm extends React.PureComponent<IProps, IState
+@@ -568,16 +571,23 @@ export default class RegistrationForm extends React.PureComponent<IProps, IState
          return (
              <div>
                  <form onSubmit={this.onSubmit}>

diff --git a/...public-room/matrix-react-sdk+3.81.0.patch → ...public-room/matrix-react-sdk+3.82.0.patch b/...public-room/matrix-react-sdk+3.81.0.patch → ...public-room/matrix-react-sdk+3.82.0.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/matrix-react-sdk/src/components/views/avatars/DecoratedRoomAvatar.tsx b/node_modules/matrix-react-sdk/src/components/views/avatars/DecoratedRoomAvatar.tsx
-index 23b065d..a3208fa 100644
+index 39997e1..5b88a91 100644
 --- a/node_modules/matrix-react-sdk/src/components/views/avatars/DecoratedRoomAvatar.tsx
 +++ b/node_modules/matrix-react-sdk/src/components/views/avatars/DecoratedRoomAvatar.tsx
 @@ -30,6 +30,9 @@ import TextWithTooltip from "../elements/TextWithTooltip";
@@ -27,7 +27,7 @@ index 23b065d..a3208fa 100644
 @@ -62,6 +70,14 @@ function tooltipText(variant: Icon): string | undefined {
      switch (variant) {
          case Icon.Globe:
-             return _t("This room is public");
+             return _t("room|header|room_is_public");
 +        // :TCHAP: add icons for custom room types
 +        case Icon.Forum:
 +            return _t("This room is a public forum");
@@ -65,7 +65,7 @@ index 23b065d..a3208fa 100644
                  this.props.room.on(RoomEvent.Timeline, this.onRoomTimeline);
                  this.isWatchingTimeline = true;
 diff --git a/node_modules/matrix-react-sdk/src/components/views/right_panel/RoomSummaryCard.tsx b/node_modules/matrix-react-sdk/src/components/views/right_panel/RoomSummaryCard.tsx
-index 982f04b..1be1e65 100644
+index 18cb705..d3272a8 100644
 --- a/node_modules/matrix-react-sdk/src/components/views/right_panel/RoomSummaryCard.tsx
 +++ b/node_modules/matrix-react-sdk/src/components/views/right_panel/RoomSummaryCard.tsx
 @@ -22,7 +22,7 @@ import MatrixClientContext from "../../../contexts/MatrixClientContext";
@@ -87,7 +87,7 @@ index 982f04b..1be1e65 100644
 +                <DecoratedRoomAvatar room={room} size="54px" viewAvatarOnClick />
 +                {/** remove the extra badge
                  <TextWithTooltip
-                     tooltip={isRoomEncrypted ? _t("common|encrypted") : _t("Not encrypted")}
+                     tooltip={isRoomEncrypted ? _t("common|encrypted") : _t("common|unencrypted")}
                      class={classNames("mx_RoomSummaryCard_e2ee", {
 @@ -317,6 +321,7 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, permalinkCreator, onClose, on
                          mx_RoomSummaryCard_e2ee_verified: isRoomEncrypted && e2eStatus === E2EStatus.Verified,