From fcd87affad2d22b3389b33176ed97783adaa2e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 30 Mar 2022 12:50:20 +0200
Subject: [PATCH] :bug: Fix `defaultLocale` watcher

---
 packages/editor-ui/src/App.vue            | 6 +++++-
 packages/editor-ui/src/views/NodeView.vue | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue
index c4f6abfa8c..172362d94b 100644
--- a/packages/editor-ui/src/App.vue
+++ b/packages/editor-ui/src/App.vue
@@ -28,6 +28,7 @@ import { showMessage } from './components/mixins/showMessage';
 import { IUser } from './Interface';
 import { mapGetters } from 'vuex';
 import { userHelpers } from './components/mixins/userHelpers';
+import { loadLanguage } from './plugins/i18n';
 
 export default mixins(
 	showMessage,
@@ -40,7 +41,7 @@ export default mixins(
 		Modals,
 	},
 	computed: {
-		...mapGetters('settings', ['isHiringBannerEnabled', 'isTemplatesEnabled', 'isTemplatesEndpointReachable', 'isUserManagementEnabled', 'showSetupPage']),
+		...mapGetters('settings', ['defaultLocale', 'isHiringBannerEnabled', 'isTemplatesEnabled', 'isTemplatesEndpointReachable', 'isUserManagementEnabled', 'showSetupPage']),
 		...mapGetters('users', ['currentUser']),
 	},
 	data() {
@@ -160,6 +161,9 @@ export default mixins(
 
 			this.trackPage();
 		},
+		'$store.getters.defaultLocale'(newLocale) {
+			loadLanguage(newLocale);
+		},
 	},
 });
 </script>
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index f30472ee79..966bba57a7 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -170,7 +170,6 @@ import {
 import { mapGetters } from 'vuex';
 
 import {
-	loadLanguage,
 	addNodeTranslation,
 	addHeaders,
 } from '@/plugins/i18n';
@@ -232,9 +231,6 @@ export default mixins(
 				deep: true,
 			},
 
-			async defaultLocale (newLocale, oldLocale) {
-				loadLanguage(newLocale);
-			},
 		},
 		async beforeRouteLeave(to, from, next) {
 			const result = this.$store.getters.getStateIsDirty;