Merge pull request #4119 from techAPJ/badge-fix

FIX: badge display name should be translated from server.en.yml file
2016-03-29 05:43:15 +11:00 · 2016-03-29 05:43:15 +11:00 · 68fd1d790b
parent c53ef51c91 bae836c7c5
commit 68fd1d790b
1 changed files with 1 additions and 1 deletions
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@ -379,7 +379,7 @@ SQL

  def display_name
    if self.system?
-      key = "admin_js.badges.badge.#{i18n_name}.name"
+      key = "badges.#{i18n_name}.name"
      I18n.t(key, default: self.name)
    else
      self.name