PR merge

2018-04-14 14:58:09 +10:00
parent e45109e1d7
commit 3061a701d5
14 changed files with 1867 additions and 830 deletions
--- a/src/js/defaults.js
+++ b/src/js/defaults.js
@@ -115,7 +115,7 @@ const defaults = {
    // Captions settings
    captions: {
        active: false,
-        language: window.navigator.language ? window.navigator.language.split('-')[0] : 'en',
+        language: (navigator.language || navigator.userLanguage).split('-')[0],
    },

    // Fullscreen settings