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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 9 commits into from
Mar 10, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9ae3054
In invite dialog add text indicating that we can invite multiple people
aulamber Mar 2, 2023
24c2667
Fix typo "separe"
aulamber Mar 3, 2023
5ec0eef
Add spaces between commas in label
aulamber Mar 3, 2023
e87fe62
Add scrolling when copy-pasting a list and adequate texte with it
aulamber Mar 7, 2023
48063fa
Add horizontal scroll for multiple emails
aulamber Mar 7, 2023
99ec69f
Merge branch 'develop_tchap' into 342-invite-dialog-indicate-that-we-…
aulamber Mar 7, 2023
4f6b89f
Fix breaking comma in patches from develop branch
aulamber Mar 7, 2023
94e97a4
Remove an unecessary overflow property
aulamber Mar 8, 2023
0e230a6
Remove e in email texts
aulamber Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions ...alog-add-text-indicating-that-we-can-invite-multiple-people/matrix-react-sdk+3.63.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
9 changes: 8 additions & 1 deletion patches/patches.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,21 @@
"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"
]
},
"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",
Expand Down
10 changes: 9 additions & 1 deletion src/i18n/strings/tchap_translations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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 <userId/>) or <a>share this room</a>.": {
"fr": "Invitez quelqu’un via son nom, 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 de mails séparés par une virgule ([email protected], [email protected], [email protected]) ou séparés par un saut à la ligne.",
"en": "Invite someone using their name, email or 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 ([email protected], [email protected], [email protected]) 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 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 de mails séparés par une virgule ([email protected], [email protected], [email protected]) 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 ([email protected], [email protected], [email protected]) 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."
Expand Down