Skip to content

Commit

Permalink
🐷 💄 Tiny theme-related improvements (#8532)
Browse files Browse the repository at this point in the history
refs #8530

- display theme name for non-fatal errors
- minor wording tweak
- remove duplicate lodash require
- use the shiny new calculated property syntax
  • Loading branch information
ErisDS authored and kirrg001 committed Jun 6, 2017
1 parent 9d356de commit 3996b5d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion core/server/themes/active.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ var _ = require('lodash'),
themeConfig = require('./config'),
config = require('../config'),
engine = require('./engine'),
_ = require('lodash'),
// Current instance of ActiveTheme
currentActiveTheme;

Expand Down
5 changes: 3 additions & 2 deletions core/server/themes/to-json.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ module.exports = function toJSON(name, checkedTheme) {
themeResult = packages.filterPackages(toFilter, settingsCache.get('active_theme'));
} else {
// If we pass in a gscan result, convert this instead
toFilter = {};
toFilter[name] = themeList.get(name);
toFilter = {
[name]: themeList.get(name)
};

themeResult = packages.filterPackages(toFilter, settingsCache.get('active_theme'));

Expand Down
2 changes: 1 addition & 1 deletion core/server/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"themehandler": {
"missingTheme": "The currently active theme \"{theme}\" is missing.",
"invalidTheme": "The currently active theme \"{theme}\" is invalid.",
"themeHasErrors": "The currently active theme has errors, but theme still works."
"themeHasErrors": "The currently active theme \"{theme}\" has errors, but will still work."
}
},
"utils": {
Expand Down

0 comments on commit 3996b5d

Please sign in to comment.