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

UI: we only intended to add the word "new" for new topics

This commit is contained in:
Sam 2014-03-10 13:40:49 +11:00
parent 1b66ed903f
commit e68e106be7
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars
View File

@ -30,13 +30,13 @@
{{topicStatus topic=topic}} {{topicStatus topic=topic}}
<a class='title' href="{{unbound topic.lastUnreadUrl}}">{{{unbound topic.fancy_title}}}</a> <a class='title' href="{{unbound topic.lastUnreadUrl}}">{{{unbound topic.fancy_title}}}</a>
{{#if unread}} {{#if unread}}
<a href="{{unbound topic.lastUnreadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unbound topic.unread}} {{i18n filters.unread.title.zero}}</a> <a href="{{unbound topic.lastUnreadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unbound topic.unread}}</a>
{{/if}} {{/if}}
{{#if topic.new_posts}} {{#if topic.new_posts}}
<a href="{{unbound topic.lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="new_posts"}}'>{{unbound topic.new_posts}} {{i18n filters.new.title.zero}}</a> <a href="{{unbound topic.lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="new_posts"}}'>{{unbound topic.new_posts}}</a>
{{/if}} {{/if}}
{{#if topic.unseen}} {{#if topic.unseen}}
<a href="{{unbound topic.lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'>{{i18n filters.new.title.zero}}</a> <a href="{{unbound topic.lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'>{{i18n filters.new.lower_title}}</a>
{{/if}} {{/if}}
</td> </td>

12
app/assets/javascripts/discourse/templates/discovery/categories.js.handlebars
View File

@ -20,10 +20,10 @@
{{#if controller.ordering}}<i class="fa fa-bars"></i>{{/if}} {{#if controller.ordering}}<i class="fa fa-bars"></i>{{/if}}
{{categoryLink this allowUncategorized=true}} {{categoryLink this allowUncategorized=true}}
{{#if unreadTopics}} {{#if unreadTopics}}
<a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n topic.unread_topics count="unreadTopics"}}'>{{unbound unreadTopics}} {{i18n filters.unread.title.zero}}</a> <a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n topic.unread_topics count="unreadTopics"}}'>{{unbound unreadTopics}}</a>
{{/if}} {{/if}}
{{#if newTopics}} {{#if newTopics}}
<a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n topic.new_topics count="newTopics"}}'>{{unbound newTopics}} {{i18n filters.new.title.zero}}</a> <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n topic.new_topics count="newTopics"}}'>{{i18n filters.new.lower_title_with_count count="newTopics"}}</a>
{{/if}} {{/if}}
</div> </div>
<div class='featured-users'> <div class='featured-users'>
@ -47,7 +47,7 @@
<a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n topic.unread_topics count="unreadTopics"}}'>{{unbound unreadTopics}}</a> <a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n topic.unread_topics count="unreadTopics"}}'>{{unbound unreadTopics}}</a>
{{/if}} {{/if}}
{{#if newTopics}} {{#if newTopics}}
<a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n topic.new_topics count="newTopics"}}'>{{unbound newTopics}} {{i18n filters.new.title.zero}}</a> <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n topic.new_topics count="newTopics"}}'>{{unbound newTopics}}</a>
{{/if}} {{/if}}
{{/each}} {{/each}}
</div> </div>
@ -59,13 +59,13 @@
{{topicStatus topic=this}} {{topicStatus topic=this}}
<a class='title' href="{{unbound lastUnreadUrl}}">{{{unbound fancy_title}}}</a> <a class='title' href="{{unbound lastUnreadUrl}}">{{{unbound fancy_title}}}</a>
{{#if unread}} {{#if unread}}
<a href="{{unbound lastUnreadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unread}} {{i18n filters.unread.title.zero}}</a> <a href="{{unbound lastUnreadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unread}}</a>
{{/if}} {{/if}}
{{#if new_posts}} {{#if new_posts}}
<a href="{{unbound lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="new_posts"}}'>{{new_posts}} {{i18n filters.new.title.zero}}</a> <a href="{{unbound lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="new_posts"}}'>{{new_posts}}</a>
{{/if}} {{/if}}
{{#if unseen}} {{#if unseen}}
<a href="{{unbound lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'>{{i18n filters.new.title.zero}}</a> <a href="{{unbound lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'>{{i18n filters.new.lower_title}}</a>
{{/if}} {{/if}}
{{#if controller.latestTopicOnly}} {{#if controller.latestTopicOnly}}

6
app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
View File

@ -14,13 +14,13 @@
{{topicStatus topic=this}} {{topicStatus topic=this}}
{{{topicLink this}}} {{{topicLink this}}}
{{#if unread}} {{#if unread}}
<a href="{{lastUnreadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unread}} {{i18n filters.unread.title.zero}}</a> <a href="{{lastUnreadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unread}}</a>
{{/if}} {{/if}}
{{#if displayNewPosts}} {{#if displayNewPosts}}
<a href="{{lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="displayNewPosts"}}'>{{displayNewPosts}} {{i18n filters.new.title.zero}}</a> <a href="{{lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="displayNewPosts"}}'>{{displayNewPosts}}</a>
{{/if}} {{/if}}
{{#if unseen}} {{#if unseen}}
<a href="{{lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'>{{i18n filters.new.title.zero}}</a> <a href="{{lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'>{{i18n filters.new.lower_title}}</a>
{{/if}} {{/if}}
{{#if hasExcerpt}} {{#if hasExcerpt}}

5
config/locales/client.en.yml
View File

@ -1177,6 +1177,11 @@ en:
other: "Unread ({{count}})" other: "Unread ({{count}})"
help: "topics you are watching or tracking with unread posts" help: "topics you are watching or tracking with unread posts"
new: new:
lower_title_with_count:
zero: ""
one: "1 new"
other: "{{count}} new"
lower_title: "new"
title: title:
zero: "New" zero: "New"
one: "New (1)" one: "New (1)"