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

fix(language): load locale during build of app.vue

Browse Source
This commit is contained in:
SabreCat
2021-11-18 11:00:01 -06:00
parent 30a5c3f91b
commit c7c17dbb55
2 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/client/src/app.vue
View File

@@ -406,7 +406,10 @@ export default {
this.$store.state.isUserLoaded = true; this.$store.state.isUserLoaded = true;
Analytics.setUser(); Analytics.setUser();
Analytics.updateUser(); Analytics.updateUser();
return axios.get('/api/v4/i18n/browser-script', { language: this.user.preferences.language });
}).then(() => {
const i18nData = window && window['habitica-i18n'];
this.$loadLocale(i18nData);
this.hideLoadingScreen(); this.hideLoadingScreen();
// Adjust the timezone offset // Adjust the timezone offset

10
website/client/src/libs/i18n.js
View File

@@ -4,9 +4,7 @@
import moment from 'moment'; import moment from 'moment';
import i18n from '@/../../common/script/i18n'; import i18n from '@/../../common/script/i18n';
export default { function loadLocale (i18nData) {
install (Vue, { i18nData }) {
if (i18nData) {
// Load i18n strings // Load i18n strings
i18n.strings = i18nData.strings; i18n.strings = i18nData.strings;
@@ -27,6 +25,12 @@ export default {
} }
} }
export default {
install (Vue, { i18nData }) {
if (i18nData) loadLocale(i18nData);
Vue.prototype.$loadLocale = loadLocale;
Vue.prototype.$t = function translateString (...args) { Vue.prototype.$t = function translateString (...args) {
return i18n.t.apply(null, [...args]); return i18n.t.apply(null, [...args]);
}; };