diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs index d9286ef5800..cc6310768a0 100644 --- a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs @@ -4,8 +4,19 @@ {{/if}} {{report.title}} -{{report.todayCount}} -{{report.yesterdayCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}} -{{report.lastSevenDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}} -{{report.lastThirtyDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}} -{{report.total}} + +{{number report.todayCount}} + + + {{number report.yesterdayCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}} + + + + {{number report.lastSevenDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}} + + + + {{number report.lastThirtyDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}} + + +{{number report.total}} diff --git a/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs b/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs index c78e2630035..3db7af1daa2 100644 --- a/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs @@ -1,6 +1,6 @@ {{report.title}} -{{#link-to 'adminUsersList.show' 'newuser'}}{{value-at-tl report.data level="0"}}{{/link-to}} -{{#link-to 'adminUsersList.show' 'basic'}}{{value-at-tl report.data level="1"}}{{/link-to}} -{{#link-to 'adminUsersList.show' 'member'}}{{value-at-tl report.data level="2"}}{{/link-to}} -{{#link-to 'adminUsersList.show' 'regular'}}{{value-at-tl report.data level="3"}}{{/link-to}} -{{#link-to 'adminUsersList.show' 'leader'}}{{value-at-tl report.data level="4"}}{{/link-to}} +{{#link-to 'adminUsersList.show' 'newuser'}}{{number (value-at-tl report.data level="0")}}{{/link-to}} +{{#link-to 'adminUsersList.show' 'basic'}}{{number (value-at-tl report.data level="1")}}{{/link-to}} +{{#link-to 'adminUsersList.show' 'member'}}{{number (value-at-tl report.data level="2")}}{{/link-to}} +{{#link-to 'adminUsersList.show' 'regular'}}{{number (value-at-tl report.data level="3")}}{{/link-to}} +{{#link-to 'adminUsersList.show' 'leader'}}{{number (value-at-tl report.data level="4")}}{{/link-to}} diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs index ec7753ac6c9..fbb0eb46b13 100644 --- a/app/assets/javascripts/admin/templates/dashboard.hbs +++ b/app/assets/javascripts/admin/templates/dashboard.hbs @@ -228,7 +228,7 @@ - {{data.num_clicks}} + {{number data.num_clicks}} {{/each}} @@ -248,8 +248,8 @@ {{s.domain}} - {{s.num_clicks}} - {{s.num_topics}} + {{number s.num_clicks}} + {{number s.num_topics}} {{/each}} @@ -261,16 +261,16 @@ {{top_referrers.title}} ({{i18n 'admin.dashboard.reports.last_30_days'}}) - {{top_referrers.ytitles.num_clicks}} - {{top_referrers.ytitles.num_topics}} + {{number top_referrers.ytitles.num_clicks}} + {{number top_referrers.ytitles.num_topics}} {{#each top_referrers.data as |r|}} {{#link-to 'adminUser' r.user_id r.username}}{{unbound r.username}}{{/link-to}} - {{r.num_clicks}} - {{r.num_topics}} + {{number r.num_clicks}} + {{number r.num_topics}} {{/each}} diff --git a/app/assets/javascripts/admin/templates/groups-type.hbs b/app/assets/javascripts/admin/templates/groups-type.hbs index d1d2223c2b3..6c9986fcb39 100644 --- a/app/assets/javascripts/admin/templates/groups-type.hbs +++ b/app/assets/javascripts/admin/templates/groups-type.hbs @@ -6,7 +6,7 @@
  • {{#link-to "adminGroup" group.type group.name}}{{group.name}} {{#if group.userCountDisplay}} - {{group.userCountDisplay}} + {{number group.userCountDisplay}} {{/if}} {{/link-to}}
  • diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs index 879161e3d48..f18ce56b4b7 100644 --- a/app/assets/javascripts/admin/templates/users-list-show.hbs +++ b/app/assets/javascripts/admin/templates/users-list-show.hbs @@ -55,8 +55,8 @@ {{unbound user.email}} {{{unbound user.last_emailed_age}}} {{{unbound user.last_seen_age}}} - {{{unbound user.topics_entered}}} - {{{unbound user.posts_read_count}}} + {{number user.topics_entered}} + {{number user.posts_read_count}} {{{unbound user.time_read}}} {{{unbound user.created_at_age}}} diff --git a/app/assets/javascripts/discourse/helpers/application.js.es6 b/app/assets/javascripts/discourse/helpers/application.js.es6 index 05306c0e62f..455a2b9fb9d 100644 --- a/app/assets/javascripts/discourse/helpers/application.js.es6 +++ b/app/assets/javascripts/discourse/helpers/application.js.es6 @@ -11,9 +11,9 @@ registerUnbound('number', (orig, params) => { orig = parseInt(orig, 10); if (isNaN(orig)) { orig = 0; } - let title = orig; + let title = I18n.toNumber(orig, { precision: 0 }); if (params.numberKey) { - title = I18n.t(params.numberKey, { number: orig }); + title = I18n.t(params.numberKey, { number: title }); } let classNames = 'number'; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index ee066861dfa..4f78ac68218 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2081,7 +2081,9 @@ en: one: "view" other: "views" replies: "Replies" - views_long: "this topic has been viewed {{number}} times" + views_long: + one: "this topic has been viewed 1 time" + other: "this topic has been viewed {{number}} times" activity: "Activity" likes: "Likes" likes_lowercase: