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

In invite dialog add text indicating that we can invite multiple people #447

Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
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..8f7854d 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
@@ -38,7 +38,7 @@ limitations under the License.
min-height: 25px;
padding-inline-start: $spacing-8;
overflow-x: hidden;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

du coup le "overflow-x: hidden;" devient inutile ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Je l'ai enlevé, tu as raison

- overflow-y: auto;
+ overflow: auto;
display: flex;
flex-wrap: wrap;

@@ -194,6 +194,7 @@ limitations under the License.

.mx_InviteDialog_addressBar {
margin-inline-end: 0;
+ overflow: auto;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

C'est une modification qui peut profiter à Element ? où c'est juste pour nous ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ça leur serait utile à eux aussi, leur version est également buggée. Cf:

Screenshot 2023-03-08 at 11 24 10

Copy link
Contributor Author

@aulamber aulamber Mar 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Du coup, je peux quand-même merger mon bugfix chez nous ou pas ?

}

.mx_InviteDialog_userSections {
9 changes: 8 additions & 1 deletion patches/patches.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,19 @@
"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",
"files": [
"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"
]
}
}
8 changes: 8 additions & 0 deletions src/i18n/strings/tchap_translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -722,5 +722,13 @@
"We'll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": {
"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 <userId/>) or <a>share this room</a>.": {
"fr": "Invitez quelqu’un via son nom, e-mail ou pseudo (p. ex. <userId/>) ou <a>partagez ce salon</a>. Il est possible d'inviter en masse en copiant et collant une liste d'emails 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.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aulamber on n'a moyen de mettre des sauts de ligne ?

Copy link
Contributor Author

@aulamber aulamber Mar 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Je n'y arrive pas en modifiant la string de traduction seulement. Par contre je peux faire un patch dans le code d'Element pour rajouter une div... mais je trouve que c'est lourd juste pour un saut à la ligne, qu'en penses-tu ?

"en": "Invite someone using their name, username (like <userId/>) or <a>share this room</a>. 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 <userId/>) or <a>share this space</a>.": {
"fr": "Invitez quelqu’un grâce à son nom, adresse e-mail, nom d’utilisateur (tel que <userId/>) ou <a>partagez cet espace</a>. Il est possible d'inviter en masse en copiant et collant une liste d'emails 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 <userId/>) or <a>share this space</a>. 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."
}
}