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

Merge branch 'develop' into release

Browse Source
This commit is contained in:
Sabe Jones
2020-04-16 15:17:56 -05:00
parent 88183149c5 a8f397c674
commit c8189360d6
55 changed files with 1076 additions and 1040 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/server/controllers/api-v3/content.js
View File

@@ -1,6 +1,6 @@
import nconf from 'nconf';
import { langCodes } from '../../libs/i18n';
import { CONTENT_CACHE_PATH, getLocalizedContent } from '../../libs/content';
import { CONTENT_CACHE_PATH, getLocalizedContentResponse } from '../../libs/content';
const IS_PROD = nconf.get('IS_PROD');
@@ -72,7 +72,7 @@ api.getContent = {
'Content-Type': 'application/json',
});
const jsonResString = getLocalizedContent(language);
const jsonResString = getLocalizedContentResponse(language);
res.status(200).send(jsonResString);
}
},

6
website/server/controllers/api-v3/groups.js
View File

@@ -607,9 +607,11 @@ api.joinGroup = {
let promises = [group.save(), user.save()];
if (inviter) {
inviter = await User.findById(inviter).exec();
// Load the inviter
if (inviter) inviter = await User.findById(inviter).exec();
// Check the inviter again, could be a deleted account
if (inviter) {
const data = {
headerText: common.i18n.t('invitationAcceptedHeader', inviter.preferences.language),
bodyText: common.i18n.t('invitationAcceptedBody', {