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

Improve tchap annonces UI #960

Merged
merged 2 commits into from
Apr 16, 2024
Merged

Improve tchap annonces UI #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de4b2cb
feat(translation): tchap wording for systems alerts
Apr 3, 2024
2259200
feat(annonces): move annonce room section below favorites
Apr 10, 2024
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
4 changes: 4 additions & 0 deletions modules/tchap-translations/tchap_translations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,5 +721,9 @@
"tchap_voip_bug_report_prefill": {
"en": "I had a problem during a Tchap call.\nDetails: ...",
"fr": "J'ai eu un problème pendant un appel Tchap.\nDétails : ..."
},
"common|system_alerts": {
"en": "Tchap Info",
"fr": "Annonces Tchap"
}
}
2 changes: 1 addition & 1 deletion patches/patches.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
"package": "matrix-react-sdk",
"files": ["src/components/views/dialogs/security/AccessSecretStorageDialog.tsx"]
},
"use-the-term-direct-messages-not-people": {
"use-the-term-direct-messages-not-people-and-tchap-annonces": {
"github-issue": "https://github.com/tchapgouv/tchap-web-v4/issues/448",
"package": "matrix-react-sdk",
"files": [
Expand Down
14 changes: 13 additions & 1 deletion ...-not-people/matrix-react-sdk+3.95.0.patch → ...ap-annonces/matrix-react-sdk+3.95.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,21 @@ index 8e8e4ce..bd2b4d3 100644
<SettingsSubsectionText>
{_t("space|preferences|show_people_in_space", {
diff --git a/node_modules/matrix-react-sdk/src/components/views/rooms/RoomList.tsx b/node_modules/matrix-react-sdk/src/components/views/rooms/RoomList.tsx
index 28154c4..09f40ca 100644
index 28154c4..ac9326b 100644
--- a/node_modules/matrix-react-sdk/src/components/views/rooms/RoomList.tsx
+++ b/node_modules/matrix-react-sdk/src/components/views/rooms/RoomList.tsx
@@ -82,10 +82,10 @@ interface IState {
export const TAG_ORDER: TagID[] = [
DefaultTagID.Invite,
DefaultTagID.Favourite,
+ DefaultTagID.ServerNotice, // :TCHAP: tchap-annonces
DefaultTagID.DM,
DefaultTagID.Untagged,
DefaultTagID.LowPriority,
- DefaultTagID.ServerNotice,
Copy link
Contributor

Choose a reason for hiding this comment

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

pour eviter les conflits futurs, il vaut mieux commenter les lignes que les supprimer.
// DefaultTagID.ServerNotice, // :TCHAP: tchap-annonces

DefaultTagID.Suggested,
// DefaultTagID.Archived isn't here any more: we don't show it at all.
// The section still exists in the code as a place for rooms that we know
@@ -382,7 +382,7 @@ const TAG_AESTHETICS: TagAestheticsMap = {
defaultHidden: false,
},
Expand Down
Loading