Skip to content

Fix "people" label in contextual room menu #631

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

Merged
merged 1 commit into from
Jul 19, 2023
Merged

Conversation

odelcroi
Copy link
Member

@odelcroi odelcroi commented Jul 19, 2023

In room context menu, label was "Direct Messages" where it should be "People"

| Personnes 2 |

image

@NicolasBuquet
Copy link

En lisant ton descriptif, il me semble que tu veux remplacer "Direct Messages" par "People".

En lisant le patch j'ai l'impression que c'est l'inverse qui est fait : remplacer "People" par "Direct Messages" ?

@NicolasBuquet NicolasBuquet self-requested a review July 19, 2023 09:31
@odelcroi
Copy link
Member Author

Non, ce qui est fait est d'enlever le remplacement de "Personne" par "Direct Messages". 💇

@NicolasBuquet
Copy link

Avec cette modification :

-                label={_t("People")}
+                // label={TCHAP: change label _t("People")}
+                label={_t("Direct Messages") /* end TCHAP */}

pour moi, à la fin on reste avec label={_t("Direct Messages") /* end TCHAP */} et donc le label basé sur Direct Messages et non People.

@mcalinghee
Copy link
Contributor

In room context menu, label was "Direct Messages" where it should be "People"

je n'ai pas bien compris :

  • dans la description : on veut remplacer la cle "Direct Messages" par "People"
  • dans la PR/code : on veut remplacer la cle "People" par "Direct Messages"

@odelcroi
Copy link
Member Author

Oui, c'est tricky. Il faut lire :

- -                label={_t("People")}
- +                // label={TCHAP: change label _t("People")}
- +                label={_t("Direct Messages") /* end TCHAP */}

image

C'est à dire que dans la PR, les lignes de patch sont enlevées, donc on retourne à l'état inital

label={_t("People")}

@odelcroi odelcroi changed the title fix wrong people label "People" label in contextual room menu is wrong Jul 19, 2023
@odelcroi odelcroi changed the title "People" label in contextual room menu is wrong Fix "people" label in contextual room menu Jul 19, 2023
@odelcroi odelcroi merged commit 9525ac0 into develop_tchap Jul 19, 2023
@mcalinghee
Copy link
Contributor

en fait on a les "-" partout et du coup on enleve tout 😅

@odelcroi odelcroi mentioned this pull request Jul 19, 2023
@NicolasBuquet
Copy link

Ah ok, c'est un diff de diff.

J'avais raté les '-' partout !

Ok !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants