Improve styles for ConversationListItem
- Display last message
- Fix user talking to themself
Change-Id: Ia5bb3f9cd86a389f94bbfb3e279e7a82878f98ed
diff --git a/client/src/locale/en/translation.json b/client/src/locale/en/translation.json
index 9634028..36d276f 100644
--- a/client/src/locale/en/translation.json
+++ b/client/src/locale/en/translation.json
@@ -1,6 +1,12 @@
{
"severity": "",
"change_picture": "Change the picture",
+ "message_swarm_created": "Swarm created",
+ "message_call_outgoing_missed": "Missed outgoing call",
+ "message_call_incoming_missed": "Missed incoming call",
+ "message_call_outgoing": "Outgoing call - {{duration}}",
+ "message_call_incoming": "Incoming call - {{duration}}",
+ "message_member_joined": "{{user}} joined",
"ongoing_call_unmuted": "Ongoing call",
"ongoing_call_muted": "Ongoing call (muted)",
"connecting_call": "Connecting...",
@@ -11,7 +17,6 @@
"conversation_start_videocall": "Start video call",
"conversation_close": "Close this conversation",
"conversation_details": "Conversation details",
- "conversation_block": "Block conversation",
"conversation_delete": "Remove conversation",
"conversation_details_name": "Title",
"conversation_details_identifier": "Identifier",
@@ -21,15 +26,8 @@
"conversation_details_is_swarm_false": "False",
"conversation_details_informations": "Informations",
"dialog_confirm_title_default": "Confirm action",
- "conversation_ask_confirm_block": "Would you really like to block this conversation?",
- "conversation_confirm_block": "Block",
"conversation_ask_confirm_remove": "Would you really like to remove this conversation?",
"conversation_confirm_remove": "Remove",
- "conversation_title_one": "{{member0}}",
- "conversation_title_two": "{{member0}} and {{member1}}",
- "conversation_title_three": "{{member0}}, {{member1}} and {{member2}}",
- "conversation_title_four": "{{member0}}, {{member1}}, {{member2}}, +1 other member",
- "conversation_title_more": "{{member0}}, {{member1}}, {{member2}}, +{{excess}} other members",
"select_placeholder": "Select an option",
"dialog_close": "Close",
"dialog_cancel": "Cancel",
@@ -62,12 +60,10 @@
"username_rule_three": "The username may contain hyphens (-).",
"username_rule_four": "The username may contain underscores (_).",
"welcome_text": "Welcome to Jami!",
- "message_call_outgoing_missed": "Missed outgoing call",
- "message_call_incoming_missed": "Missed incoming call",
- "message_call_outgoing": "Outgoing call - {{duration}}",
- "message_call_incoming": "Incoming call - {{duration}}",
- "message_swarm_created": "Swarm created",
- "message_user_joined": "{{user}} joined",
+ "message_member_invited": "{{user}} was invited to join",
+ "message_member_left": "{{user}} left",
+ "message_member_banned": "{{user}} was kicked",
+ "message_member_unbanned": "{{user}} was re-added",
"messages_scroll_to_end": "Scroll to end of conversation",
"conversation_add_contact_form": "Add a contact",
"message_input_placeholder_one": "Write to {{member0}}",
@@ -76,6 +72,11 @@
"message_input_placeholder_four": "Write to {{member0}}, {{member1}}, {{member2}}, +1 other member",
"message_input_placeholder_more": "Write to {{member0}}, {{member1}}, {{member2}}, +{{excess}} other members",
"missed_incoming_call": "Missed incoming call from conversation {{conversationId}}",
+ "conversation_title_one": "{{member0}}",
+ "conversation_title_two": "{{member0}} and {{member1}}",
+ "conversation_title_three": "{{member0}}, {{member1}} and {{member2}}",
+ "conversation_title_four": "{{member0}}, {{member1}}, {{member2}}, +1 other member",
+ "conversation_title_more": "{{member0}}, {{member1}}, {{member2}}, +{{excess}} other members",
"conversation_add_contact": "Add contact",
"loading": "Loading...",
"calling": "Calling {{member0}}",
@@ -115,6 +116,9 @@
"setup_login_password_placeholder_creation": "New password",
"setup_login_password_placeholder_repeat": "Repeat password",
"admin_creation_submit_button": "Create admin account",
+ "conversation_block": "Block conversation",
+ "conversation_ask_confirm_block": "Would you really like to block this conversation?",
+ "conversation_confirm_block": "Block",
"share_screen": "Share your screen",
"share_window": "Share window",
"share_screen_area": "Share an area of your screen",
diff --git a/client/src/locale/fr/translation.json b/client/src/locale/fr/translation.json
index 44d0517..9b8ad6d 100644
--- a/client/src/locale/fr/translation.json
+++ b/client/src/locale/fr/translation.json
@@ -1,6 +1,7 @@
{
"severity": "",
"change_picture": "Modifier l'image",
+ "message_swarm_created": "Le Swarm a été créé",
"ongoing_call_unmuted": "Appel en cours",
"ongoing_call_muted": "Appel en cours (muet)",
"connecting_call": "Connexion...",
@@ -11,7 +12,6 @@
"conversation_start_videocall": "Démarrer appel vidéo",
"conversation_close": "Fermer la conversation",
"conversation_details": "Détails de la conversation",
- "conversation_block": "Bloquer la conversation",
"conversation_delete": "Supprimer la conversation",
"conversation_details_name": "Titre",
"conversation_details_identifier": "Identifiant",
@@ -21,15 +21,8 @@
"conversation_details_is_swarm_false": "Non",
"conversation_details_informations": "Informations",
"dialog_confirm_title_default": "Merci de confirmer",
- "conversation_ask_confirm_block": "Souhaitez-vous vraiment bloquer cette conversation ?",
- "conversation_confirm_block": "Bloquer",
"conversation_ask_confirm_remove": "Souhaitez-vous vraiment supprimer cette conversation ?",
"conversation_confirm_remove": "Supprimer",
- "conversation_title_one": "{{member0}}",
- "conversation_title_two": "{{member0}} et {{member1}}",
- "conversation_title_three": "{{member0}}, {{member1}} et {{member2}}",
- "conversation_title_four": "{{member0}}, {{member1}}, {{member2}}, +1 autre membre",
- "conversation_title_more": "{{member0}}, {{member1}}, {{member2}}, +{{excess}} autres membres",
"select_placeholder": "Sélectionner une option",
"dialog_close": "Fermer",
"dialog_cancel": "Annuler",
@@ -62,12 +55,6 @@
"username_rule_three": "Le nom d'utilisateur peut contenir des tirets (-).",
"username_rule_four": "Le nom d'utilisateur peut contenir des tirets bas (_).",
"welcome_text": "Bienvenue sur Jami!",
- "message_call_outgoing_missed": "Appel sortant manqué",
- "message_call_incoming_missed": "Appel entrant manqué",
- "message_call_outgoing": "Appel entrant - {{duration}}",
- "message_call_incoming": "Appel sortant - {{duration}}",
- "message_swarm_created": "Le Swarm a été créé",
- "message_user_joined": "{{user}} s'est joint",
"messages_scroll_to_end": "Faire défiler jusqu'à la fin de la conversation",
"conversation_add_contact_form": "Ajouter un contact",
"message_input_placeholder_one": "Écrire à {{member0}}",
@@ -76,6 +63,11 @@
"message_input_placeholder_four": "Écrire à {{member0}}, {{member1}}, {{member2}}, +1 autre membre",
"message_input_placeholder_more": "Écrire à {{member0}}, {{member1}}, {{member2}}, +{{excess}} autres membres",
"missed_incoming_call": "Appel manqué de la conversation {{conversationId}}",
+ "conversation_title_one": "{{member0}}",
+ "conversation_title_two": "{{member0}} et {{member1}}",
+ "conversation_title_three": "{{member0}}, {{member1}} et {{member2}}",
+ "conversation_title_four": "{{member0}}, {{member1}}, {{member2}}, +1 autre membre",
+ "conversation_title_more": "{{member0}}, {{member1}}, {{member2}}, +{{excess}} autres membres",
"conversation_add_contact": "Ajouter le contact",
"loading": "Chargement...",
"calling": "Appel vers {{member0}}",
@@ -115,6 +107,18 @@
"setup_login_password_placeholder_creation": "Nouveau mot de passe",
"setup_login_password_placeholder_repeat": "Répéter le mot de passe",
"admin_creation_submit_button": "Créer un compte admin",
+ "message_call_outgoing_missed": "Appel sortant manqué",
+ "message_call_incoming_missed": "Appel entrant manqué",
+ "message_call_outgoing": "Appel entrant - {{duration}}",
+ "message_call_incoming": "Appel sortant - {{duration}}",
+ "message_member_invited": "{{user}} a été invité(e)",
+ "message_member_joined": "{{user}} s'est joint(e)",
+ "message_member_left": "{{user}} a quitté",
+ "message_member_banned": "{{user}} a été exclu(e)",
+ "message_member_unbanned": "{{user}} a été de nouveau rajouté(e)",
+ "conversation_block": "Bloquer la conversation",
+ "conversation_ask_confirm_block": "Souhaitez-vous vraiment bloquer cette conversation ?",
+ "conversation_confirm_block": "Bloquer",
"share_screen": "Partager votre écran",
"share_window": "Partager la fenêtre",
"share_screen_area": "Partager une partie de l'écran",