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

FEATURE: add a 14 days window to consider topics new

This commit is contained in:
Régis Hanol 2014-01-24 00:22:04 +01:00
parent 714a40313d
commit 01cd63fff7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/preferences_controller.js
View File

@ -43,6 +43,7 @@ Discourse.PreferencesController = Discourse.ObjectController.extend({
{ name: I18n.t('user.new_topic_duration.after_n_days', { count: 1 }), value: 60 * 24 }, { name: I18n.t('user.new_topic_duration.after_n_days', { count: 1 }), value: 60 * 24 },
{ name: I18n.t('user.new_topic_duration.after_n_days', { count: 2 }), value: 60 * 48 }, { name: I18n.t('user.new_topic_duration.after_n_days', { count: 2 }), value: 60 * 48 },
{ name: I18n.t('user.new_topic_duration.after_n_weeks', { count: 1 }), value: 7 * 60 * 24 }, { name: I18n.t('user.new_topic_duration.after_n_weeks', { count: 1 }), value: 7 * 60 * 24 },
{ name: I18n.t('user.new_topic_duration.after_n_weeks', { count: 2 }), value: 2 * 7 * 60 * 24 },
{ name: I18n.t('user.new_topic_duration.last_here'), value: -2 }], { name: I18n.t('user.new_topic_duration.last_here'), value: -2 }],
saveButtonText: function() { saveButtonText: function() {
@ -52,8 +53,7 @@ Discourse.PreferencesController = Discourse.ObjectController.extend({
actions: { actions: {
save: function() { save: function() {
var self = this; var self = this;
this.set('saving', true); this.setProperties({ saving: true, saved: false });
this.set('saved', false);
// Cook the bio for preview // Cook the bio for preview
var model = this.get('model'); var model = this.get('model');

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

@ -332,7 +332,7 @@ en:
other: "they were posted in the last {{count}} days" other: "they were posted in the last {{count}} days"
after_n_weeks: after_n_weeks:
one: "they were posted in the last week" one: "they were posted in the last week"
other: "they were posted in the last {{count}} week" other: "they were posted in the last {{count}} weeks"
auto_track_topics: "Automatically track topics I enter" auto_track_topics: "Automatically track topics I enter"
auto_track_options: auto_track_options: