From 33ea29936ec41ddef44554d01e4f3ccf481d5d15 Mon Sep 17 00:00:00 2001
From: Marcus Ortiz <marcus_ortiz@apple.com>
Date: Thu, 9 Oct 2025 10:08:52 -0700
Subject: [PATCH] Update locale in all view routing hooks.

---
 src/views/NotFound.vue                               | 9 +++++++++
 src/views/ServerError.vue                            | 9 +++++++++
 src/views/Topic.vue                                  | 3 +++
 src/views/TutorialsOverview.vue                      | 3 +++
 tests/unit/setup-utils/SwiftDocCRenderRouter.spec.js | 1 +
 5 files changed, 25 insertions(+)

diff --git a/src/views/NotFound.vue b/src/views/NotFound.vue
index df363875a..4081b32fa 100644
--- a/src/views/NotFound.vue
+++ b/src/views/NotFound.vue
@@ -15,6 +15,7 @@
 </template>
 
 <script>
+import { updateLocale } from 'theme/utils/i18n-utils';
 import GenericError from 'theme/components/GenericError.vue';
 import AppStore from 'docc-render/stores/AppStore';
 
@@ -24,5 +25,13 @@ export default {
   created() {
     AppStore.setAllLocalesAreAvailable();
   },
+  beforeRouteEnter(to, from, next) {
+    next((vm) => {
+      updateLocale(to.params.locale, vm);
+    });
+  },
+  beforeRouteUpdate(to) {
+    updateLocale(to.params.locale, this);
+  },
 };
 </script>
diff --git a/src/views/ServerError.vue b/src/views/ServerError.vue
index ac7307e5f..69ed87104 100644
--- a/src/views/ServerError.vue
+++ b/src/views/ServerError.vue
@@ -13,6 +13,7 @@
 </template>
 
 <script>
+import { updateLocale } from 'theme/utils/i18n-utils';
 import GenericError from 'theme/components/GenericError.vue';
 import AppStore from 'docc-render/stores/AppStore';
 
@@ -22,5 +23,13 @@ export default {
   created() {
     AppStore.setAllLocalesAreAvailable();
   },
+  beforeRouteEnter(to, from, next) {
+    next((vm) => {
+      updateLocale(to.params.locale, vm);
+    });
+  },
+  beforeRouteUpdate(to) {
+    updateLocale(to.params.locale, this);
+  },
 };
 </script>
diff --git a/src/views/Topic.vue b/src/views/Topic.vue
index df9d2682a..cafc9830f 100644
--- a/src/views/Topic.vue
+++ b/src/views/Topic.vue
@@ -21,6 +21,7 @@
 </template>
 
 <script>
+import { updateLocale } from 'theme/utils/i18n-utils';
 import {
   fetchDataForRouteEnter,
   shouldFetchDataForRouteUpdate,
@@ -80,6 +81,7 @@ export default {
       return;
     }
     fetchDataForRouteEnter(to, from, next).then(data => next((vm) => {
+      updateLocale(to.params.locale, vm);
       vm.topicData = data; // eslint-disable-line no-param-reassign
     })).catch(next);
   },
@@ -87,6 +89,7 @@ export default {
     if (shouldFetchDataForRouteUpdate(to, from)) {
       fetchDataForRouteEnter(to, from, next).then((data) => {
         this.topicData = data;
+        updateLocale(to.params.locale, this);
         next();
       }).catch(next);
     } else {
diff --git a/src/views/TutorialsOverview.vue b/src/views/TutorialsOverview.vue
index 519063662..ba261afec 100644
--- a/src/views/TutorialsOverview.vue
+++ b/src/views/TutorialsOverview.vue
@@ -13,6 +13,7 @@
 </template>
 
 <script>
+import { updateLocale } from 'theme/utils/i18n-utils';
 import {
   fetchDataForRouteEnter,
   shouldFetchDataForRouteUpdate,
@@ -54,6 +55,7 @@ export default {
     }
 
     fetchDataForRouteEnter(to, from, next).then(data => next((vm) => {
+      updateLocale(to.params.locale, vm);
       vm.topicData = data; // eslint-disable-line no-param-reassign
     })).catch(next);
   },
@@ -61,6 +63,7 @@ export default {
     if (shouldFetchDataForRouteUpdate(to, from)) {
       fetchDataForRouteEnter(to, from, next).then((data) => {
         this.topicData = data;
+        updateLocale(to.params.locale, this);
         next();
       }).catch(next);
     } else {
diff --git a/tests/unit/setup-utils/SwiftDocCRenderRouter.spec.js b/tests/unit/setup-utils/SwiftDocCRenderRouter.spec.js
index ecbc0abf1..a646b86df 100644
--- a/tests/unit/setup-utils/SwiftDocCRenderRouter.spec.js
+++ b/tests/unit/setup-utils/SwiftDocCRenderRouter.spec.js
@@ -15,6 +15,7 @@ import FetchError from 'docc-render/errors/FetchError';
 
 jest.mock('docc-render/utils/theme-settings', () => ({
   baseUrl: '/',
+  getSetting: jest.fn(),
 }));
 
 const mockInstance = {