From 93fcfa58d0c784ab5fbd4a1291531e76677b7d2f Mon Sep 17 00:00:00 2001 From: Jan Cernik <66427541+jancernik@users.noreply.github.com> Date: Tue, 29 Nov 2022 16:08:27 -0300 Subject: [PATCH] FIX: Improve message when posting a duplicate link (#19245) If the duplicated link was posted by the user itself, it will display a different JIT message. --- .../discourse/app/controllers/composer.js | 21 +++++++++++++------ config/locales/client.en.yml | 1 + 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js index f56dab12044..d62d80bf7c1 100644 --- a/app/assets/javascripts/discourse/app/controllers/composer.js +++ b/app/assets/javascripts/discourse/app/controllers/composer.js @@ -648,12 +648,21 @@ export default Controller.extend({ const [linkWarn, linkInfo] = linkLookup.check(post, href); if (linkWarn && !this.get("isWhispering")) { - const body = I18n.t("composer.duplicate_link", { - domain: linkInfo.domain, - username: linkInfo.username, - post_url: topic.urlForPostNumber(linkInfo.post_number), - ago: shortDate(linkInfo.posted_at), - }); + let body; + if (linkInfo.username === this.currentUser.username) { + body = I18n.t("composer.duplicate_link_same_user", { + domain: linkInfo.domain, + post_url: topic.urlForPostNumber(linkInfo.post_number), + ago: shortDate(linkInfo.posted_at), + }); + } else { + body = I18n.t("composer.duplicate_link", { + domain: linkInfo.domain, + username: linkInfo.username, + post_url: topic.urlForPostNumber(linkInfo.post_number), + ago: shortDate(linkInfo.posted_at), + }); + } this.appEvents.trigger("composer-messages:create", { extraClass: "custom-body", templateName: "education", diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 358d4d18d8c..8006523356e 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2237,6 +2237,7 @@ en: one: "By mentioning @%{here}, you are about to notify %{count} user – are you sure?" other: "By mentioning @%{here}, you are about to notify %{count} users – are you sure?" duplicate_link: "It looks like your link to %{domain} was already posted in the topic by @%{username} in a reply on %{ago} – are you sure you want to post it again?" + duplicate_link_same_user: "It looks like you already posted a link to %{domain} in this topic in a reply on %{ago} - are you sure you want to post it again?" reference_topic_title: "RE: %{title}" error: