github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 17:23:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2759 from techAPJ/patch-2

Browse Source 
Add education panel for starred tab
This commit is contained in:
Jeff Atwood 2014-09-04 23:47:44 -07:00
commit 8b634b5f0f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
View File

@ -153,7 +153,7 @@ var controllerOpts = {
var split = this.get('filter').split('/');
if (split[0] !== 'new' && split[0] !== 'unread') { return; }
if (split[0] !== 'new' && split[0] !== 'unread' && split[0] !== 'starred') { return; }
return I18n.t("topics.none.educate." + split[0], {
userPrefsUrl: Discourse.getURL("/users/") + (Discourse.User.currentProp("username_lower")) + "/preferences"

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

@ -781,6 +781,7 @@ en:
educate:
new: '<p>By default, topics are considered new when they were created in the last 2 days.</p><p>You can change this in your <a href="%{userPrefsUrl}">preferences</a>.</p>'
unread: '<p>By default, unread indicators will only appear for topics that you have:</p><ul><li>Created</li><li>Replied to</li><li>Read for more than 4 minutes</li></ul><p>Or, if you have explicitly set the topic to Tracked or Watched via the notification control at the bottom of each topic.</p><p>You can change this in your <a href="%{userPrefsUrl}">preferences</a>.</p>'
starred: '<p>Topics that you have starred will appear here.</p>'
bottom:
latest: "There are no more latest topics."
hot: "There are no more hot topics."