Merge 1557f58118 into 8a432ac937

Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>

src/pages/StatusPage.vue

@@ -166,7 +166,7 @@
                 <Editable v-model="config.title" class="title" tag="span" :contenteditable="editMode" :noNL="true" />
 
                 <!-- Locale Selector -->
-                <span class="language-selector">
+                <span v-if="config.showLocaleSelector" class="language-selector">
                     <select v-model="$root.language" class="form-select">
                         <option v-for="locale in $i18n.availableLocales" :key="locale" :value="locale" :text="$i18n.messages[locale].languageName"></option>
                     </select>
@@ -734,10 +734,6 @@ export default {
             this.maintenanceList = res.data.maintenanceList;
             this.$root.publicGroupList = res.data.publicGroupList;
 
-            if (!localStorage.locale && this.config.defaultLocale) {
-                this.$root.changeCurrentPageLang(this.config.defaultLocale);
-            }
-
             this.loading = false;
 
             // Configure auto-refresh loop
@@ -746,6 +742,10 @@ export default {
             }, (this.config.autoRefreshInterval + 10) * 1000);
 
             this.updateUpdateTimer();
+
+            if (!localStorage.locale && this.config.defaultLocale) {
+                this.$root.changeCurrentPageLang(this.config.defaultLocale);
+            }
         }).catch( function (error) {
             if (error.response.status === 404) {
                 location.href = "/page-not-found";