fix: cannot work watchLocale on vue-i18n-bridge (#1411)

kazupon · Nov 2, 2021 · ac276e2 · ac276e2
1 parent 584d02b
commit ac276e2
Showing 1 changed file with 21 additions and 11 deletions.
diff --git a/src/index.js b/src/index.js
@@ -267,17 +267,27 @@ export default class VueI18n {
   }
 
   watchLocale (composer?: any): ?Function {
-    /* istanbul ignore if */
-    if (!this._sync || !this._root) { return null }
-    const self = this
-    const target: any = this._vm
-    return this._root.$i18n.vm.$watch('locale', (val) => {
-      target.$set(target, 'locale', val)
-      if (self.__VUE_I18N_BRIDGE__ && composer) {
-        composer.locale.value = val
-      }
-      target.$forceUpdate()
-    }, { immediate: true })
+    if (!composer) {
+      /* istanbul ignore if */
+      if (!this._sync || !this._root) { return null }
+      const target: any = this._vm
+      return this._root.$i18n.vm.$watch('locale', (val) => {
+        target.$set(target, 'locale', val)
+        target.$forceUpdate()
+      }, { immediate: true })
+    } else {
+      // deal with vue-i18n-bridge
+      if (!this.__VUE_I18N_BRIDGE__) { return null }
+      const self = this
+      const target: any = this._vm
+      return this.vm.$watch('locale', (val) => {
+        target.$set(target, 'locale', val)
+        if (self.__VUE_I18N_BRIDGE__ && composer) {
+          composer.locale.value = val
+        }
+        target.$forceUpdate()
+      }, { immediate: true })
+    }
   }
 
   onComponentInstanceCreated (newI18n: I18n) {