X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a6633642232efd164d4708967ab59e498fbff896..refs/pull/2902/head:/app/Entities/Tools/PageEditActivity.php diff --git a/app/Entities/Tools/PageEditActivity.php b/app/Entities/Tools/PageEditActivity.php index 79de5c827..a88dea830 100644 --- a/app/Entities/Tools/PageEditActivity.php +++ b/app/Entities/Tools/PageEditActivity.php @@ -1,4 +1,6 @@ -activePageEditingQuery(60)->get(); $count = $pageDraftEdits->count(); - $userMessage = $count > 1 ? trans('entities.pages_draft_edit_active.start_a', ['count' => $count]): trans('entities.pages_draft_edit_active.start_b', ['userName' => $pageDraftEdits->first()->createdBy->name]); + $userMessage = $count > 1 ? trans('entities.pages_draft_edit_active.start_a', ['count' => $count]) : trans('entities.pages_draft_edit_active.start_b', ['userName' => $pageDraftEdits->first()->createdBy->name]); $timeMessage = trans('entities.pages_draft_edit_active.time_b', ['minCount'=> 60]); + return trans('entities.pages_draft_edit_active.message', ['start' => $userMessage, 'time' => $timeMessage]); } /** * Get the message to show when the user will be editing one of their drafts. + * * @param PageRevision $draft + * * @return string */ public function getEditingActiveDraftMessage(PageRevision $draft): string @@ -51,6 +56,7 @@ class PageEditActivity if ($draft->page->updated_at->timestamp <= $draft->updated_at->timestamp) { return $message; } + return $message . "\n" . trans('entities.pages_draft_edited_notification'); }