diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 index 722cc675f7a..71ce0c9f0af 100644 --- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 +++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 @@ -1,6 +1,6 @@ import { createWidget } from 'discourse/widgets/widget'; import { h } from 'virtual-dom'; -import { smartShortDate } from 'discourse/lib/formatter'; +import { smartShortDate, relativeAge } from 'discourse/lib/formatter'; import { iconNode } from 'discourse/helpers/fa-icon'; const SCROLLAREA_HEIGHT = 300; @@ -205,7 +205,6 @@ export default createWidget('topic-timeline', { })); } - const result = [ h('div.timeline-controls', controls) ]; const stream = attrs.topic.get('postStream.stream'); if (stream.length > 2) { @@ -219,7 +218,7 @@ export default createWidget('topic-timeline', { this.attach('link', { className: 'now-date', icon: 'dot-circle-o', - label: 'topic.timeline.now', + rawLabel: relativeAge(new Date(topic.last_posted_at)), action: 'jumpBottom' }) ]); diff --git a/app/assets/stylesheets/desktop/topic-timeline.scss b/app/assets/stylesheets/desktop/topic-timeline.scss index a90dc9127e3..b16516c8ef0 100644 --- a/app/assets/stylesheets/desktop/topic-timeline.scss +++ b/app/assets/stylesheets/desktop/topic-timeline.scss @@ -22,6 +22,7 @@ } .start-date { + @include unselectable; color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); } @@ -77,6 +78,7 @@ } .now-date { + @include unselectable; display: inline-block; color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); margin-top: 0.5em; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 57df8db02b3..ffd4f498da8 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1290,7 +1290,6 @@ en: auto_close_immediate: "The last post in the topic is already %{hours} hours old, so the topic will be closed immediately." timeline: - now: "Now" replies: "%{current} / %{total} replies" progress: