diff --git a/app/assets/javascripts/discourse/app/models/bookmark.js b/app/assets/javascripts/discourse/app/models/bookmark.js index fb9a41b87e7..8086c81d2f1 100644 --- a/app/assets/javascripts/discourse/app/models/bookmark.js +++ b/app/assets/javascripts/discourse/app/models/bookmark.js @@ -89,16 +89,9 @@ const Bookmark = RestModel.extend({ @discourseComputed("bumpedAt", "createdAt") bumpedAtTitle(bumpedAt, createdAt) { - const firstPost = I18n.t("first_post"); - const lastPost = I18n.t("last_post"); - const createdAtDate = longDate(createdAt); - const bumpedAtDate = longDate(bumpedAt); - - return I18n.messageFormat("topic.bumped_at_title_MF", { - FIRST_POST: firstPost, - CREATED_AT: createdAtDate, - LAST_POST: lastPost, - BUMPED_AT: bumpedAtDate, + return I18n.t("topic.bumped_at_title", { + createdAtDate: longDate(createdAt), + bumpedAtDate: longDate(bumpedAt), }); }, diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js index fbccc568e1f..662a050ceab 100644 --- a/app/assets/javascripts/discourse/app/models/topic.js +++ b/app/assets/javascripts/discourse/app/models/topic.js @@ -127,16 +127,9 @@ const Topic = RestModel.extend({ @discourseComputed("bumpedAt", "createdAt") bumpedAtTitle(bumpedAt, createdAt) { - const firstPost = I18n.t("first_post"); - const lastPost = I18n.t("last_post"); - const createdAtDate = longDate(createdAt); - const bumpedAtDate = longDate(bumpedAt); - - return I18n.messageFormat("topic.bumped_at_title_MF", { - FIRST_POST: firstPost, - CREATED_AT: createdAtDate, - LAST_POST: lastPost, - BUMPED_AT: bumpedAtDate, + return I18n.t("topic.bumped_at_title", { + createdAtDate: longDate(createdAt), + bumpedAtDate: longDate(bumpedAt), }); }, diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 67a54b2b515..b093ae2e2bd 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1962,7 +1962,6 @@ en: learn_more: "learn more..." - first_post: First post mute: Mute unmute: Unmute last_post: Posted @@ -2904,8 +2903,9 @@ en: other {} } - # This string uses the ICU Message Format. See https://meta.discourse.org/t/7035 for translation guidelines. - bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}" + bumped_at_title: | + First post: %{createdAtDate} + Posted: %{bumpedAtDate} browse_all_categories_latest: "Browse all categories or view latest topics." browse_all_categories_latest_or_top: "Browse all categories, view latest topics or see top:"