Merge branch 'develop' into release/1.2.1

[build image]
cryptomator · Aug 15, 2023 · fea354a · fea354a
2 parents 96dff6a + 66b422e
commit fea354a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/frontend/src/i18n/index.ts b/frontend/src/i18n/index.ts
@@ -24,3 +24,5 @@ export const datetimeFormats: I18nOptions['datetimeFormats'] = {
     }
   }
 };
+
+export const defaultLocale = Locale.EN;
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
@@ -2,14 +2,14 @@ import { createApp } from 'vue';
 import { createI18n } from 'vue-i18n';
 import App from './App.vue';
 import './css/fonts.css';
-import { Locale, datetimeFormats, messages } from './i18n/index';
+import { datetimeFormats, defaultLocale, messages } from './i18n/index';
 import './index.css';
 import router from './router';
 // migrate to // import messages from '@intlify/vite-plugin-vue-i18n/messages'; as soon as it works
 
 const i18n = createI18n({
-  locale: navigator.language,
-  fallbackLocale: Locale.EN,
+  locale: defaultLocale,
+  fallbackLocale: defaultLocale,
   messages,
   datetimeFormats,
   globalInjection: true,
-Original file line number
+Diff line change
@@ Expand Up @@
         }
       }
     };
+    export const defaultLocale = Locale.EN;