mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-03 23:17:43 +02:00
Code Issues Releases Wiki Activity

Use dayjs, not moment.js

Browse Source 
Refs flarum/core#2219.
This commit is contained in:
Franz Liedke
2020-08-28 18:30:52 +02:00
parent fb01d767c7
commit 400a9a6267
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/suspend/js/src/forum/components/SuspendUserModal.js
View File

@@ -16,7 +16,7 @@ export default class SuspendUserModal extends Modal {
} }
this.status = m.prop(status); this.status = m.prop(status);
this.daysRemaining = m.prop(status === 'limited' && -moment().diff(until, 'days') + 1); this.daysRemaining = m.prop(status === 'limited' && -dayjs().diff(until, 'days') + 1);
} }
className() { className() {
@@ -88,7 +88,7 @@ export default class SuspendUserModal extends Modal {
break; break;
case 'limited': case 'limited':
suspendedUntil = moment().add(this.daysRemaining(), 'days').toDate(); suspendedUntil = dayjs().add(this.daysRemaining(), 'days').toDate();
break; break;
default: default:

2
extensions/suspend/js/src/forum/components/UserSuspendedNotification.js
View File

@@ -12,7 +12,7 @@ export default class UserSuspendedNotification extends Notification {
content() { content() {
const notification = this.props.notification; const notification = this.props.notification;
const suspendedUntil = notification.content(); const suspendedUntil = notification.content();
const timeReadable = moment(suspendedUntil.date).from(notification.createdAt(), true); const timeReadable = dayjs(suspendedUntil.date).from(notification.createdAt(), true);
return app.translator.trans('flarum-suspend.forum.notifications.user_suspended_text', { return app.translator.trans('flarum-suspend.forum.notifications.user_suspended_text', {
user: notification.fromUser(), user: notification.fromUser(),