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

DEV: use the format-age helper on the DnD button on the new user menu (#18108)

This commit is contained in:
Andrei Prigorshnev 2022-08-29 15:21:07 +04:00 committed by GitHub
parent bad78bfdfb
commit bbdffff41f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.hbs
View File

@ -77,14 +77,7 @@
<span class="item-label"> <span class="item-label">
{{#if this.isInDoNotDisturb}} {{#if this.isInDoNotDisturb}}
<span>{{i18n "do_not_disturb.label"}}</span> <span>{{i18n "do_not_disturb.label"}}</span>
<span {{format-age this.doNotDisturbDateTime}}
title={{this.doNotDisturbDateTitle}}
data-time={{this.doNotDisturbDateTime}}
data-format="tiny"
class="relative-date"
>
{{this.doNotDisturbDateContent}}
</span>
{{else}} {{else}}
{{i18n "do_not_disturb.label"}} {{i18n "do_not_disturb.label"}}
{{/if}} {{/if}}

9
app/assets/javascripts/discourse/app/components/user-menu/profile-tab-content.js
View File

@ -2,7 +2,6 @@ import Component from "@glimmer/component";
import { inject as service } from "@ember/service"; import { inject as service } from "@ember/service";
import { action } from "@ember/object"; import { action } from "@ember/object";
import showModal from "discourse/lib/show-modal"; import showModal from "discourse/lib/show-modal";
import { longDate, relativeAge } from "discourse/lib/formatter";
export default class UserMenuProfileTabContent extends Component { export default class UserMenuProfileTabContent extends Component {
@service currentUser; @service currentUser;
@ -22,14 +21,6 @@ export default class UserMenuProfileTabContent extends Component {
return !!this.#doNotDisturbUntilDate; return !!this.#doNotDisturbUntilDate;
} }
get doNotDisturbDateTitle() {
return longDate(this.#doNotDisturbUntilDate);
}
get doNotDisturbDateContent() {
return relativeAge(this.#doNotDisturbUntilDate);
}
get doNotDisturbDateTime() { get doNotDisturbDateTime() {
return this.#doNotDisturbUntilDate.getTime(); return this.#doNotDisturbUntilDate.getTime();
} }