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

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

Browse Source 
This reverts commit a42cb0e3ab. Testing hypothesis that this was causing Staging to break.
This commit is contained in:
SabreCat
2018-04-15 17:09:15 +00:00
parent ac98aa9271
commit 9f06d78db6
55 changed files with 136 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/common/script/ops/hatch.js
View File

@@ -6,14 +6,13 @@ import {
NotAuthorized,
NotFound,
} from '../libs/errors';
import apiMessages from '../../../server/libs/apiMessages';
module.exports = function hatch (user, req = {}) {
let egg = get(req, 'params.egg');
let hatchingPotion = get(req, 'params.hatchingPotion');
if (!(egg && hatchingPotion)) {
throw new BadRequest(apiMessages('missingEggHatchingPotion'));
throw new BadRequest(i18n.t('missingEggHatchingPotionHatch', req.language));
}
if (!(user.items.eggs[egg] > 0 && user.items.hatchingPotions[hatchingPotion] > 0)) {