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

Merge branch 'master' of http://github.com/discourse/discourse

This commit is contained in:
cpradio 2014-08-30 08:20:57 -04:00
parent 3853fb1367 fb33081c36
commit 4aec030cb6
6 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/topic-entrance.js.es6
View File

@ -8,12 +8,12 @@ function entranceDate(dt, showTime) {
if (dt.getYear() === today.getYear()) {
// No year
return moment(dt).format(
showTime ? I18n.t("dates.long_no_year") : I18n.t("dates.long_no_year_no_time")
showTime ? I18n.t("dates.long_date_without_year") : I18n.t("dates.long_no_year_no_time")
);
}
return moment(dt).format(
showTime ? I18n.t('dates.long_with_year') : I18n.t('dates.long_with_year_no_time')
showTime ? I18n.t('dates.long_date_with_year') : I18n.t('dates.long_date_with_year_without_time')
);
}

4
app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars
View File

@ -95,7 +95,9 @@
{{/if}}
{{#if latest}}
<div class="education">
{{{footerEducation}}}
</div>
<h3>
{{footerMessage}}
{{#if can_create_topic}}<a href='#' {{action createTopic}}>{{i18n topic.suggest_create_topic}}</a>{{/if}}
@ -106,7 +108,9 @@
{{#link-to "discovery.categories"}}{{i18n topic.browse_all_categories}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}} {{i18n or}} {{i18n filters.top.other_periods}}
{{top-period-buttons period=period}}
{{else}}
<div class="education">
{{{footerEducation}}}
</div>
<h3>
{{footerMessage}}{{#link-to "discovery.categories"}} {{i18n topic.browse_all_categories}}{{/link-to}} {{i18n or}} {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}}
</h3>

1
app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.js.handlebars
View File

@ -28,7 +28,6 @@
<li>{{{i18n keyboard_shortcuts_help.application.user_profile_menu}}}</li>
<li>{{{i18n keyboard_shortcuts_help.application.show_incoming_updated_topics}}}</li>
<li>{{{i18n keyboard_shortcuts_help.application.search}}}</li>
<li>{{{i18n keyboard_shortcuts_help.application.show_incoming_updated}}}</li>
<li>{{{i18n keyboard_shortcuts_help.application.help}}}</li>
<li>{{{i18n keyboard_shortcuts_help.application.dismiss_new_posts}}}</li>
<li>{{{i18n keyboard_shortcuts_help.application.dismiss_topics}}}</li>

4
app/assets/stylesheets/common/base/_topic-list.scss
View File

@ -308,3 +308,7 @@ ol.category-breadcrumb {
.top-title-buttons {
display: inline;
}
div.education {
color: scale-color($primary, $lightness: 50%);
}

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

@ -37,6 +37,7 @@ en:
long_with_year_no_time: "MMM D, YYYY"
long_date_with_year: "MMM D, 'YY LT"
long_date_without_year: "MMM D, LT"
long_date_with_year_without_time: "MMM D, 'YY"
tiny:
half_a_minute: "< 1m"
less_than_x_seconds:
@ -66,7 +67,7 @@ en:
almost_x_years:
one: "1y"
other: "%{count}y"
date_month: "D MMM"
date_month: "MMM D"
date_year: "MMM 'YY"
medium:
x_minutes:
@ -78,7 +79,7 @@ en:
x_days:
one: "1 day"
other: "%{count} days"
date_year: "D MMM YYYY"
date_year: "MMM D, 'YY"
medium_with_ago:
x_minutes:
one: "1 min ago"
@ -544,7 +545,7 @@ en:
last_post_lowercase: last post
summary:
enabled_description: "You're viewing a summary of this topic: just the most interesting posts as determined by the community. To see all posts again, click below."
enabled_description: "You're viewing a summary of this topic: the most interesting posts as determined by the community."
description: "There are <b>{{count}}</b> replies."
description_time: "There are <b>{{count}}</b> replies with an estimated read time of <b>{{readingTime}} minutes</b>."
enable: 'Summarize This Topic'

4
test/javascripts/lib/formatter-test.js.es6
View File

@ -29,7 +29,7 @@ var formatDays = function(days) {
};
var shortDate = function(days){
return moment().subtract(days, 'days').format('D MMM');
return moment().subtract(days, 'days').format('MMM D');
};
test("formating medium length dates", function() {
@ -40,7 +40,7 @@ test("formating medium length dates", function() {
};
var shortDateYear = function(days){
return moment().subtract(days, 'days').format('D MMM YYYY');
return moment().subtract(days, 'days').format("MMM D, 'YY");
};
leaveAgo = true;