From 259ff646415a0607ba467ef65452843d2e75eafa Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 11 Oct 2019 09:50:50 +0200
Subject: [PATCH] Fix locale handling

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/i18n/index.js | 28 ++++++++++++++++++++++++----
 js/src/main.ts       |  3 ++-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/js/src/i18n/index.js b/js/src/i18n/index.js
index cc43b375c..3e3732cff 100644
--- a/js/src/i18n/index.js
+++ b/js/src/i18n/index.js
@@ -1,7 +1,27 @@
-import en_US from './en_US';
-import fr_FR from './fr_FR';
+import en from './en_US';
+import fr from './fr_FR';
+import cs from './cs';
+import de from './de';
+import es from './es';
+import it from './it';
+import ja from './ja';
+import nl from './nl';
+import oc from './oc';
+import pl from './pl';
+import pt from './pt';
+import ru from './ru';
 
 export default {
-    en_US,
-    fr_FR
+    fr,
+    en,
+    cs,
+    de,
+    es,
+    it,
+    ja,
+    nl,
+    oc,
+    pl,
+    pt,
+    ru
 }
\ No newline at end of file
diff --git a/js/src/main.ts b/js/src/main.ts
index d1697b849..af5a6fa9c 100644
--- a/js/src/main.ts
+++ b/js/src/main.ts
@@ -24,8 +24,9 @@ const language = (window.navigator as any).userLanguage || window.navigator.lang
 Vue.use(VueI18n);
 
 const i18n = new VueI18n({
-  locale: language.replace('-', '_'), // set locale
+  locale: language.split('-')[0], // set locale
   messages, // set locale messages
+  fallbackLocale: 'en_US',
 });
 
 // Register the router hooks with their names