From 35ddf5ddd0b8e71c7113120fa2bf81a1a0d91e39 Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Tue, 6 Jan 2026 18:40:02 +1300
Subject: [PATCH] Fix overlay language

---
 src/plugin/ui.js | 10 +++++++---
 src/vr/Vr.vue    | 23 +++++++++++------------
 src/vr/vr.css    |  1 +
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/plugin/ui.js b/src/plugin/ui.js
index 7d55cf85..dc705947 100644
--- a/src/plugin/ui.js
+++ b/src/plugin/ui.js
@@ -1,21 +1,25 @@
 import {
     changeAppDarkStyle,
     changeAppThemeStyle,
+    changeHtmlLangAttribute,
     getThemeMode,
     refreshCustomCss,
     setLoginContainerStyle
 } from '../shared/utils/base/ui';
-import { i18n } from './i18n';
+import { i18n, loadLocalizedStrings } from './i18n';
 
 import configRepository from '../service/config';
 
 export async function initUi() {
     try {
-        // @ts-ignore
-        i18n.locale = await configRepository.getString(
+        const language = await configRepository.getString(
             'VRCX_appLanguage',
             'en'
         );
+        // @ts-ignore
+        i18n.locale = language;
+        await loadLocalizedStrings(language);
+        changeHtmlLangAttribute(language);
 
         const { initThemeMode, isDarkMode } =
             await getThemeMode(configRepository);
diff --git a/src/vr/Vr.vue b/src/vr/Vr.vue
index 507698d9..2d177d60 100644
--- a/src/vr/Vr.vue
+++ b/src/vr/Vr.vue
@@ -1248,7 +1248,9 @@
                         :style="{ width: nowPlaying.percentage + '%' }"></div>
                 </template>
                 <div style="float: right">
-                    <span v-if="!config?.minimalFeed" style="display: inline-block">{{ t('vr.status.timer') }}</span>
+                    <span v-if="!config?.minimalFeed" style="display: inline-block; margin-right: 5px">{{
+                        t('vr.status.timer')
+                    }}</span>
                     <span v-if="lastLocationTimer" style="display: inline-block; margin-right: 5px">{{
                         lastLocationTimer
                     }}</span>
@@ -1262,7 +1264,9 @@
                     <span v-if="pcUptime" style="display: inline-block; margin-left: 5px">{{ pcUptime }}</span>
                 </div>
                 <template v-if="lastLocation.playerList.length">
-                    <span v-if="!config?.minimalFeed" style="display: inline-block">{{ t('vr.status.players') }}</span>
+                    <span v-if="!config?.minimalFeed" style="display: inline-block; margin-right: 5px">{{
+                        t('vr.status.players')
+                    }}</span>
                     <span style="display: inline-block">{{ lastLocation.playerList.length }}</span>
                 </template>
                 <span
@@ -1430,9 +1434,7 @@
         name: 'vr'
     });
 
-    const i18n = useI18n();
-
-    const { t } = i18n;
+    const { t, locale } = useI18n();
 
     const vrState = reactive({
         appType: new URLSearchParams(window.location.search).has('wrist') ? 'wrist' : 'hmd',
@@ -2099,14 +2101,11 @@
         if (!appLanguage) {
             return;
         }
-        if (appLanguage !== vrState.appLanguage) {
-            vrState.appLanguage = appLanguage;
+        vrState.appLanguage = appLanguage;
 
-            await loadLocalizedStrings(appLanguage);
-            changeHtmlLangAttribute(vrState.appLanguage);
-            //@ts-ignore
-            i18n.locale = vrState.appLanguage;
-        }
+        await loadLocalizedStrings(appLanguage);
+        changeHtmlLangAttribute(vrState.appLanguage);
+        locale.value = vrState.appLanguage;
     }
 
     function trackingResultToClass(deviceStatus) {
diff --git a/src/vr/vr.css b/src/vr/vr.css
index 23d85c89..872b760c 100644
--- a/src/vr/vr.css
+++ b/src/vr/vr.css
@@ -467,6 +467,7 @@ i.x-user-status.busy {
 }
 
 .tracker-device img {
+    display: inline-block;
     height: 32px;
     transition: all 0.25s linear;
 }