diff --git a/patches/in-invite-dialog-add-text-indicating-that-we-can-invite-multiple-people/matrix-react-sdk+3.63.0.patch b/patches/in-invite-dialog-add-text-indicating-that-we-can-invite-multiple-people/matrix-react-sdk+3.63.0.patch new file mode 100644 index 0000000000..086ad57f9e --- /dev/null +++ b/patches/in-invite-dialog-add-text-indicating-that-we-can-invite-multiple-people/matrix-react-sdk+3.63.0.patch @@ -0,0 +1,22 @@ +diff --git a/node_modules/matrix-react-sdk/res/css/views/dialogs/_InviteDialog.pcss b/node_modules/matrix-react-sdk/res/css/views/dialogs/_InviteDialog.pcss +index c03e78d..9d795b1 100644 +--- a/node_modules/matrix-react-sdk/res/css/views/dialogs/_InviteDialog.pcss ++++ b/node_modules/matrix-react-sdk/res/css/views/dialogs/_InviteDialog.pcss +@@ -37,8 +37,7 @@ limitations under the License. + border-radius: 4px; + min-height: 25px; + padding-inline-start: $spacing-8; +- overflow-x: hidden; +- overflow-y: auto; ++ overflow: auto; + display: flex; + flex-wrap: wrap; + +@@ -194,6 +193,7 @@ limitations under the License. + + .mx_InviteDialog_addressBar { + margin-inline-end: 0; ++ overflow: auto; + } + + .mx_InviteDialog_userSections { diff --git a/patches/patches.json b/patches/patches.json index 13edb9a4f2..dd4e07a288 100644 --- a/patches/patches.json +++ b/patches/patches.json @@ -160,7 +160,7 @@ "src/components/views/settings/Notifications.tsx" ] }, - "green-confirmation-shield" : { + "green-confirmation-shield": { "comments" : "When finishing a session verification with mobile using the QR code, we need the shield image to be green on all clients.", "github-issue" : "https://github.com/tchapgouv/tchap-web-v4/issues/432", "package": "matrix-react-sdk", @@ -168,6 +168,13 @@ "res/css/views/rooms/_E2EIcon.pcss" ] }, + "in-invite-dialog-add-text-indicating-that-we-can-invite-multiple-people": { + "github-issue" : "https://github.com/tchapgouv/tchap-web-v4/issues/342", + "package": "matrix-react-sdk", + "files": [ + "res/css/views/dialogs/_InviteDialog.pcss" + ] + }, "fix-inviting-a-person-already-present-in-the-room" : { "comments" : "When inviting by its email adress someone already in the room, the error message was wrong and break the invitation process", "github-issue" : "https://github.com/tchapgouv/tchap-web-v4/issues/394", diff --git a/src/i18n/strings/tchap_translations.json b/src/i18n/strings/tchap_translations.json index 3ac4d311b8..204e2e04b3 100644 --- a/src/i18n/strings/tchap_translations.json +++ b/src/i18n/strings/tchap_translations.json @@ -296,7 +296,7 @@ }, "Wait for at least %(wait)s seconds between two emails": { "en": "Wait for at least %(wait)s seconds between two emails", - "fr": "Attendez au moins %(wait)s secondes entre l'envoi de deux emails" + "fr": "Attendez au moins %(wait)s secondes entre l'envoi de deux mails" }, "The email was not sent sucessfully, please retry in a moment": { "en": "The email was not sent sucessfully, please retry", @@ -723,6 +723,14 @@ "fr": "Nous génèrerons une clé de récupération que vous devrez stocker dans un endroit sûr, comme un gestionnaire de mots de passe ou un coffre.", "en": "We'll generate a Recovery Key for you to store somewhere safe, like a password manager or a safe." }, + "Invite someone using their name, email address, username (like ) or share this room.": { + "fr": "Invitez quelqu’un via son nom, mail ou pseudo (p. ex. ) ou partagez ce salon. Il est possible d'inviter en masse en copiant et collant une liste de mails séparés par une virgule (prenom1.nom1@beta.gouv.fr, prenom2.nom2@beta.gouv.fr, prenom3.nom3@beta.gouv.fr) ou séparés par un saut à la ligne.", + "en": "Invite someone using their name, email or username (like ) or share this room. It is possible to invite multiple people by copy-pasting an email list separated by a comma (prenom1.nom1@beta.gouv.fr, prenom2.nom2@beta.gouv.fr, prenom3.nom3@beta.gouv.fr) or separated by a line break." + }, + "Invite someone using their name, email address, username (like ) or share this space.": { + "fr": "Invitez quelqu’un grâce à son nom, adresse mail, nom d’utilisateur (tel que ) ou partagez cet espace. Il est possible d'inviter en masse en copiant et collant une liste de mails séparés par une virgule (prenom1.nom1@beta.gouv.fr, prenom2.nom2@beta.gouv.fr, prenom3.nom3@beta.gouv.fr) ou séparés par un saut à la ligne.", + "en": "Invite someone using their name, email address, username (like ) or share this space. It is possible to invite multiple people by copy-pasting an email list separated by a comma (prenom1.nom1@beta.gouv.fr, prenom2.nom2@beta.gouv.fr, prenom3.nom3@beta.gouv.fr) or separated by a line break." + }, "User is already in the room": { "fr": "Cette personne est déjà dans le salon.", "en": "User is already in the room."