diff --git a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs index d73d41dad9..086560451b 100644 --- a/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs +++ b/app/assets/javascripts/admin/addon/templates/admin-badges/show.hbs @@ -286,10 +286,10 @@ {{#if this.grant_count}}
- {{i18n - "badges.granted" - count=this.grant_count - }} + + {{number this.grant_count}} + {{i18n "badges.awarded"}} +
{{/if}} \ No newline at end of file diff --git a/app/assets/javascripts/discourse/app/components/badge-card.hbs b/app/assets/javascripts/discourse/app/components/badge-card.hbs index 4a6fe7a13c..eca0ebef94 100644 --- a/app/assets/javascripts/discourse/app/components/badge-card.hbs +++ b/app/assets/javascripts/discourse/app/components/badge-card.hbs @@ -41,15 +41,16 @@
{{html-safe this.summary}}
{{#if this.displayCount}} -
- {{html-safe - (i18n - "badges.granted_with_count" - count=this.displayCount - badgeUrl=this.url - ) - }} -
+ + + {{number this.displayCount}} + {{i18n "badges.awarded"}} + + {{/if}} diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss index acc9f02631..204330fb77 100644 --- a/app/assets/stylesheets/common/base/user-badges.scss +++ b/app/assets/stylesheets/common/base/user-badges.scss @@ -132,7 +132,10 @@ } .badge-granted { + display: block; margin-top: 0.5em; + color: var(--primary-medium); + font-size: var(--font-down-1); } .grant-count { @@ -191,9 +194,6 @@ } .badge-info { - display: flex; - flex: 1 1 auto; - align-items: center; color: var(--primary); h3 { @@ -216,7 +216,6 @@ } .badge-contents { - padding: 0 5%; h3 { font-size: var(--font-up-3); } diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 61c6647334..4bc3d13b70 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -4121,9 +4121,7 @@ en: granted: one: "%{count} granted" other: "%{count} granted" - granted_with_count: - one: '%{count}x granted' - other: '%{count}x granted' + awarded: awarded select_badge_for_title: Select a badge to use as your title none: "(none)" successfully_granted: "Successfully granted %{badge} to %{username}"