diff --git a/pages/settings.vue b/pages/settings.vue
index 55655b42..bb6c4d3a 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -123,6 +123,10 @@
       </div>
     </div>
 
+    <div v-show="loading" class="w-full h-full absolute top-0 left-0 flex items-center justify-center z-10">
+      <ui-loading-indicator />
+    </div>
+
     <modals-dialog v-model="showMoreMenuDialog" :items="moreMenuItems" @action="clickMenuAction" />
     <modals-sleep-timer-length-modal v-model="showSleepTimerLengthModal" @change="sleepTimerLengthModalSelection" />
     <modals-auto-sleep-timer-rewind-length-modal v-model="showAutoSleepTimerRewindLengthModal" @change="showAutoSleepTimerRewindLengthModalSelection" />
@@ -135,6 +139,7 @@ import { Dialog } from '@capacitor/dialog'
 export default {
   data() {
     return {
+      loading: false,
       deviceData: null,
       showMoreMenuDialog: false,
       showSleepTimerLengthModal: false,
@@ -329,11 +334,10 @@ export default {
         this.hapticFeedbackUpdated(action)
       } else if (this.moreMenuSetting === 'language') {
         this.settings.languageCode = action
-        this.languageOptionUpdated(action)
+        this.saveSettings()
       }
     },
     autoSleepTimerTimeUpdated(val) {
-      console.log('[settings] Auto sleep timer time=', val)
       if (!val) return // invalid times return falsy
       this.saveSettings()
     },
@@ -341,10 +345,6 @@ export default {
       this.$store.commit('globals/setHapticFeedback', val)
       this.saveSettings()
     },
-    languageOptionUpdated(val) {
-      this.$setLanguageCode(val)
-      this.saveSettings()
-    },
     showInfo(setting) {
       if (this.settingInfo[setting]) {
         Dialog.alert({
@@ -428,13 +428,12 @@ export default {
       const updatedDeviceData = await this.$db.updateDeviceSettings({ ...this.settings })
       if (updatedDeviceData) {
         this.$store.commit('setDeviceData', updatedDeviceData)
-        this.init()
+        this.deviceData = updatedDeviceData
+        this.$setLanguageCode(updatedDeviceData.deviceSettings?.languageCode || 'en-us')
+        this.setDeviceSettings()
       }
     },
-    async init() {
-      this.deviceData = await this.$db.getDeviceData()
-      this.$store.commit('setDeviceData', this.deviceData)
-
+    setDeviceSettings() {
       const deviceSettings = this.deviceData.deviceSettings || {}
       this.settings.disableAutoRewind = !!deviceSettings.disableAutoRewind
       this.settings.enableAltView = !!deviceSettings.enableAltView
@@ -459,6 +458,13 @@ export default {
       this.settings.autoSleepTimerAutoRewindTime = !isNaN(deviceSettings.autoSleepTimerAutoRewindTime) ? deviceSettings.autoSleepTimerAutoRewindTime : 300000 // 5 minutes
 
       this.settings.languageCode = deviceSettings.languageCode || 'en-us'
+    },
+    async init() {
+      this.loading = true
+      this.deviceData = await this.$db.getDeviceData()
+      this.$store.commit('setDeviceData', this.deviceData)
+      this.setDeviceSettings()
+      this.loading = false
     }
   },
   mounted() {
diff --git a/plugins/init.client.js b/plugins/init.client.js
index dc2be2ae..8eea07ee 100644
--- a/plugins/init.client.js
+++ b/plugins/init.client.js
@@ -5,8 +5,9 @@ import { Dialog } from '@capacitor/dialog'
 import { AbsFileSystem } from '@/plugins/capacitor'
 import { StatusBar, Style } from '@capacitor/status-bar'
 import { Clipboard } from '@capacitor/clipboard'
-import { formatDistance, format, addDays, isDate } from 'date-fns'
 import { Capacitor } from '@capacitor/core'
+import { formatDistance, format, addDays, isDate, setDefaultOptions } from 'date-fns'
+import * as locale from 'date-fns/locale'
 
 Vue.directive('click-outside', vClickOutside.directive)
 
@@ -38,6 +39,11 @@ Vue.prototype.$getAndroidSDKVersion = async () => {
 Vue.prototype.$encodeUriPath = (path) => {
   return path.replace(/\\/g, '/').replace(/%/g, '%25').replace(/#/g, '%23')
 }
+
+Vue.prototype.$setDateFnsLocale = (localeString) => {
+  if (!locale[localeString]) return 0
+  return setDefaultOptions({ locale: locale[localeString] })
+}
 Vue.prototype.$dateDistanceFromNow = (unixms) => {
   if (!unixms) return ''
   return formatDistance(unixms, Date.now(), { addSuffix: true })