From c3f73f4f87e7896109dbd6a53e91c4ee8b64ed92 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 26 Jun 2020 12:08:07 +0200 Subject: [PATCH] Rename conversation strings to discussion Signed-off-by: Thomas Citharel --- js/src/i18n/en_US.json | 10 +++++----- js/src/i18n/fr_FR.json | 10 +++++----- js/src/views/Conversations/Conversation.vue | 2 +- js/src/views/Conversations/ConversationsList.vue | 4 ++-- js/src/views/Conversations/Create.vue | 4 ++-- js/src/views/Group/Group.vue | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json index 75cbc481a..0f8cad665 100644 --- a/js/src/i18n/en_US.json +++ b/js/src/i18n/en_US.json @@ -510,10 +510,7 @@ "Website": "Website", "Actor": "Actor", "Statut": "Statut", - "Conversations": "Conversations", "Text": "Text", - "New conversation": "New conversation", - "Create a new conversation": "Create a new conversation", "All group members and other eventual server admins will still be able to view this information.": "All group members and other eventual server admins will still be able to view this information.", "Upcoming events": "Upcoming events", "View all upcoming events": "View all upcoming events", @@ -525,7 +522,6 @@ "Post a public message": "Post a public message", "View all todos": "View all todos", "Discussions": "Discussions", - "View all conversations": "View all conversations", "No public upcoming events": "No public upcoming events", "Latest posts": "Latest posts", "Invite a new member": "Invite a new member", @@ -703,5 +699,9 @@ "(this link)": "(this link)", "Move resource to {folder}": "Move resource to {folder}", "Create a folder": "Create a folder", - "No resources in this folder": "No resources in this folder" + "No resources in this folder": "No resources in this folder", + "New discussion": "New discussion", + "Create a discussion": "Create a discussion", + "Create the discussion": "Create the discussion", + "View all discussions": "View all discussions" } diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json index 450552732..0c0a9965a 100644 --- a/js/src/i18n/fr_FR.json +++ b/js/src/i18n/fr_FR.json @@ -78,11 +78,9 @@ "Confirmed: Will happen": "Confirmé : aura lieu", "Contact": "Contact", "Continue editing": "Continuer la modification", - "Conversations": "Conversations", "Country": "Pays", "Create": "Créer", "Create a calc": "Créer un calc", - "Create a new conversation": "Créer une nouvelle conversation", "Create a new event": "Créer un nouvel évènement", "Create a new group": "Créer un nouveau groupe", "Create a new identity": "Créer une nouvelle identité", @@ -260,7 +258,6 @@ "My groups": "Mes groupes", "My identities": "Mes identités", "Name": "Nom", - "New conversation": "Nouvelle conversation", "New email": "Nouvelle adresse e-mail", "New folder": "Nouveau dossier", "New link": "Nouveau lien", @@ -478,7 +475,6 @@ "Username": "Pseudo", "Users": "Utilisateur⋅ice⋅s", "View a reply": "Aucune réponse | Voir une réponse | Voir {totalReplies} réponses", - "View all conversations": "Voir toutes les conversations", "View all resources": "Voir toutes les resources", "View all todos": "Voir tous les todos", "View all upcoming events": "Voir tous les événements à venir", @@ -703,5 +699,9 @@ "(this link)": "(ce lien)", "Move resource to {folder}": "Déplacer la ressource dans {folder}", "Create a folder": "Créer un dossier", - "No resources in this folder": "Aucune ressource dans ce dossier" + "No resources in this folder": "Aucune ressource dans ce dossier", + "New discussion": "Nouvelle discussion", + "Create a discussion": "Créer une discussion", + "Create the discussion": "Créer la discussion", + "View all discussions": "Voir toutes les discussions" } diff --git a/js/src/views/Conversations/Conversation.vue b/js/src/views/Conversations/Conversation.vue index fe7d6e55b..220cb5b10 100644 --- a/js/src/views/Conversations/Conversation.vue +++ b/js/src/views/Conversations/Conversation.vue @@ -20,7 +20,7 @@ name: RouteName.CONVERSATION_LIST, params: { preferredUsername: conversation.actor.preferredUsername }, }" - >{{ $t("Conversations") }}{{ $t("Discussions") }}
  • diff --git a/js/src/views/Conversations/ConversationsList.vue b/js/src/views/Conversations/ConversationsList.vue index c77a764d8..977c32022 100644 --- a/js/src/views/Conversations/ConversationsList.vue +++ b/js/src/views/Conversations/ConversationsList.vue @@ -20,7 +20,7 @@ name: RouteName.CONVERSATION_LIST, params: { preferredUsername: usernameWithDomain(group) }, }" - >{{ $t("Conversations") }}{{ $t("Discussions") }}
    • @@ -39,7 +39,7 @@ name: RouteName.CREATE_CONVERSATION, params: { preferredUsername: this.preferredUsername }, }" - >{{ $t("New conversation") }}{{ $t("New discussion") }} diff --git a/js/src/views/Conversations/Create.vue b/js/src/views/Conversations/Create.vue index 10cc9ad23..e16cdea19 100644 --- a/js/src/views/Conversations/Create.vue +++ b/js/src/views/Conversations/Create.vue @@ -1,6 +1,6 @@ diff --git a/js/src/views/Group/Group.vue b/js/src/views/Group/Group.vue index 311ffd262..281b3f8ff 100644 --- a/js/src/views/Group/Group.vue +++ b/js/src/views/Group/Group.vue @@ -133,7 +133,7 @@ name: RouteName.CONVERSATION_LIST, params: { preferredUsername: usernameWithDomain(group) }, }" - >{{ $t("View all conversations") }}{{ $t("View all discussions") }}