krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 14:17:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

moving developer-only strings to api messages (#10188)

Browse Source 
* move translatable string to apiMessages

* use apiMessages instead of res.t for groupIdRequired / keepOrRemove

* move pageMustBeNumber to apiMessages

* change apimessages

* move missingKeyParam to apiMessages

* move more strings to apiMessages

* fix lint

* revert lodash imports to fix tests

* fix webhook test

* fix test

* rollback key change of `keepOrRemove`

* remove unneeded `req.language` param

*  extract more messages from i18n

* add missing `missingTypeParam` message
This commit is contained in:
negue
2018-04-14 16:13:13 +02:00
committed by Matteo Pagliazzi
parent d05d2fb9d7
commit a42cb0e3ab
55 changed files with 179 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/common/script/ops/equip.js
View File

@@ -6,6 +6,7 @@ import {
BadRequest,
} from '../libs/errors';
import get from 'lodash/get';
import apiMessages from '../../../server/libs/apiMessages';
module.exports = function equip (user, req = {}) {
// Being type a parameter followed by another parameter
@@ -13,9 +14,9 @@ module.exports = function equip (user, req = {}) {
let type = get(req, 'params.type', 'equipped');
let key = get(req, 'params.key');
if (!key || !type) throw new BadRequest(i18n.t('missingTypeKeyEquip', req.language));
if (!key || !type) throw new BadRequest(apiMessages('missingTypeKeyEquip'));
if (['mount', 'pet', 'costume', 'equipped'].indexOf(type) === -1) {
throw new BadRequest(i18n.t('invalidTypeEquip', req.language));
throw new BadRequest(apiMessages('invalidTypeEquip'));
}
let message;