github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 00:27:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: allow admins to enter badge long descriptions

Browse Source 
FIX: fallback to description if badge long description is missing

Also moves all badge localization into server.en, this slims the client down

serializers pass down localized names/descriptions/long descriptions
This commit is contained in:
Sam
2016-03-28 18:38:38 +11:00
parent 94f831f7e7
commit fe51f84aa7
20 changed files with 284 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
View File

@ -61,7 +61,7 @@ export default Ember.ArrayController.extend({
}
});
return _.sortBy(badges, badge => badge.get('displayName'));
return _.sortBy(badges, badge => badge.get('name'));
}.property('badges.@each', 'model.@each'),
/**