diff --git a/src/App.vue b/src/App.vue index e1c0f5dc..ca114c89 100644 --- a/src/App.vue +++ b/src/App.vue @@ -61,7 +61,6 @@ - diff --git a/src/boot/after_store.js b/src/boot/after_store.js index 7fed3bc3..9f0ff4d3 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -398,8 +398,6 @@ const afterStoreSetup = async ({ store, i18n }) => { store.dispatch('startFetchingAnnouncements') getTOS({ store }) getStickers({ store }) - store.dispatch('getSupportedTranslationlanguages') - store.dispatch('getSettingsProfile') const router = createRouter({ history: createWebHistory(), diff --git a/src/i18n/en.json b/src/i18n/en.json index e168994b..af66f2ae 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -892,6 +892,11 @@ "word_filter": "Word filter", "wordfilter": "Wordfilter" }, + "settings_profile": { + "synchronizing": "Synchronizing setting profile \"{profile}\"...", + "synchronized": "Synchronized settings!", + "synchronization_error": "Could not synchronize settings: {err}" + }, "status": { "ancestor_follow": "See {numReplies} other reply under this post | See {numReplies} other replies under this post", "ancestor_follow_with_icon": "{icon} {text}", diff --git a/src/modules/config.js b/src/modules/config.js index ac24b99e..f0055c3c 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -165,8 +165,9 @@ const config = { syncSettings: (store) => { store.commit('setOption', { name: 'profileVersion', value: store.state.profileVersion + 1 }) const notice = { - level: 'warning', - messageKey: 'settingsProfile.synchronizing', + level: 'info', + messageKey: 'settings_profile.synchronizing', + messageArgs: { profile: store.state.profile }, timeout: 5000 } store.dispatch('pushGlobalNotice', notice) @@ -176,14 +177,15 @@ const config = { store.dispatch('removeGlobalNotice', notice) store.dispatch('pushGlobalNotice', { level: 'success', - messageKey: 'settingsProfile.synchronized', + messageKey: 'settings_profile.synchronized', + messageArgs: { profile: store.state.profile }, timeout: 2000 }) }).catch((err) => { store.dispatch('removeGlobalNotice', notice) store.dispatch('pushGlobalNotice', { level: 'error', - messageKey: 'settingsProfile.synchronizationError', + messageKey: 'settings_profile.synchronization_error', messageArgs: { error: err.message }, timeout: 5000 }) @@ -231,12 +233,16 @@ const config = { } }, getSettingsProfile (store) { + console.log('getSettingsProfile') const profile = store.state.profile store.rootState.api.backendInteractor.getSettingsProfile({ store, profileName: profile }) .then(({ settings, version }) => { + console.log('found settings version', version) if (version > store.state.profileVersion) { store.commit('setOption', { name: 'profileVersion', value: version }) store.dispatch('loadSettings', settings) + } else { + console.log('settings are up to date') } }) .catch((err) => { @@ -245,7 +251,7 @@ const config = { // create profile store.dispatch('pushGlobalNotice', { level: 'warning', - messageKey: 'settingsProfile.creating', + messageKey: 'settings_profile.creating', timeout: 5000 }) store.dispatch('syncSettings') diff --git a/src/modules/users.js b/src/modules/users.js index 02a9e361..f51d9717 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -581,6 +581,8 @@ const users = { store.dispatch('setLayoutWidth', windowWidth()) store.dispatch('setLayoutHeight', windowHeight()) + store.dispatch('getSupportedTranslationlanguages') + store.dispatch('getSettingsProfile') // Fetch our friends store.rootState.api.backendInteractor.fetchFriends({ id: user.id })