FIX: Use prioritize_username_in_ux in post notices.

This commit is contained in:
Dan Ungureanu 2019-03-13 21:16:09 +02:00
parent 77931b70c3
commit 18ff790e79
No known key found for this signature in database
GPG Key ID: 0AA2A00D6ACC8B84
2 changed files with 37 additions and 5 deletions

View File

@ -431,15 +431,25 @@ createWidget("post-contents", {
createWidget("post-notice", { createWidget("post-notice", {
tagName: "div.post-notice", tagName: "div.post-notice",
buildClasses(attrs) {
if (attrs.postNoticeType === "first") {
return ["new-user"];
} else if (attrs.postNoticeType === "returning") {
return ["returning-user"];
}
return [];
},
html(attrs) { html(attrs) {
const user = this.siteSettings.prioritize_username_in_ux || !attrs.name ? attrs.username : attrs.name;
let text, icon; let text, icon;
if (attrs.postNoticeType === "first") { if (attrs.postNoticeType === "first") {
icon = "hands-helping"; icon = "hands-helping";
text = I18n.t("post.notice.first", { user: attrs.username }); text = I18n.t("post.notice.first", { user });
} else if (attrs.postNoticeType === "returning") { } else if (attrs.postNoticeType === "returning") {
icon = "far-smile"; icon = "far-smile";
text = I18n.t("post.notice.return", { text = I18n.t("post.notice.return", {
user: attrs.username, user,
time: relativeAge(attrs.postNoticeTime, { time: relativeAge(attrs.postNoticeTime, {
format: "tiny", format: "tiny",
addAgo: true addAgo: true

View File

@ -853,21 +853,43 @@ widgetTest("pm map", {
} }
}); });
widgetTest("post notice", { widgetTest("post notice - with username", {
template: '{{mount-widget widget="post" args=args}}', template: '{{mount-widget widget="post" args=args}}',
beforeEach() { beforeEach() {
this.siteSettings.prioritize_username_in_ux = true;
this.set("args", { this.set("args", {
postNoticeType: "returning", postNoticeType: "returning",
postNoticeTime: new Date("2010-01-01 12:00:00 UTC"), postNoticeTime: new Date("2010-01-01 12:00:00 UTC"),
username: "codinghorror" username: "codinghorror",
name: "Jeff"
}); });
}, },
test(assert) { test(assert) {
assert.equal( assert.equal(
find(".post-notice") find(".post-notice.returning-user")
.text() .text()
.trim(), .trim(),
I18n.t("post.notice.return", { user: "codinghorror", time: "Jan '10" }) I18n.t("post.notice.return", { user: "codinghorror", time: "Jan '10" })
); );
} }
}); });
widgetTest("post notice - with name", {
template: '{{mount-widget widget="post" args=args}}',
beforeEach() {
this.siteSettings.prioritize_username_in_ux = false;
this.set("args", {
postNoticeType: "first",
username: "codinghorror",
name: "Jeff"
});
},
test(assert) {
assert.equal(
find(".post-notice.new-user")
.text()
.trim(),
I18n.t("post.notice.first", { user: "Jeff", time: "Jan '10" })
);
}
});