Merge branch 'develop' into sabrecat/teams-rebase

This commit is contained in:
SabreCat
2022-07-18 15:50:20 -05:00
17 changed files with 782 additions and 743 deletions

View File

@@ -417,7 +417,15 @@ export default {
this.$store.state.isUserLoaded = true;
Analytics.setUser();
Analytics.updateUser();
return axios.get('/api/v4/i18n/browser-script', { language: this.user.preferences.language });
return axios.get('/api/v4/i18n/browser-script',
{
language: this.user.preferences.language,
headers: {
'Cache-Control': 'no-cache',
Pragma: 'no-cache',
Expires: '0',
},
});
}).then(() => {
const i18nData = window && window['habitica-i18n'];
this.$loadLocale(i18nData);