Merge pull request #3790 from gschlager/i18n-patch1

FIX: Show translated badge name
2015-09-19 22:43:16 +02:00 · 2015-09-19 22:43:16 +02:00 · 12085f98db
parent 0717517332 caa1a8231b
commit 12085f98db
1 changed files with 1 additions and 1 deletions
--- a/app/assets/javascripts/admin/templates/user_badges.hbs
+++ b/app/assets/javascripts/admin/templates/user_badges.hbs
@ -16,7 +16,7 @@
    <form class="form-horizontal">
      <div>
      <label>{{i18n 'admin.badges.badge'}}</label>
-      {{combo-box valueAttribute="id" value=controller.selectedBadgeId content=controller.grantableBadges}}
+      {{combo-box valueAttribute="id" value=controller.selectedBadgeId content=controller.grantableBadges nameProperty="displayName"}}
      </div>
      <label>
      <label>{{i18n 'admin.badges.reason'}}</label>