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

Merge pull request #4119 from techAPJ/badge-fix 

FIX: badge display name should be translated from server.en.yml file
This commit is contained in:
Sam 2016-03-29 05:43:15 +11:00
parent c53ef51c91 bae836c7c5
commit 68fd1d790b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/badge.rb
View File

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