Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Replace unnecessary Message Format string

This commit is contained in:
Gerhard Schlager 2022-12-10 15:50:37 +01:00 committed by Gerhard Schlager
parent 03f0b4f54b
commit 15f98f727a
3 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/discourse/app/models/bookmark.js
View File

@ -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),
});
},

13
app/assets/javascripts/discourse/app/models/topic.js
View File

@ -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),
});
},

6
config/locales/client.en.yml
View File

@ -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: "<a href='%{basePath}/categories'>Browse all categories</a> or <a href='%{basePath}/latest'>view latest topics</a>."
browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Browse all categories</a>, <a href='%{basePath}/latest'>view latest topics</a> or see top:"